Merge remote-tracking branch 'origin/master'

src/views/basic/locUdi/UdiInfoDb.vue

@@ -97,7 +97,7 @@
 
           </el-button-group>
 
-          <el-upload
+          <!--<el-upload
 
             :action="uploadFileUrl"
             multiple
@@ -111,7 +111,7 @@
             :file-list="fileList"
           >
             <el-button type="primary" icon="el-icon-bottom-right" style="margin-left: 15px">导入器械信息</el-button>
-          </el-upload>
+          </el-upload>-->
         </div>
         <el-table
           :data="udidlList"

src/views/basic/product/udiInfoManageSp.vue

@@ -91,6 +91,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
           <el-button type="primary" icon="search" @click="lockProducts('3')" v-if="isSpCombine">锁定</el-button>
           <el-button type="primary" icon="search" @click="lockProducts('1')" v-if="isSpCombine">退回</el-button>
         </el-button-group>
@@ -145,7 +146,20 @@
         </selectDetail>
       </el-dialog>
 
-
+      <el-dialog
+        title="选入产品信息"
+        :visible.sync="selectProductVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectProductVisible"
+      >
+        <selectProduct
+          :closeSelDialog="closeDialog"
+          :uuid="uuid"
+          :unitFk="filterQuery.unitFk"
+        ></selectProduct>
+      </el-dialog>
 
       <pagination
         v-show="total>0"
@@ -173,6 +187,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {filterByUuid, filterCompany} from "@/api/basic/udiInfo";
 import {filterCompanyProductRelevance, deleteCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
+import selectProduct from "./basicCompanyProductsImport";
 import selectUdi from "./udiInfoRelevance.vue";
 import selectErp from "./udiInfoselectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
@@ -335,7 +350,13 @@ export default {
         .catch(() => {
         });
     },
-
+    selectProduct() {
+      if (this.$isBlank(this.filterQuery.unitFk)) {
+        this.$message.error("请先选择供应商！");
+        return;
+      }
+      this.selectProductVisible = true;
+    },
     intentDetail() {
       this.isImportUdi = false;
       this.selectUdiDialogVisible = true;
@@ -550,6 +571,7 @@ export default {
       this.selectErpDialogVisible = false;
       this.selectLocalVisible = false;
       this.selectVersionVisible = false;
+      this.selectProductVisible = false;
     },
     onAddSubmit() {
       if (this.checked == true) {
@@ -643,6 +665,7 @@ export default {
     selectUdi,
     selectErp,
     selectLocalUdi,
+    selectProduct,
     selectDetail
   }
   ,

src/views/system/dept/invWarehouse.vue

@@ -9,14 +9,7 @@
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item class="query-form-item" label="仓库类型:">
+        <el-form-item label="仓库类型" prop="advanceType" class="query-form-item">
-          <el-input
-
-            clearable
-            placeholder="仓库类型"
-          ></el-input>
-        </el-form-item> -->
-        <el-form-item label="仓库类型" prop="advanceType">
           <el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
             <el-option label="入账库" :value="1"/>
             <el-option label="预验收库" :value="2"/>
@@ -33,6 +26,7 @@
       </el-form>
       <el-table
         :data="list"
+        style="width: 100%"
         border
         highlight-current-row
         @current-change="handSubInvCurrentChange"