diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index 5b8d9d5d1..c89b8568d 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -630,6 +630,15 @@ export async function putawayPrintUpdateRemark(id) { }) } +// 回收料功能最后提交接口 +export async function itemTransformNewCreate(data) { + return request({ + url: baseURL + 'wms/store/item-transform-note/new-create', + method: 'post', + data:data + }) +} + // 根据编号获取字典信息 // export function getDictByCode(code) { diff --git a/fe/PC/src/components/searchPage/index.vue b/fe/PC/src/components/searchPage/index.vue index 9e776cd78..79eb63830 100644 --- a/fe/PC/src/components/searchPage/index.vue +++ b/fe/PC/src/components/searchPage/index.vue @@ -79,13 +79,13 @@ export default { setUTableHeight: { type: Number, default: () => { - return 220; + return 245; } }, // 按钮整体靠右 buttonsAllIsRight:{ type: Boolean, - default: false + default: true }, //名称 formTitle: { diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index 1c74bad84..3a82c7901 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -2456,3 +2456,23 @@ export function utensilType(index, prop) { } return Enum(type, index, prop) } + +// 拆箱/合箱 +export function oprTypeStatus(index, prop) { + let type = { + 0: { + value: 0, + label: "其它" + }, + 1: { + value: 1, + label: "拆箱" + }, + 2: { + value: 2, + label: "合箱" + }, + } + return Enum(type, index, prop) +} + diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 6c66ecf6f..c746257bd 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -3353,6 +3353,7 @@ export const safetyStockWarning = [ // 总成量份 export const Kitting = [ { label: _Names.itemCode, prop: 'partCode' }, + { label: _Names.itemName, prop: 'partName' }, { label: _Names.itemDesc1, prop: "desc1" }, { label: _Names.itemDesc2, prop: "desc2" }, { label: '配置', prop: "conf" }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 0020c6ef2..7ce540d8f 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2908,6 +2908,7 @@ export const splitPackingList = [ { label: "目标计量单位", prop: "toUom" }, { label: "原批次", prop: "fromLot" }, { label: "目标批次", prop: "toLot" }, + { label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" }, { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" }, { label: "采购订单", prop: "purchaseInfo_PoNumber" }, { label: "供应商发货单", prop: "purchaseInfo_AsnNumber" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 2c149c36b..87dcc4765 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1077,9 +1077,9 @@ export const IssueNote = [ { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, - { label: "生效日期", prop: 'activeDate' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "车间", prop: 'workshop' }, - { label: "确认时间", prop: 'confirmTime' }, + { label: "确认时间", prop: 'confirmTime', type: "dateTime" }, // ************** 确认隐藏 ************************ // { label: "ID", prop: 'id' }, // ************** 确认隐藏 ************************ @@ -2123,6 +2123,7 @@ export const splitPackingList = [ { label: "目标计量单位", prop: "toUom" }, { label: "原批次", prop: "fromLot" }, { label: "目标批次", prop: "toLot" }, + { label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" }, { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" }, { label: "采购订单", prop: "purchaseInfo_PoNumber" }, { label: "供应商发货单", prop: "purchaseInfo_AsnNumber" }, diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue index 34b344a12..e1963bd52 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue @@ -198,7 +198,7 @@ export default { concurrencyStamp: null, isPhantom: null, stdPackQty: null, - price:null,//todo:价格字段确定 + // price:null,//todo:价格字段确定 }, editOptions: {}, CreateForm: [ @@ -250,7 +250,7 @@ export default { { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", disabled: true, colSpan: 12 }, // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 }, // todo:字段确定 - { type:"inputNumber", label:"价格", prop:"price", disabled:true, colSpan: 12 }, + // { type:"inputNumber", label:"价格", prop:"price", disabled:true, colSpan: 12 }, { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 }, { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 }, { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 }, diff --git a/fe/PC/src/views/basicData/ItemsManage/Kitting.vue b/fe/PC/src/views/basicData/ItemsManage/Kitting.vue index 22f1fd5c2..f09be7ea1 100644 --- a/fe/PC/src/views/basicData/ItemsManage/Kitting.vue +++ b/fe/PC/src/views/basicData/ItemsManage/Kitting.vue @@ -211,6 +211,10 @@ export default { PalletlFunction (val) { return new Promise((resolve, reject) => { if(val == 1){ + if(!this.CreateFormData.details.length || this.CreateFormData.details.length <= 0){ + this.$errorMsg("请填写明细") + return + } let array = [] let _isEmpty = 0 this.CreateFormData.details.forEach(item => { diff --git a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue index 9b6109adc..295675c0c 100644 --- a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue +++ b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue @@ -72,7 +72,7 @@ @handleSelectionChange="prepareFormData" @SizeChange="searchAlterResultCount($event, searchPageListParams)" @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)" - @tableButtonClick="searchSubmit(arguments)" + @tableButtonClick="searchSubmitHandel(arguments)" > diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue index 3690cb13a..4a29bb420 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue @@ -72,14 +72,14 @@
原料
@@ -96,7 +96,7 @@
重 置 - 确 定 + 提 交 @@ -111,7 +111,9 @@ import { requestData } from "@/utils/processButtonData" import currenTableFlex from "@/components/currenTableFlex" import { filterSelectMixins } from '@/mixins/filter-Select' import detailsRules from '@/utils/rules'; -import { getPageList } from "@/api/wms-api" +import { getPageList,itemTransformNewCreate } from "@/api/wms-api" +import { postInventoryLabelCode_count } from "@/api/wms-core" +import store from '@/store' export default { name: "materialsAdjustmentFunc", mixins: [ @@ -137,7 +139,6 @@ export default { }, data () { return { - isUpdate:false, URL: 'wms/store/item-transform-request', //常用按钮数据 currenButtonData: [ @@ -167,7 +168,21 @@ export default { searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) }, width:"auto", searchButton:false }, - { type: "input", validType:'pointNumber', label: "数量", prop: "qty", width:"auto" }, + { type: "input", validType:'pointNumber', label: "数量", prop: "qty", width:"auto", + rules: [{ + type: "number", + trigger: ["change","blur"], + validator: (rule, value, callback) => { + let _index = rule.field.slice(8,9) + let _qty = Number(this.addPopData_FS[_index].qty) + if(_qty <= 0){ + return callback(new Error('数量必须大于0')) + }else{ + callback() + } + } + }] + }, ], //原料信息 addPopData_YL:[{ @@ -192,21 +207,31 @@ export default { // }, { type: "select", label: "箱码", prop: "packingCode", optionsLabel: "packingCode", optionsValue: "packingCode", - userOptions:this.packingsYL_Options,width:"auto" + userOptions:this.packingsYL_Options,width:"auto", + filterable:true,clearable:true }, // todo: 库存数量、库位：自动带出 { label: "库存数量", prop: "inventoryQty", width:"auto" }, { label: "库位", prop: "locationCode", width:"auto" }, // todo: 小于等于库存数量 { type: "input", validType:'pointNumber', label: "数量", prop: "qty", width:"auto", - rules: detailsRules.numberInput - // rules: [{ - // type: "number", - // trigger: "blur", - // validator: (rule, value, callback) => { - // console.log(7,rule,value) - // } - // }] + rules: [{ + type: "number", + trigger: ["change","blur"], + validator: (rule, value, callback) => { + let _index = rule.field.slice(8,9) + if(this.addPopData_YL[_index].qty == null){ + return callback(new Error('数量不能为空')) + } + let _qty = Number(this.addPopData_YL[_index].qty) + let _invenQty = Number(this.addPopData_YL[_index].inventoryQty) + if(_qty <= 0 || _qty > _invenQty){ + return callback(new Error('数量必须大于0，且不大于库存数量')) + }else{ + callback() + } + } + }] }, ], //混拌料信息 @@ -227,8 +252,26 @@ export default { searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) }, width:"auto", searchButton:false }, - { type: "input", validType:'pointNumber', label: "数量", prop: "qty", width:"auto" }, + { type: "input", validType:'pointNumber', label: "数量", prop: "qty", width:"auto", + rules: [{ + type: "number", + trigger: ["change","blur"], + validator: (rule, value, callback) => { + let _index = rule.field.slice(8,9) + let _qty = Number(this.addPopData_HB[_index].qty) + if(_qty <= 0){ + return callback(new Error('数量必须大于0')) + }else{ + callback() + } + } + }] + }, ], + itemStagingLists:{},//物料相关内容暂存 + locationStagingLists:{},//库位相关内容暂存 + needNewPackingList:[],//需要生成项目的列表信息（N个粉碎料+1个混拌料） + newPackArr:[],//已生成的新箱码 }; }, mounted () { @@ -253,47 +296,275 @@ export default { this.topbutton(val) } }, + // 初始化数据 + initAddPopData(){ + this.addPopData_FS=[{ + itemCode:null, + qty:null, + locationCode:null, + }] + this.addPopData_YL=[{ + itemCode:null, + packingCode:null, + inventoryQty:null, + locationCode:null, + qty:null + }] + this.addPopData_HB=[{ + itemCode:null, + qty:null, + locationCode:null, + }] + }, + // 重置 addPopResetHandle(){ this.$confirm('重置后，字段设置将恢复初始设置，是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', }).then(() => { - this.addPopData_FS=[{ - itemCode:null, - qty:null, - locationCode:null, - }] - this.addPopData_YL=[{ - itemCode:null, - inventoryQty:null, - locationCode:null, - qty:null - }] - this.addPopData_HB=[{ - itemCode:null, - qty:null, - locationCode:null, - }] + this.initAddPopData() }).catch(() => { }); }, + // todo:最后提交接口 + lastCommitHttp(){ + console.log(336,this.newPackArr) + this.addPopColumns_YL.forEach(item=>{ + item.remark = '原料' + }) + let _allDetails = [ + ...this.addPopData_FS, + ...this.addPopColumns_YL + ] + let _toData = this.addPopColumns_HB[0] + let _toItemInfo = this.itemStagingLists[_toData.itemCode] + let _toLocationInfo = this.locationStagingLists[_toData.locationCode] + let _details = [] + _allDetails.forEach((item,index)=>{ + let _itemInfo = this.itemStagingLists[item.itemCode] + let _locationInfo = this.locationStagingLists[item.locationCode] + let _item = { + remark: item.remark || null, + itemCode: item.itemCode || null, + itemName: _itemInfo.name || null, + itemDesc1: _itemInfo.desc1 || null, + itemDesc2: _item_info.desc2 || null, + "fromPackingCode": item.packingCode || null,//todo:粉碎料无packingCode，是否需要添加选择项 + toPackingCode: this.newPackArr[index], + toItemCode: _toData.itemCode || null, + toItemName: _toItemInfo.name || null, + toItemDesc1: _toItemInfo.desc1 || null, + toItemDesc2: _toItemInfo.desc2 || null, + uom: _item_info.basicUom || null, + fromQty: item.qty, + toQty: _toData.qty, + "fromSupplierBatch": null,//todo + "fromArriveDate": null,//todo + "fromProduceDate": null,//todo + "fromExpireDate": null,//todo + "fromLot": null,//todo + "fromStatus": null,//todo + fromLocationCode: item.locationCode || null, + fromLocationArea: _locationInfo.areaCode || null, + fromLocationGroup: _locationInfo.locationGroupCode || null, + fromLocationErpCode: _locationInfo.erpLocationCode || null, + fromWarehouseCode: _locationInfo.warehouseCode || null, + "fromContainerCode": null,//todo + "toSupplierBatch": null,//todo + "toArriveDate": null,//todo + "toProduceDate": null,//todo + "toExpireDate": null,//todo + "toLot": null,//todo + "toStatus": null,//todo + toLocationCode: _toData.locationCode || null, + toLocationArea: _toLocationInfo.areaCode || null, + toLocationGroup: _toLocationInfo.locationGroupCode || null, + toLocationErpCode: _toLocationInfo.erpLocationCode || null, + toWarehouseCode: _toLocationInfo.warehouseCode || null, + "toContainerCode": null,//todo + worker: store.getters.name.userName,//todo + "reasonCode": null,//todo + } + _details.push(_item) + }) + let _recDetail= [ + { + remark: null, + itemCode: _toItemInfo.code || null, + itemName: _toItemInfo.name || null, + itemDesc1: _toItemInfo.desc1 || null, + itemDesc2: _toItemInfo.desc2 || null, + "lot": null,//todo + "supplierBatch": null,//todo + "arriveDate": null,//todo + "produceDate": null,//todo + "expireDate": null,//todo + packingCode: this.newPackArr[this.newPackArr.length - 1], + "containerCode": null,//todo + uom: _toItemInfo.basicUom || null, + qty: _toData.qty, + stdPackQty: Number(_toItemInfo.stdPackQty) || 0, + locationCode: _toData.locationCode || null, + locationArea: _toLocationInfo.areaCode || null, + locationGroup: _toLocationInfo.locationGroupCode || null, + locationErpCode: _toLocationInfo.erpLocationCode || null, + "status": null,//todo + warehouseCode: _toLocationInfo.warehouseCode || null, + "reasonCode": null,//todo + } + ] + let _finalData = { + "tenantId": null,//todo + "remark": null,//todo + "extraProperties": null,//todo + worker: store.getters.name.userName,//todo + activeDate: new Date(),//todo + "number": null,//todo + "requestNumber": null,//todo + "jobNumber": null,//todo + details:_details, + recDetails:_recDetail + } + itemTransformNewCreate(_finalData) + .then(item=>{ + this.$successMsg("提交成功！") + this.initAddPopData() + this.Loading.appMainLoading = false + }) + .catch(err=>{ + this.$errorMsg("提交失败！请重试") + this.Loading.appMainLoading = false + }) + }, + //递归生成箱码部分 + async resendHandle(index){ + this.Loading.appMainLoading = true + if(index >= this.needNewPackingList.length){ + // 箱码全部生成进行提交 + this.lastCommitHttp() + return + } + let _resultBack = await this.createNewPack(index) + //如果成功了，继续发送 + if(_resultBack == 1){ + let _index = Number(index) + 1 + _this.resendHandle(_index) + } + //失败了提示不进行任何处理 + else{ + this.Loading.appMainLoading = false + this.$errorMsg(`创建箱码失败，请重新提交`) + } + }, + // 生成新箱码 + async createNewPack(index){ + let _item = this.needNewPackingList[index] + let _item_info = this.itemStagingLists[_item.itemCode] + let _location_info = this.locationStagingLists[_item.locationCode] + let _creatPackData = { + itemCode: _item_info.code || null, + itemName: _item_info.name || null, + itemDesc1: _item_info.desc1 || null, + itemDesc2: _item_info.desc2 || null, + lot: null,//todo + supplierBatch: null,//todo + arriveDate: null,//todo + produceDate: null,//todo + expireDate: null,//todo + stdPackQty: Number(_item_info.stdPackQty) || 0, + uom: _item_info.basicUom || null, + qty: Number(_item.qty), + labelStatus: 1,//todo + recommendLocationCode: _location_info.code || null,//todo + locationErpCode: _location_info.erpLocationCode || null,//todo + containerCode: null,//todo + supplierCode: null,//todo + poNumber: null,//todo + rpNumber: null,//todo + asnNumber: null,//todo + qLevel: _item_info.elevel || null,//todo + qualityFile: null,//todo + prodLine: null,//todo + team: null,//todo + shift: null,//todo + specifications: null,//todo + supplierName: null,//todo + supplierSimpleName: null,//todo + supplierItemCode: null,//todo + supplierItemName: null,//todo + labelType: null,//todo + planArriveDate: null,//todo + remark:null, + } + let resultBack = null + // // 生成标签（接口） + postInventoryLabelCode_count({count:1}, _creatPackData) + .then(res=>{ resultBack = 1;this.newPackArr[index] = res }) + .catch(err=>{ resultBack = 0 }) + + return resultBack + }, + // 提交 addPopSureHandle(){ + // 检测【粉碎料】信息是否填全 + let _err_FS=0 + this.addPopData_FS.forEach(item=>{ + if(!item.itemCode || Number(item.qty <= 0) || !item.locationCode){ + _err_FS++ + } + }) + if(_err_FS > 0){ + return this.$warningMsg("粉碎料信息未填全，请填写") + } + + // 检测【原料】信息是否填全 + let _err_YL=0 this.addPopData_YL.forEach(item=>{ - console.log(item) + if(!item.itemCode || Number(item.inventoryQty <= 0) || Number(item.qty <= 0) || !item.locationCode || !item.packingCode || item.packingCode.length <= 0){ + _err_YL++ + } + }) + if(_err_YL > 0){ + return this.$warningMsg("原料信息未填全，请填写") + } + + // 检测【混拌料】信息是否填全 + let _err_HB=0 + this.addPopData_HB.forEach(item=>{ + if(!item.itemCode || Number(item.qty <= 0) || !item.locationCode){ + _err_HB++ + } }) - // console.log(this.addPopData_FS) - // console.log(this.addPopData_YL) - // console.log(this.addPopData_HB) + if(_err_HB > 0){ + return this.$warningMsg("混拌料信息未填全，请填写") + } + + // 全部通过验证 + // 创建【粉碎料】箱码 + // 先生成箱码 + let _new_FS = {} + this.needNewPackingList = [ + ...this.addPopData_FS, + ...this.addPopData_HB + ] + this.resendHandle(0) + console.log('粉碎料',this.addPopData_FS) + console.log('原料',this.addPopData_YL) + console.log('混拌料',this.addPopData_HB) }, // 粉碎料下拉 pushFS(data){ - console.log(data) + if(data[1].prop == "itemCode"){ + this.itemStagingLists[data[2]] = data[0] + } + if(data[1].prop == "locationCode"){ + this.locationStagingLists[data[2]] = data[0] + } }, // 原料下拉 pushYL(data){ - console.log(data) if(data[1].prop="itemCode"){ let params = { Sorting: "", @@ -309,64 +580,40 @@ export default { } } this.Loading.appMainLoading = true - // todo:字段确定+清空失效处理 + // todo:字段确定 console.log(311,data[3].$index) this.addPopData_YL[data[3].$index].packingCode = null this.addPopData_YL[data[3].$index].inventoryQty = null this.addPopData_YL[data[3].$index].locationCode = null - this.isUpdate = !this.isUpdate getPageList(params, "wms/inventory/inventory-balance").then((res)=>{ this.itemPackings_YL[data[0].code] = res.items - this.isUpdate = !this.isUpdate - // this.$set(this.addPopColumns_YL[1], 'loading', false) - // this.packingsYL_Options = [] - // this.packingsYL_Options.push({packingCode:1111}) - // this.addPopColumns_YL[1].userOptions.push({packingCode:222}) - // this.$set(this.addPopColumns_YL, 1, { type: "select", label: "箱码", prop: "packingCode", - // // optionsLabel: "packingCode", optionsValue: "packingCode", - // userOptions:[{label:1111,value:1111}],width:"auto",loading:false - // }) - // this.$forceUpdate() - - // // this.packingsYL_Options = this.itemPackings_YL[data[0].code] - // console.log(111) - // this.packingsYL_Options = [{label:1111,value:1111}] - // this.addPopColumns_YL[1].userOptions = [{label:1111,value:1111}] - this.Loading.appMainLoading = false - // this.$forceUpdate() - // console.log(11111111,this.addPopColumns_YL[1]) + this.Loading.appMainLoading = false }) .catch(err=>{ - // console.log(2222) this.Loading.appMainLoading = false }) } }, - changeSelect(prop, val,item,searchData,scope){ - console.log(341,prop, val,item,searchData,scope) + // 原料selet更改 + changeSelect_YL(prop, val,item,searchData,scope){ if(prop == 'packingCode'){ let _currentRow = this.itemPackings_YL[searchData.itemCode].filter(item=>{ return val == item.packingCode }) - console.log(347,_currentRow) // todo:字段确定 - this.addPopData_YL[scope.$index].inventoryQty = _currentRow[0].qty - this.addPopData_YL[scope.$index].locationCode = _currentRow[0].locationCode + this.addPopData_YL[scope.$index].inventoryQty = _currentRow.length > 0 ? _currentRow[0].qty : null + this.addPopData_YL[scope.$index].locationCode = _currentRow.length > 0 ? _currentRow[0].locationCode : null } }, - clearHandle(item,scope){ - // todo:测试 + // 原料清空 + clearHandle_YL(item,scope){ this.addPopData_YL[scope.$index].packingCode = null this.addPopData_YL[scope.$index].inventoryQty = null this.addPopData_YL[scope.$index].locationCode = null + this.addPopData_YL[scope.$index].qty = null }, - updateSelectListTable(data,item,scope,tableData){ - // if(!data){ return } - // if(item.prop == "packingCode"){ - // this.packingsYL_Options = this.itemPackings_YL[tableData[scope.$index].itemCode] - // console.log(318,this.itemPackings_YL) - // console.log(326,this.addPopColumns_YL[1]) - // } + // 原料select展开/关闭 + updateSelectListTable_YL(data,item,scope,tableData){ // 展开 if(data){ if(item.prop == "packingCode"){ @@ -374,43 +621,20 @@ export default { if(!tableData[scope.$index].itemCode || tableData[scope.$index].itemCode.length == 0){ this.$warningMsg("请先选择物料") } - // console.log(tableData[scope.$index].itemCode) if(this.itemPackings_YL[tableData[scope.$index].itemCode]){ this.packingsYL_Options = this.itemPackings_YL[tableData[scope.$index].itemCode] } - // this.isUpdate = !this.isUpdate - // let params = { - // Sorting: "", - // MaxResultCount: 1000, - // SkipCount: 0, - // condition: { - // filters: [{ - // logic: "And", - // column: "itemCode", - // action: "==", - // value: tableData[scope.$index].itemCode - // }] - // } - // } - // this.addPopColumns_YL[1].userOptions = [{packingCode:222}] - // getPageList(params, "wms/inventory/inventory-balance") - // .then(res=>{ - // console.log(11111111111111111111) - // // this.packingsYL_Options = res.items - // this.addPopColumns_YL[1].userOptions = [{packingCode:111}] - // // this.$forceUpdate() - // }) - // .catch(err=>{ - // }) } } - else{ - // this.addPopColumns_YL[1].userOptions = [] - } }, // 混拌料下拉 pushHB(data){ - console.log(data) + if(data[1].prop == "itemCode"){ + this.itemStagingLists[data[2]] = data[0] + } + if(data[1].prop == "locationCode"){ + this.locationStagingLists[data[2]] = data[0] + } }, } }; diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index 88bf86b08..43df1b61f 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -238,7 +238,12 @@
- +