修改bug

src/views/basic/BasicEntrutsReceModify.vue

@@ -86,7 +86,7 @@
                         <div class="itemTag">
                             <span>生成单据类型:&nbsp;</span>
                         </div>
-                        <el-select v-model="inputQuery.entrustAction" placeholder="单据类型" @change="entrustActionChange" clearable>
+                        <el-select v-model="inputQuery.entrustAction" placeholder="单据类型" @change="entrustSubInvChange2" clearable>
                             <el-option
                                 v-for="item in entrustBusArray"
                                 :key="item.action"
@@ -273,6 +273,29 @@ export default {
                 this.$message.error("单据类型数据加载失败")
             });
         },
+        entrustSubInvChange2(code) {
+            this.inputQuery.entrustInv= this.entrustSubInvList.find(item => item.code == code).parentId
+            this.$set(this.inputQuery, "entrustAction", "");
+            this.$set(this.inputQuery, "entrustUser", "");
+            let query = {
+                code: this.inputQuery.entrustSubInv,
+            }
+            //加载用户数据
+            warehouseUserList(query).then((res) => {
+                this.entrustUserArray = [];
+                this.entrustUserArray = res.data.list;
+            }).catch((error) => {
+                this.$message.error("用户数据加载失败")
+            });
+
+            //加载单据类型数据
+            warehouseBussinessTypeList(query).then((res) => {
+                this.entrustBusArray = res.data.list;
+
+            }).catch((error) => {
+                this.$message.error("单据类型数据加载失败")
+            });
+        },
         entrustActionChange() {
             this.inputQuery.entrustUser = "";
         },

src/views/basic/CorpMaintain.vue

@@ -427,6 +427,7 @@ export default {
                     this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false;
                     this.list = response.data.page.list || [];
                     this.total = response.data.page.total || 0;
+                    console.log(this.query)
                 })
                 .catch(() => {
                     this.loading = false;

src/views/basic/CorpRelevance.vue

@@ -78,7 +78,7 @@
                     </el-form-item>
                     <el-form-item style="display: flex">
                         <el-button-group>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="search" @click="reSearch">查询</el-button>
                             <el-button type="primary" size="mini" icon="search" @click="combine"
                             >选入
                             </el-button>
@@ -162,12 +162,17 @@ export default {
             this.getList();
         },
         handleErppageChange(val) {
-            this.erpQuery.page = val;
+            this.erpQuery.page = 1;
             this.getErpList();
         },
         checkSelectable(row) {
             return !row.checked;
         },
+        reSearch(){
+          this.unitQuery.page=1
+            this.getList();
+        },
+
         getList() {
             this.loading = true;
             this.unitQuery.thirdSys = this.thirdSysFk;

src/views/basic/UdiInfoManage.vue

@@ -1316,6 +1316,7 @@ export default {
         },
 
         removeErp(row) {
+            debugger
             this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",

src/views/inventory/InvPreInProductsDetail.vue

@@ -186,7 +186,7 @@ export default {
     },
     getCodeList() {
       this.loading = true;
-      this.query.orderIdFk = this.idQuery.orderIdFk;
+      this.query.id = this.idQuery.id;
       // let query = {
       //   orderIdFk: this.idQuery.orderIdFk,
       //   code:this.query.code,

src/views/inventory/invPreInProducts.vue

@@ -88,8 +88,7 @@
                 <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
 
-                <el-table-column label="所属单号" prop="orderIdFk" v-if="showSup"
+                <el-table-column label="所属单号" prop="orderIdFk" width="180"></el-table-column>
-                                 show-overflow-tooltip width="180"></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -227,7 +226,6 @@ export default {
         },
         getList() {
             this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
             filterProducts(this.filterQuery)
                 .then((response) => {
                     this.loading = false;

src/views/thrsys/ThrProductsCheck.vue

@@ -250,6 +250,7 @@ export default {
             this.getList();
         },
         checDialog(row) {
+            this.remark=null;
             this.checkVisible = true;
             this.curRow = row;
         },

src/views/userManage/customerManage.vue

@@ -419,7 +419,7 @@ export default {
                 limit: 20,
             };
             this.getList();
-                this.filterQuery.page=null;
+            this.filterQuery.page=1;
         },
         formSubmit() {
             this.formData.roleId = this.check;

src/views/warehouse/AdditionalOrder.vue

@@ -26,20 +26,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange"
-                                   size="mini">
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
                                    size="mini" @change="fcChange">
                             <el-option
                                 v-for="item in subInvList"
@@ -535,7 +522,7 @@ export default {
             this.filterQuery.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
-                pcode: this.filterQuery.locStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -590,7 +577,7 @@ export default {
         };
     },
     created() {
-        this.getStorage();
+        this.invChange();
         this.getBusType();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);

src/views/warehouse/IOCheckErrOrder.vue

@@ -971,7 +971,7 @@ export default {
           });
     },
     tableRowClassName({row, rowIndex}) {
-      if (row.erpCount === row.count) {
+      if (row.reCount === row.count) {
         return "success-row";
       } else {
         return "warning-row";

src/views/warehouse/addHosOrder.vue

@@ -543,7 +543,20 @@ export default {
                 this.$message.error('未添加条码');
                 return;
             }
+            if (this.formData.action == null || this.formData.action == '') {
+                this.$message.error('未选择扫码单据类型');
+                return
+            }
+            debugger
+            if (this.formData.fromCorp == null || this.formData.fromCorp == '') {
+                this.$message.error('往来信息不能为空');
+                return
+            }
 
+            if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
+                this.$message.error('当前分库不能为空');
+                return;
+            }
             let tQuery = {
                 orderId: this.idQuery.id,
                 locStorageCode: this.formData.locStorageCode,
@@ -576,7 +589,10 @@ export default {
                 this.$message.error('未选择扫码单据类型');
                 return
             }
-
+            if (this.formData.fromCorp == null || this.formData.fromCorp == '') {
+                this.$message.error('往来信息不能为空');
+                return
+            }
 
             if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
                 this.$message.error('当前分库不能为空');
@@ -697,7 +713,10 @@ export default {
                     return;
                 }
             }
-
+            if (this.formData.fromCorp == null || this.formData.fromCorp == '') {
+                this.$message.error('往来信息不能为空');
+                return
+            }
             if (this.$isBlank(this.formData.corpOrderId)) {
                 let date = new Date();
                 this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
@@ -866,6 +885,7 @@ export default {
             this.query.orderId = this.idQuery.id;
             errorCodeList(this.query) //查找该单号下的所有条码
                 .then((response) => {
+                    debugger
                     this.codeArray = response.data.list || [];
                     this.total = response.data.total || 0;
                     for (let i = 0; i < this.codeArray.length; i++) {
@@ -1186,6 +1206,7 @@ export default {
 
     },
     created() {
+        debugger
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];