暂存

src/views/purchaseIn/purchaseOrder/columns.js

@@ -45,6 +45,17 @@ export default [
     label: "仓库名称",
     width: "80px",
   },
+  {
+    prop: "good_code",
+    label: "商品属性编号",
+    width: "145px",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    'min-width': "145px",
+  },
+  
   {
     prop: "cgder",
     label: "采购员",

src/views/purchaseIn/purchaseOrder/index.vue

@@ -61,7 +61,7 @@
               <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
                 <search-stock
                   :size="searchSize"
-                  :value="stockNo"
+                  :value="wsm_code"
                   :placeholder="'入库仓库名称'"
                   :disabled="false"
                   :isDetail="false"
@@ -117,12 +117,22 @@
                   v-model="input"
                   :size="searchSize"
                   class="input-with-select"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                 >
                   <el-select
                     v-model="select"
                     style="width: 125px"
                     slot="prepend"
                     placeholder="请选择"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
                   >
                     <el-option label="采购单编号" value="1"></el-option>
                     <el-option label="入库单编号" value="2"></el-option>
@@ -132,7 +142,15 @@
                     <el-option label="申请人" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
                   </el-select>
-                  <el-button slot="append" icon="el-icon-search"></el-button>
+                  <el-button
+                    slot="append"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                    icon="el-icon-search"
+                  ></el-button>
                 </el-input>
               </el-col>
 
@@ -285,7 +303,7 @@ export default {
       showModel: false,
       isDetail: false,
       modelId: 0,
-      stockNo: [],
+      wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
         bk_code: "", // 备库编码
@@ -393,19 +411,19 @@ export default {
         this.parmValue.wsm_supplierNo = "";
         this.wsm_supplierNo = [];
       }
-      this.parmValue.stockNo = "";
-      this.stockNo = [];
+      this.parmValue.wsm_code = "";
+      this.wsm_code = [];
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
       await this.searchList();
     },
     async stockChange(e) {
       if (e && e.id) {
-        this.parmValue.stockNo = e.code;
-        this.stockNo = [e.code];
+        this.parmValue.wsm_code = e.code;
+        this.wsm_code = [e.code];
       } else {
-        this.parmValue.stockNo = "";
-        this.stockNo = [];
+        this.parmValue.wsm_code = "";
+        this.wsm_code = [];
       }
 
       console.log(e);

src/views/purchaseIn/storeSet/addEdit.vue

@@ -221,7 +221,7 @@ export default {
 
     return {
       supplier_name: "",
-      accountNames:"",
+      accountNames: "",
       loading: false,
       title: "添加仓库",
       showModelThis: this.showModel,
@@ -415,7 +415,7 @@ export default {
         } = res.data;
 
         this.supplier_name = supplier_name;
-        this.accountNames = contactor_name
+        this.accountNames = contactor_name;
         this.ruleForm = {
           name: name, // 仓库名称
           supplierNo: [supplierNo], //供应商编码
@@ -451,19 +451,19 @@ export default {
           this.supplier_name = "";
           this.accountNames = "";
           this.ruleForm = {
-            name: "测试测试", // 仓库名称
+            name: "", // 仓库名称
             supplierNo: [], //供应商编码
             // wsmtype: "", //仓库类型 目前随便填
             addr_code: [], //仓库省市区
-            addr: "测试地址测试地址", //仓库详细地址
+            addr: "", //仓库详细地址
             contactor: [], //仓库联系人
-            mobile: "1989898977", //仓库联系方式
+            mobile: "", //仓库联系方式
             // position: "", //联系人职位  目前随便填
             // wsm_type: "", //目前随便填
 
-            wsm_name: "张三", //收发货联系人
-            wsm_mobile: "19888888888", //收发货联系方式
-            wsm_addr: "测试1", //收发货地址详细
+            wsm_name: "", //收发货联系人
+            wsm_mobile: "", //收发货联系方式
+            wsm_addr: "", //收发货地址详细
             addrs_code: [], //收发货省市区
           };
         }