扫码监听，输入框修改，仓库，领用，拆分产品等bug修改

src/views/basic/UdiInfoselectErpUdi.vue

@@ -343,7 +343,12 @@ export default {
     supEnable: {
       type: Object,
       required: true,
+    },
+    intentThirdId: {
+      type: Object,
+      required: true,
     }
+
   },
 
   data() {
@@ -620,6 +625,8 @@ export default {
             if (this.defaultSys != null) {
               this.thirdSysFk = this.defaultSys;
             }
+            this.searchErpList();
+
           })
           .catch(() => {
             this.loading = false;
@@ -630,6 +637,8 @@ export default {
   created() {
     console.log("-------------" + this.uuid);
     this.getBasicThirdSys();
+    this.erpQuery.code = this.intentThirdId;
+
   },
 };
 </script>

src/views/basic/basicCompanyProducts.vue

@@ -75,10 +75,10 @@
                             >选入产品
                             </el-button
                             >
-                            <el-button type="primary" icon="search" @click="intentImportErp"
-                            >添加产品信息
-                            </el-button
-                            >
+<!--                            <el-button type="primary" icon="search" @click="intentImportErp"-->
+<!--                            >添加产品信息-->
+<!--                            </el-button-->
+<!--                            >-->
                             <!--                            <el-button type="primary" @click="addProductVisible=true">新增产品信息</el-button>-->
                         </el-button-group>
                     </el-form-item>
@@ -137,7 +137,7 @@
                         {{ lockStatusMap[scope.row.lockStatus] }}
                     </template>
                 </el-table-column>
-                <el-table-column width="200" label="操作" fixed="right">
+                <el-table-column width="180" label="操作" fixed="right">
                     <template slot-scope="scope">
 
                         <el-button
@@ -181,7 +181,14 @@
                             @click.native.stop="sumitLockStatus(scope.row)"
                         >提交审核
                         </el-button>
-
+                        <el-button
+                            v-if="isSpCombine"
+                            type="text"
+                            size="small"
+                            :disabled="scope.row.thirdId==scope.row.nameCode"
+                            @click.native.stop="intentImportErp(scope.row)"
+                        >拆分产品
+                        </el-button>
 
                         <el-button type="text" size="small"
                                    @click.native.stop="deleteCompanyProductRelevance(scope.row)"
@@ -1276,6 +1283,7 @@
                     :closeDialog="closeDialog"
                     :uuid="uuid"
                     :relId="relId"
+                    :intentThirdId="intentThirdId"
                     :isImport="isImport"
                     :data="thisData"
                     :defaultSys="defaultSys"
@@ -1391,6 +1399,7 @@ export default {
             productType: null,
             defaultSys: null,
             isImport: false,
+            intentThirdId: null,
             isSpCombine: false,
             isImportUdi: false,
             isUploadSmp: false,
@@ -1611,11 +1620,12 @@ export default {
         },
 
         intentImportErp(val) {
-            this.defaultSys = null,
+            this.defaultSys = null;
             this.uuid = val.uuid;
             this.relId = val.rlId;
             this.isImport = true;
             this.thisData = val;
+            this.intentThirdId = val.thirdId;
             this.selectErpDialogVisible = true;
         },
         uploadSMP() {

src/views/basic/invWarehouse.vue

@@ -181,7 +181,8 @@
                                 type="text"
                                 size="small"
                                 @click.native="updateDirector(scope.row)">
-                                设为主管
+
+                                {{ directorMap[scope.row.director] }}
                             </el-button>
                             <el-button
                                 type="text"
@@ -479,7 +480,8 @@
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="12" class="el-col">
                         <div class="text item">
-                            <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">是否允许供应商使用</el-checkbox>
+                            <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">是否允许供应商使用
+                            </el-checkbox>
                         </div>
                     </el-col>
                 </el-row>
@@ -609,6 +611,7 @@ export default {
                 children: "children",
                 label: "name"
             },
+            setDictor: "设为主管",
             treeList: [],
             fileList: [],
             pCodes: [],
@@ -629,6 +632,10 @@ export default {
                 true: "是",
                 false: "否",
             },
+            directorMap: {
+                true: "取消主管",
+                false: "设为主管",
+            },
             formLoading: false,
             subFormVisible: false,
             formVisible: false,
@@ -1136,8 +1143,8 @@ export default {
             }
         },
         updateDirector(row) {
-            let params = {id: row.id};
-            updateDirector(params).then((res) => {
+            row.director = !row.director;
+            updateDirector(row).then((res) => {
                 this.$message.success("设置成功");
                 //重新加载表格数据
                 let loadParam = {

src/views/thrsys/ThrOrdedrReceiveAdd.vue

@@ -412,6 +412,7 @@ export default {
         getBusType() {
             let query = {
                 enabled: true,
+                corpType:1,
             };
             getLocalJoinBusType(query)
                 .then((response) => {

src/views/thrsys/thrOrderNew.vue

@@ -990,11 +990,13 @@ export default {
     getBusType(invCode) {
       let query = {
         enabled: true,
+        corpType: 1,
         // code: invCode,
       };
       getOriginJoinBusType(query)
           .then((response) => {
             this.busTypes = response.data.list || [];
+            this.curAction = this.busTypes[0];
           })
           .catch(() => {
           });

src/views/warehouse/addHosOrder.vue

@@ -181,11 +181,10 @@
 
             </el-row>
             <el-row :gutter="20">
-                <el-col :span="3">
+                <el-col :span="2">
                     <div class="ao-text">
-
                         <el-link
-                            @click.native.stop="scanChange()"
+                            @current-change="scanChange()"
                             target="_blank">{{ scanText }}
                         </el-link>
 
@@ -224,10 +223,13 @@
             <!--            </div>-->
             <!--            <div id="inputer" tabindex="0"></div>-->
             <el-row :gutter="20">
-                <el-col :span="16" style="margin-left: 40px">
+                <el-col :span="14" style="margin-left: 40px">
+
+                </el-col>
+                <el-col :span="2">
                     <el-checkbox v-model="sitcomScan">分段扫码</el-checkbox>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="3">
                     <div class="text item" style="margin-left: 30px"> 条码数量：{{ total }}
                     </div>
                 </el-col>
@@ -623,13 +625,14 @@ export default {
             });
         },
 
-        scanChange() {
+        scanChange(event) {
             this.isScan = !this.isScan;
             if (this.isScan) {
                 this.scanText = "扫码录入：";
-
+               document.getElementById("inputer").focus();
             } else {
                 this.scanText = "手动录入：";
+                // this.$refs.inputRef.focus();
             }
         },
 

src/views/warehouse/addOrder.vue

@@ -474,7 +474,7 @@ export default {
                         });
                     }
                     this.corpOrderIdDisabled = true;
-                    this.$refs.inputRef.focus();
+                    // this.$refs.inputRef.focus();
                     this.getCodeList();
                 } else {
                     this.corpOrderIdDisabled = true;

src/views/warehouse/stockOrderEdit.vue

@@ -182,6 +182,12 @@ export default {
         },
         batchSetParams(flag, type) {
             if (flag == '1' && type == 'salesListNo') {
+
+                if (this.$isBlank(this.batchForm.secSalesListNo)) {
+                    this.$message.warning("请输入销售清单");
+                    return;
+                }
+
                 this.salesListNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
@@ -195,6 +201,10 @@ export default {
                 //置空批量设置表单
                 Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'firstSalesInvNo') {
+                if (this.$isBlank(this.batchForm.firstSalesInvNo)) {
+                    this.$message.warning("请输入销售发票第一票");
+                    return;
+                }
                 this.firstSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
@@ -207,6 +217,10 @@ export default {
                 });
                 Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'secSalesInvNo') {
+                if (this.$isBlank(this.batchForm.secSalesInvNo)) {
+                    this.$message.warning("请输入销售发票第二票");
+                    return;
+                }
                 this.secSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {