Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/basicdata/cntr.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 入库查询 箱型 基础信息接口 
+export function listCntrs(query) {
+  return request({
+    url: '/shipping/cntr/list',
+    method: 'get',
+    params: query
+  })
+}

src/views/Warehousing/inStock/index.vue

@@ -25,12 +25,8 @@
               <el-select
                 v-model="queryParams.createBy"
                 filterable
-                remote
                 clearable
-                reserve-keyword
                 placeholder="请输入关键词"
-                :remote-method="userremoteMethod"
-                :loading="selectloading"
                 style="width: 200px"
               >
                 <el-option
@@ -67,11 +63,7 @@
                 v-model="queryParams.fCorpid"
                 clearable
                 filterable
-                remote
-                reserve-keyword
                 placeholder="请输入关键词"
-                :remote-method="corpremoteMethod"
-                :loading="selectloading"
                 style="width: 200px"
               >
                 <el-option
@@ -104,11 +96,7 @@
                     v-model="queryParams.fSbu"
                     clearable
                     filterable
-                    remote
-                    reserve-keyword
                     placeholder="请输入关键词"
-                    :remote-method="corpremoteMethod"
-                    :loading="selectloading"
                     style="width: 200px"
                   >
                     <el-option
@@ -227,9 +215,7 @@
             type="primary"
             icon="el-icon-plus"
             size="mini"
-            @click="
-            handleAdd
-            "
+            @click="handleAdd"
             v-hasPermi="['warehouseBusiness:inStock:add']"
             >新增
           </el-button>
@@ -318,7 +304,12 @@
           </div>
         </div>
       </el-row>
-      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag>
+      <el-dialog
+        title="自定义列显示"
+        :visible.sync="showSetting"
+        width="700px"
+        v-dialogDrag
+      >
         <template slot="title">
           <div class="avue-crud__dialog__header">
             <span class="el-dialog__title">
@@ -508,7 +499,7 @@ export default {
   name: "plans",
   data() {
     return {
-      timer: '',
+      timer: "",
       pageShow: true,
       pageShow2: false,
       queryParams: {
@@ -527,7 +518,6 @@ export default {
         fItemsStatus: null,
         timeInterval: null,
       },
-      selectloading: false,
       // 显示搜索条件
       showSearch: true,
       userOptions: [],
@@ -674,6 +664,7 @@ export default {
       single: true,
       multiple: true,
       formId: null,
+      ids: [],
     };
   },
   // 使用子组件
@@ -690,6 +681,12 @@ export default {
     listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.warehouseOptions = response.rows;
     });
+    listUser().then((response) => {
+      this.userOptions = response.rows;
+    });
+    listCorps({ type: 1 }).then((response) => {
+      this.fMblnoOptions = response.rows;
+    });
     this.getRow();
     this.getList();
   },
@@ -757,7 +754,7 @@ export default {
         if (res.code == 200) {
           this.showSetting = false;
           this.getRowList = this.setRowList.filter((e) => e.checked == 0);
-          console.log(this.tableDate)
+          console.log(this.tableDate);
         }
       });
     },
@@ -812,14 +809,13 @@ export default {
       return sums;
     },
     handleAdd() {
-      this.timer = new Date().getTime()
-      this.pageShow=false
-      this.pageShow2=true
+      this.timer = new Date().getTime();
+      this.pageShow = false;
+      this.pageShow2 = true;
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.fId);
-      this.idCopy = this.ids[0];
       this.single =
         selection.length !== 1 ||
         selection.map((item) => item.fBillstatus) == 6 ||
@@ -828,7 +824,8 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.formId = row.fId;
+      const fId = row.fId || this.ids[0];
+      this.formId = fId;
       this.$nextTick(() => {
         this.$refs.addOrUpdateRef.init();
       });
@@ -901,34 +898,6 @@ export default {
       this.fMblnoOptions = [];
       this.handleQuery();
     },
-    //制单人模糊搜索
-    userremoteMethod(query) {
-      if (query !== "") {
-        this.selectloading = true;
-        setTimeout(() => {
-          listUser({ userName: query }).then((response) => {
-            this.selectloading = false;
-            this.userOptions = response.rows;
-          });
-        }, 200);
-      } else {
-        this.userOptions = [];
-      }
-    },
-    //货权方模糊搜索
-    corpremoteMethod(query) {
-      if (query !== "") {
-        this.selectloading = true;
-        setTimeout(() => {
-          listCorps({ fName: query, type: 1 }).then((response) => {
-            this.selectloading = false;
-            this.fMblnoOptions = response.rows;
-          });
-        }, 200);
-      } else {
-        this.fMblnoOptions = [];
-      }
-    },
     showAddOrUpdate(data) {
       if (data) {
         this.getList();