Merge remote-tracking branch 'origin/master'

src/views/basic/product/bindHospProduct.vue

@@ -212,7 +212,7 @@ export default {
     },
     instentProduct(){
       if(this.productList.length<=0){
-        this.$message.error("请先选择解绑产品！");
+        this.$message.error("请先选择要绑定的产品！");
         return;
       }
       var ids=this.productList.map((item)=> item.id)

src/views/basic/product/unbindHospProduct.vue

@@ -158,7 +158,8 @@ export default {
         page: 1,
         limit: 20,
         addType: 1,
-        diType: 1
+        diType: 1,
+        relCode:this.rId
       };
       this.getList();
     },

src/views/purchase/manufacturer/supManufacturerEditDialog.vue

@@ -224,7 +224,7 @@
         >
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column label="证书名称" prop="name"></el-table-column>
-          <el-table-column label="证书编号" prop="name"></el-table-column>
+          <el-table-column label="证书编号" prop="code"></el-table-column>
           <el-table-column label="生效期" prop="vailDate"></el-table-column>
           <el-table-column label="失效期" prop="expireDate"></el-table-column>
           <el-table-column label="审核状态" prop="auditStatus" width="120">

src/views/system/dept/invWarehouse.vue

@@ -373,7 +373,6 @@ export default {
         // page: 1,
         // limit: 10,
       },
-      isShow: null,
       loading: true,
       list: [],
       isExpandAll: true,
@@ -462,10 +461,8 @@ export default {
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
-        this.isShow = true;
       } else if (formName === "add") {
         this.subData = {advanceType: false,spUse:false};
-        this.isShow = false;
       }
       this.subFormVisible = true;
       this.getSubThrsysDetailData();