diff --git a/src/api/basic/busChangeType.js b/src/api/basic/busChangeType.js index 7819619..e1b491a 100644 --- a/src/api/basic/busChangeType.js +++ b/src/api/basic/busChangeType.js @@ -17,6 +17,14 @@ export function addChangeBusType(query) { }); } +export function removeBusChange(query) { + return axios({ + url: "/spms/bussinessChangeType/remove", + method: "post", + data: query + }); +} + export function deleteChangeBusType(query) { return axios({ diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 37f42b7..81d3917 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -187,6 +187,8 @@ export default { secCheckPc: null, secCheckWebNew: null, secCheckChange: null, + checkBalacne: null, + secCheckBalacne: null, corpType: null, storageCode: null, supplementOrderType: null, @@ -319,6 +321,8 @@ export default { corpType: row.corpType + "", storageCode: row.storageCode, supplementOrderType: row.supplementOrderType, + checkBalacne: row.checkBalacne, + secCheckBalacne: row.secCheckBalacne, }; this.modifyDialogVisible = true; }, diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index a12622e..6f966eb 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -71,11 +71,11 @@ - - - - - + + + + +
寄售类型单据 @@ -216,7 +216,7 @@ import { getChangeBusType, addChangeBusType, deleteChangeBusType, - updateChangeBusType + updateChangeBusType, removeBusChange } from "../../api/basic/busChangeType"; export default { @@ -306,7 +306,17 @@ export default { }); }, - + removeBusChangeType() { + let query = { + scAction: this.inputQuery.action, + }; + removeBusChange(query) + .then((response) => { + this.changeList = []; + }) + .catch(() => { + }); + }, addChangeType() { this.changeEdit = 0; this.editQuery = {}; @@ -367,6 +377,7 @@ export default { this.getList() } else { this.visibleChange = false; + this.removeBusChangeType(); } } , diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 302f7e6..abcef7d 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -234,13 +234,23 @@ UDI扫码通
+ + +
- 自动补录单据 + 自动缺量补单 + +
+ + +
+ 自动平衡补单
+ @@ -289,9 +299,18 @@ + + + + +
+ 自动缺量补单 + +
+
- 自动补录单据 + 自动平衡补单
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue index 0cf9a27..69431df 100644 --- a/src/views/basic/basicCompanyProductsImport.vue +++ b/src/views/basic/basicCompanyProductsImport.vue @@ -1,879 +1,880 @@ diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 13028a8..e0ab71f 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -472,7 +472,8 @@ const formJson = { code: null, status: 1, advanceType: false, - isDefault: false + isDefault: false, + level:1, }; export default { data() { @@ -815,8 +816,10 @@ export default { }); }, changeLevel(row) { + this.formData.pcode =null; this.getParentInv(this.formData.level); }, + loadLinkData(row) { let query = { code: row.code diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index dc243f3..372466d 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -36,6 +36,18 @@ + + + + {{ item.name }} + + + @@ -70,7 +82,8 @@ - + + + + --> + + + + + + { }); }, + getStorageName(code) { + for (let i = 0; i < this.storageList.length; i++) { + if (this.storageList[i].code === code) { + return this.storageList[i].name; + } + } + }, handleErrorDetail(poistion) { var mOrder = this.list[poistion]; this.errorDetail = mOrder.remark; diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue index 7382220..34f6a62 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -105,6 +105,11 @@ {{ scope.row.fromCorp }} + + + @@ -729,7 +729,13 @@ export default { }; filterAllByUser(cQuery) .then((response) => { - this.fromStorageOptions = response.data || []; + let temp = response.data || []; + for(let i = 0;i { }); @@ -1245,9 +1251,15 @@ export default { } }, actionChange(item) { - this.curAction = this.getActionItem(item); - this.formData.locStorageCode = this.curAction.storageCode; - console.log(this.curAction.corpType + "---" + this.formData.locStorageCode + "-----" + this.curAction.action); + console.log("item = " + item); + if (item == '') { + this.formData.locStorageCode == null; + } else { + this.curAction = this.getActionItem(item); + this.formData.locStorageCode = this.curAction.storageCode; + console.log(this.curAction.corpType + "---" + this.formData.locStorageCode + "-----" + this.curAction.action); + } + }, locInChange(item) { console.log(item); diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index 97ee13d..2f86552 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -130,7 +130,7 @@ type="text" size="small" @click.native="supplementOrder(scope.row)"> - 补单 + 平衡补单 @@ -162,8 +162,8 @@ width="55"> - - + +