Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/supply/components/addGoodReturn.vue

@@ -133,6 +133,7 @@
                 :disabled="true"
                 placeholder="商品类别"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="规格&单位" align="center" width="200px">
@@ -143,6 +144,7 @@
                 :disabled="true"
                 placeholder="规格&单位"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -179,6 +181,7 @@
                 style="width: 100px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="可退数量" align="center" width="200px">
@@ -189,6 +192,7 @@
                 :disabled="true"
                 placeholder="可退数量"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="数量" align="center" width="120px">
@@ -217,6 +221,7 @@
                 :disabled="disabled"
                 placeholder="请输入采购单价"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -244,6 +249,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -254,6 +260,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -264,6 +271,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -275,6 +283,7 @@
                 :disabled="disabled"
                 placeholder="请输入备注"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 

src/xt_pages/supply/components/addSupply.vue

@@ -26,11 +26,21 @@
           <el-col span="6">
             <el-form-item label="供应商类别" prop="supplierType">
               <!-- <el-input v-model="supplier.type"></el-input> -->
-              <el-autocomplete
+              <!-- <el-autocomplete
                 v-model="supplier.supplierType"
                 :fetch-suggestions="querySearchAsync"
                 @select="handleSelect"
-              ></el-autocomplete>
+              ></el-autocomplete> -->
+
+              <el-select v-model="supplier.supplierType" @select="handleSelect">
+                <el-option
+                  v-for="item in supplierType"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col span="6">
@@ -91,7 +101,7 @@
                         {
                           required: 'true',
                           message: '请输入主要联系人',
-                          trigger: ['blur', 'change'],
+                          trigger: ['blur'],
                         },
                       ]
                     : null
@@ -227,6 +237,7 @@ export default {
       supplier_ids: "",
       title: "",
       Template,
+      supplierType: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       list: ["001", "002"],
       // 表单验证规则
@@ -297,8 +308,10 @@ export default {
         this.initSupplierData();
         this.show_type = 1;
         this.title = "新增供应商";
+        this.getsupplytype();
         this.dialogVisible = true;
       } else if (type == 2) {
+        this.getsupplytype();
         // console.log(data,'oop')
         this.show_type = 2;
         this.supplier_ids = data.ID;
@@ -306,6 +319,7 @@ export default {
         this.supplier.supplierCode = data.SupplierCode;
         this.supplier.supplierName = data.SupplierName;
         this.supplier.supplierType = data.SupplierType;
+
         this.supplier.vatRate = data.VatRate;
         this.supplier.number = data.Number;
         this.supplier.bank = data.Bank;
@@ -363,35 +377,18 @@ export default {
       });
     },
 
-    querySearchAsync(queryString, cb) {
-      clearTimeout(this.timeout);
-      var results = [];
-      if (queryString == "") {
-        cb(results);
-      } else {
-        // 获取供应商类别接口
-        getsupplytype()
-          .then((res) => {
-            if (res.status == 200) {
-              var result = res.data.data.list;
-              //远程搜索需要的数组
-              for (let i = 0; i < result.length; i++) {
-                const element = result[i];
-                results.push({
-                  value: element.name,
-                  name: element.value,
-                });
-              }
-              cb(results);
-            } else {
-              results = [];
-              cb(results);
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-      }
+    getsupplytype() {
+      // 获取供应商类别接口
+      getsupplytype()
+        .then((res) => {
+          if (res.status == 200) {
+            this.supplierType = res.data.data.list;
+            console.log(this.supplierType, "this.supplierType");
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
 
     handleSelect(item) {
@@ -429,11 +426,11 @@ export default {
                 };
                 savesupply(params).then((res) => {
                   if (res.data.state == 1) {
-                    this.$message.success("修改成功");
+                    this.$message.success("新增成功");
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("修改失败");
+                    this.$message.error("新增失败");
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -466,7 +463,7 @@ export default {
                 let params = {
                   suppliercode: this.supplier.supplierCode || "",
                   suppliername: this.supplier.supplierName || "",
-                  id: this.supplier.id|| 0,
+                  id: this.supplier_ids || 0,
                   suppliertype: this.supplier.supplierType || "",
                   vatrate: this.supplier.vatRate || 0,
                   number: this.supplier.number || "",
@@ -511,23 +508,18 @@ export default {
           if (this.recordInfo.contacts.length == 0) {
             this.recordInfo.contacts = [{}];
             this.recordInfo.contacts[0].is_first = data.value;
-          } else if (this.recordInfo.contacts.length == 1) {
-            let val = res.data.data.contact[0];
-            this.recordInfo.contacts[0].is_first = data.value;
-            this.recordInfo.contacts[0] = {
-              id: val.id,
-              name: val.name,
-              address: val.address,
-              phone: val.phone,
-            };
-            this.$forceUpdate();
-          } else {
-            this.recordInfo.contacts.forEach((o) => {
-              if (o.isfirst == 0) {
-              } else if (o.isfirst == 1) {
-              }
-            });
           }
+          // else if (this.recordInfo.contacts.length == 1) {
+          //     let val = res.data.data.contact[0];
+          //     this.recordInfo.contacts[0].is_first = data.value;
+          //     this.recordInfo.contacts[0] = {
+          //       id: parseFloat(val.id),
+          //       name: val.name,
+          //       address: val.address,
+          //       phone: val.phone,
+          //     };
+          //     this.$forceUpdate();
+          //   }
         }
       });
     },
@@ -639,6 +631,9 @@ export default {
     .el-autocomplete {
       width: 75% !important;
     }
+    .el-select.el-select--medium {
+      width: 70% !important;
+    }
   }
 }