diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index 6b1584d..c8a7ba1 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -202,25 +202,16 @@ export default { this.$message.error("单据类型不能为空！"); return; } - if (this.$isBlank(this.inputQuery.curInv)) { - this.$message.error("请输入委托仓库！"); - return; - } - if (this.$isBlank(this.inputQuery.entrustInv)) { - this.$message.error("请输入接受委托仓库！"); - return; - } if (this.$isBlank(this.inputQuery.entrustUser)) { this.$message.error("请输入接受委托人！"); return; } - if (this.$isBlank(this.inputQuery.invWarehouseCode)) { - this.$message.error("当前分库不能为空！"); + this.$message.error("当前仓库不能为空！"); return; } if (this.$isBlank(this.inputQuery.entrustSubInv)) { - this.$message.error("请输入接受委托分库！"); + this.$message.error("请输入接受委托仓库！"); return; } diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue index a8e451d..e960986 100644 --- a/src/views/basic/BasicEntrutsReceModify.vue +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -5,9 +5,9 @@
- 当前分库:  + 当前仓库: 
- @@ -56,9 +56,9 @@
- 接受委托分库:  + 接受委托仓库: 
- @@ -167,9 +167,7 @@ export default { action: [ {required: true, message: "请输入扫码单据类型", trigger: "blur"} ], - curInv: [ - {required: true, message: "请输入委托仓库", trigger: "blur"} - ], + entrustInv: [ {required: true, message: "请输入委托验收人仓库", trigger: "blur"} ], @@ -230,11 +228,11 @@ export default { findEntrustSubInvByInv() { - + this.entrustSubInvList = []; let query = { code: this.inputQuery.invWarehouseCode, - + }; filterSub(query) .then((response) => { @@ -258,7 +256,7 @@ export default { }); }, getOrderType() { - + let query = { locSubInvCode: this.inputQuery.invWarehouseCode } diff --git a/src/views/basic/BusTypeChangeModify.vue b/src/views/basic/BusTypeChangeModify.vue index 3a26ad9..a3bcc0a 100644 --- a/src/views/basic/BusTypeChangeModify.vue +++ b/src/views/basic/BusTypeChangeModify.vue @@ -222,6 +222,7 @@ export default { getFromInv() { let subQuery = { code:this.inputQuery.locSubInv, + filter:2 } filterSubByInv(subQuery).then((res) => { if (res.code == 20000) { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index a71c997..74a10f8 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -208,12 +208,12 @@
- 分库： + 仓库：
-
- 提示：进入系统前请选择您默认所在分库  + 提示：进入系统前请选择您默认所仓库 
提交 diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index f835a7e..9ad842c 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -87,6 +87,7 @@ + diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue index 491031a..c872e3b 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -162,9 +162,11 @@ :data="registrationList" style="width: 100%"> - + - + @@ -285,7 +287,7 @@ export default { add: "新增生产企业资质信息", update: "编辑生产企业资质信息", }, - tital:"", + tital: "", currentManufacturer: null, @@ -363,7 +365,7 @@ export default { this.registrationList = []; }, onSubmit() { - this.filterQuery.page=1 + this.filterQuery.page = 1 this.getList(); this.registrationList = []; }, @@ -378,7 +380,7 @@ export default { this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; - + }) .catch(() => { this.loading = false; @@ -393,11 +395,11 @@ export default { this.enterpriseId = row.id; this.editType = 1; this.inputQuery = row; - this.tital="编辑生产企业资质信息"; + this.tital = "编辑生产企业资质信息"; } else { this.enterpriseId = null; this.editType = 0; - this.tital="新增生产企业资质信息"; + this.tital = "新增生产企业资质信息"; this.inputQuery = { auditStatus: 0 }; @@ -480,24 +482,24 @@ export default { this.getRegistrationList(); }, onSubmit2() { - if(this.currentManufacturer==null){ + if (this.currentManufacturer == null) { this.$message.error("请先选中生产企业！"); return } - this.registrationQuery.page=1; + this.registrationQuery.page = 1; this.getRegistrationList(); }, registrationDialog(row) { - if(this.currentManufacturer==null){ + if (this.currentManufacturer == null) { this.$message.error("请先选中生产企业！"); return } - + if (this.$isNotBlank(row)) { this.registrationId = row.id; this.curProductQuery = row; - this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus; + this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus; this.formName = "update"; this.editProductType = 1; } else { @@ -505,7 +507,7 @@ export default { this.formName = "add"; this.curProductQuery = { auditStatus: 0, - cuStatus:this.currentManufacturer.auditStatus + cuStatus: this.currentManufacturer.auditStatus }; } this.registrationVisible = true; @@ -579,7 +581,7 @@ export default { created() { this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name="; this.getList(); - // this.getRegistrationList(); + // this.getRegistrationList(); }, } diff --git a/src/views/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue index 16cff70..230ef2e 100644 --- a/src/views/warehouse/DialogcChangeNewOrder.vue +++ b/src/views/warehouse/DialogcChangeNewOrder.vue @@ -122,8 +122,8 @@ - - - + @@ -242,14 +242,6 @@ export default { this.$message.warning("请选择单据类型！"); return; } - if (this.$isBlank(this.formData.locStorageCode)) { - this.$message.error('当前仓库不能为空'); - return; - } - if (this.$isBlank(this.formData.fromCorp)) { - this.$message.error('当前往来单位不能为空'); - return; - } if (this.$isBlank(this.formData.invWarehouseCode)) { this.$message.error("当前分库不能为空"); return; @@ -305,7 +297,9 @@ export default { this.loading = false; }); }, - + getFormStorageCode(){ + // this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId + }, locCHange() { @@ -346,6 +340,7 @@ export default { }); }, findSubStorageMethod() { + this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId let cQuery = { code: this.formData.invWarehouseCode, filter: 2, diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 68c15af..2c55a70 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -77,14 +77,16 @@ + :disabled="corpOrderIdDisabled" @change="findSubStorageMethod" filterable> {{ item.name }} - {{ item.warehouseName }} + {{ + item.warehouseName + }} @@ -131,11 +133,9 @@ - - {{ item.name }} - {{ item.warehouseName }} + {{ + item.warehouseName + }} @@ -160,7 +162,7 @@ - + @@ -574,7 +576,7 @@ export default { this.$message.error('未选择扫码单据类型'); return } - + if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { this.$message.error('当前分库不能为空'); @@ -683,15 +685,12 @@ export default { this.$message.warning("请选择单据类型！"); return; } - + if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { this.$message.error('当前分库不能为空'); return; } - if (this.$isBlank(this.formData.fromCorp)) { - this.$message.error('当前往来单位不能为空'); - return; - } + if (this.curAction.corpType == 1) { if (this.$isBlank(this.formData.fromSubInvCode)) { this.$message.error('当前往来分库不能为空'); @@ -815,13 +814,14 @@ export default { this.formData.fromCorp = row.name; this.curRow = row; }, - storageChange(row) { - this.formData.fromSubInvCode = ""; - this.formData.fromCorpId = row.code; + getFormStorageCode(code) { + var row= this.fromSubStorageOptions.find(item => item.code == code) + this.formData.fromSubInvCode = row.code + this.formData.fromCorpId = row.parentId; this.formData.fromCorp = row.name; - this.findSubStorageMethod(); }, + deleteCode(index, row) { this.$confirm("是否确定移除一个条码?", "提示", { confirmButtonText: "确定", @@ -888,7 +888,7 @@ export default { let query = { code: this.formData.invWarehouseCode, enabled: true, - type:1 + type: 1 }; getLocalJoinByUser(query) .then((response) => { @@ -926,11 +926,9 @@ export default { this.findSubInvByInv(this.formData.locStorageCode); }, - subStorageChange() { - this.getBusType(); - }, + findMethod(query) { - + this.fromOptions = []; let cQuery = { key: query, @@ -984,7 +982,7 @@ export default { findStorageMethod() { - + if (this.formData.locStorageCode == null) return; this.fromStorageOptions = []; @@ -1000,14 +998,14 @@ export default { }, findSubStorageMethod(val) { - this. getBusType() ; + this.getBusType(); let cQuery = { code: this.formData.invWarehouseCode, filter: 2, }; filterSubByInv(cQuery) .then((response) => { - + this.fromSubStorageOptions = response.data || []; if (val == 1) { @@ -1020,11 +1018,12 @@ export default { findSubInvByInv() { - + this.subInvList = []; let query = { - filter:3 + filter: 3 }; + filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; @@ -1062,7 +1061,7 @@ export default { } }, actionChange(item) { - + this.curAction = this.getActionItem(item); this.findMethod(); @@ -1183,7 +1182,7 @@ export default { }, created() { - + this.formData.code = ''; this.formData.actDate = new Date(); this.codeArray = []; diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 880e0b2..81e5291 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -142,7 +142,7 @@ - +
当前分库： @@ -218,7 +218,6 @@ - @@ -617,7 +616,7 @@ export default { this.findSubStorageMethod(); }, - + getActionName(action) { for (let i = 0; i < this.busTypes.length; i++) { @@ -676,7 +675,7 @@ export default { }, findSubInvByInv(invCode) { - + this.subInvList = []; let query = { pcode: invCode, @@ -754,7 +753,6 @@ export default { }); }, selectProductFunction(event) { - if (event != null) { event.target.select(); } @@ -821,6 +819,7 @@ export default { let tQuery = { code: this.code, customerId: store.getters.customerId, + }; stockOrderDetailQueryProduct(tQuery).then((response) => { @@ -1272,7 +1271,7 @@ export default { }; filterSubByInv(query) .then((response) => { - + this.subInvList = response.data || []; if (this.subInvList != null && this.subInvList.length == 1) { this.formData.invWarehouseCode = this.subInvList[0].code; diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index b07f595..02a3917 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -72,7 +72,7 @@ - { this.loading = false;