diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue index e960986..ba29632 100644 --- a/src/views/basic/BasicEntrutsReceModify.vue +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -35,7 +35,7 @@ {{ item.localName }} @@ -167,7 +167,6 @@ export default { action: [ {required: true, message: "请输入扫码单据类型", trigger: "blur"} ], - entrustInv: [ {required: true, message: "请输入委托验收人仓库", trigger: "blur"} ], @@ -199,17 +198,6 @@ export default { this.localTypes = []; }); }, - getStorage() { - this.storageList = []; - filterAll() - .then((response) => { - this.storageList = response.data || []; - this.findSubInvByInv(); - this.getEntrustStorage(); - }) - .catch(() => { - }); - }, findSubInvByInv() { this.subInvList = []; @@ -227,36 +215,21 @@ export default { }, - findEntrustSubInvByInv() { - + findEntrustSubInvByInv(code) { this.entrustSubInvList = []; let query = { code: this.inputQuery.invWarehouseCode, - }; filterSub(query) .then((response) => { this.entrustSubInvList = response.data || []; - this.entrustSubInvChange(); + this.entrustSubInvChange(code); }) .catch(() => { }); }, - - getEntrustStorage() { - this.entrustStorageList = []; - let nextQuery = {pcode: this.inputQuery.curInv}; - filterNext(nextQuery) - .then((response) => { - this.entrustStorageList = response.data || []; - this.findEntrustSubInvByInv(); - }) - .catch(() => { - }); - }, getOrderType() { - let query = { locSubInvCode: this.inputQuery.invWarehouseCode } @@ -266,30 +239,24 @@ export default { }) }, - invChange() { - this.findSubInvByInv(); - this.inputQuery.invWarehouseCode = null; - this.$set(this.inputQuery, "entrustUser", ""); - this.$set(this.inputQuery, "entrustInv", ""); - this.getEntrustStorage(); - }, subInvChange() { this.getOrderType(); }, - - entrustInvChange() { - this.inputQuery.entrustSubInv = null; + entrustInvChange(code) { + this.inputQuery.curInv= this.subInvList.find(item => item.code == code).parentId + this.$set(this.inputQuery, "action", ""); + this.$set(this.inputQuery, "entrustSubInv", ""); + this.getOrderType(); this.findEntrustSubInvByInv(); - }, - entrustSubInvChange() { + entrustSubInvChange(code) { + this.inputQuery.entrustInv= this.entrustSubInvList.find(item => item.code == code).parentId let query = { code: this.inputQuery.entrustSubInv, } - //加载用户数据 warehouseUserList(query).then((res) => { this.entrustUserArray = []; @@ -316,9 +283,11 @@ export default { created() { + this.findSubInvByInv(); + if(this.inputQuery.entrustSubInv!=null && this.inputQuery.entrustSubInv!=undefined){ + this.findEntrustSubInvByInv(this.inputQuery.entrustSubInv); + } - this.getList(); - this.getStorage(); // if (this.$isNotBlank(this.inputQuery.entrustInv)) { // this.findEntrustSubInvByInv(); diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue index 3494174..4e2b95b 100644 --- a/src/views/basic/basicCompanyProductsImport.vue +++ b/src/views/basic/basicCompanyProductsImport.vue @@ -1074,7 +1074,7 @@ export default { thirdId: row.thirdId, isUseDy: row.isUseDy, }; - this.checked = row.isUseDy == 1; + let ttquery = { uuid: row.uuid, diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index 6c208d8..012c10d 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -188,7 +188,8 @@ export default { this.loading = true; this.query.orderIdFk = this.idQuery.orderIdFk; let query = { - orderIdFk: this.idQuery.orderIdFk + orderIdFk: this.idQuery.orderIdFk, + code:this.query.code } /* this.query.batchNo = this.idQuery.batchNo; this.query.supId = this.idQuery.supId; diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index 77ab0ca..8c23167 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -196,18 +196,18 @@ v-if="selectProductVisible" :append-to-body='true' > - + > + + diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 913315c..4590b9c 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -1,306 +1,296 @@ diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 2c55a70..292b45b 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -70,13 +70,13 @@
- 当前分库: + 当前仓库:
-
- 当前分库: + 当前仓库:
- diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue index ca1b459..e53060f 100644 --- a/src/views/warehouse/stockOrderNew.vue +++ b/src/views/warehouse/stockOrderNew.vue @@ -515,15 +515,15 @@ export default { newSpDistributionVisible: false, isSp: store.getters.customerId, detailFormRules: { - batchNo: [ - {required: true, message: "请输入批次号", trigger: "blur"} - ], - productDate: [ - {required: true, message: "请输入生产日期", trigger: "blur"} - ], - expireDate: [ - {required: true, message: "请输入失效日期", trigger: "blur"} - ], + // batchNo: [ + // {required: true, message: "请输入批次号", trigger: "blur"} + // ], + // productDate: [ + // {required: true, message: "请输入生产日期", trigger: "blur"} + // ], + // expireDate: [ + // {required: true, message: "请输入失效日期", trigger: "blur"} + // ], sweepCount: [ {required: true, message: "请输入扫码数量", trigger: "blur"} ] diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue index 893f621..d7aacaa 100644 --- a/src/views/warehouse/stockOrderNewSelectProduct.vue +++ b/src/views/warehouse/stockOrderNewSelectProduct.vue @@ -305,9 +305,10 @@ export default { this.loading = true; this.listQuery.customerId = store.getters.customerId; - if(this.listQuery.customerId==110){ + if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){ this.listQuery.companyName=this.data.formData.corpName - }else{ + } + if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){ this.listQuery.companyName=this.data.corpName }