Merge remote-tracking branch 'origin/dev' into dev

src/views/basic/product/bindProduct.vue

@@ -82,11 +82,12 @@
         <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <!--<el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>-->
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
       </el-table>
       <pagination
         v-show="total>0"

src/views/system/dept/invWarehouse.vue

@@ -578,7 +578,7 @@ export default {
           this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
-
+        debugger
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
       if (this.subData.parentCode != null && this.subData.parentCode != "") {
@@ -592,6 +592,7 @@ export default {
       }
       filterSubAll(this.query)
         .then((response) => {
+          debugger
           let invList = response.data || [];
           //上级仓库中去除当前仓库节点
           if (invList.length > 0) {

src/views/thirdSys/api/DialogEditBusDown.vue

@@ -71,7 +71,7 @@
     </el-form>
 
     <div slot="footer" class="dialog-footer">
-      <el-button @click.native="editGeOrderParamVisible = !editGeOrderParamVisible"
+      <el-button @click.native="closeDialog( editGeOrderParamVisible = !editGeOrderParamVisible)"
       >取消
       </el-button
       >

src/views/thirdSys/inv/index.vue

@@ -564,7 +564,7 @@ export default {
         this.subData.code = JSON.parse(localStorage.getItem("code"));
         this.subFormVisible = false;
       });
-      this.resetForm();
+    //  this.resetForm();
 
     },