From a228e723c0aba7ff6183cbf669d952309ccfdc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 3 Jul 2024 17:36:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=910703=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9+=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/api/wms-api.js | 3 ++- fe/PC/src/mixins/TableHeaderMixins.js | 7 ++++--- fe/PC/src/mixins/TableMixins.js | 4 ++-- fe/PC/src/utils/detailsTableColumns/index.js | 1 + fe/PC/src/utils/tableColumns/index.js | 6 +++++- fe/PC/src/utils/tabsDesTions/index.js | 6 +++++- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index 9c0d1be38..4c31b8aa5 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -709,10 +709,11 @@ export function getInventoryByPackingCode(packingCode){ } // 成品发运申请-批量生成发货单 -export function deliverRequestHandleList(ids) { +export function deliverRequestHandleList(ids,params) { return request({ url: baseURL + 'wms/store/deliver-request/handle-list', method: 'post', + params:params, data:ids }) } diff --git a/fe/PC/src/mixins/TableHeaderMixins.js b/fe/PC/src/mixins/TableHeaderMixins.js index fc176239e..e34786183 100644 --- a/fe/PC/src/mixins/TableHeaderMixins.js +++ b/fe/PC/src/mixins/TableHeaderMixins.js @@ -210,7 +210,7 @@ export const TableHeaderMixins = { }, // 全面筛选组件重新获取页面数据操作 20230215 - overallSearchGetPageHandle(options){ + overallSearchGetPageHandle(options,callback){ let _data_primary = options.data_primary, _data_moreList = options.data_moreList, _option_primary = options.option_primary, @@ -254,6 +254,7 @@ export const TableHeaderMixins = { this.httpOverallSearchData = {} this.httpOverallSearchData.params = JSON.parse(JSON.stringify(_data_primary)) this.httpOverallSearchData.moreList = JSON.parse(JSON.stringify(_data_moreList)) + if(callback)callback() }) // getPageList(this.PageListParams, this.URL).then(res => { // this.tableData = res.items @@ -272,14 +273,14 @@ export const TableHeaderMixins = { // }) }, // 全面筛选所有按钮操作集 20230215 - overallSearchFormClick(options){ + overallSearchFormClick(options,callback){ let _item = options.item; // 普通搜索 + 高级搜索 + 普通重置 + 高级重置 if( _item.name == 'search' || _item.name == 'moreList-search' || _item.name == 'reset' || _item.name == 'moreList-reset' ){ - this.overallSearchGetPageHandle(options) + this.overallSearchGetPageHandle(options,callback) } }, diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index 8c712069b..f7aa1467c 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -169,7 +169,7 @@ export const tableMixins = { // 获取供应商信息过滤tableData getSupplierByCodesHandle_table() { for(let i=0;i{ @@ -293,7 +293,7 @@ export const tableMixins = { this.Loading.DrawerLoading = false return } - if(this.tabsDesTions[i].prop == 'supplierName' || this.tabsDesTions[i].prop == "supplierAddress"){ + if(this.tabsDesTions[i].prop == 'supplierName' || this.tabsDesTions[i].prop == 'supplierShortName' || this.tabsDesTions[i].prop == "supplierAddress"){ let _allSuCode = [this.propsData.supplierCode] this.Loading.DrawerLoading = true allSupplierByCodes(_allSuCode).then(res => { diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 512402da5..687743243 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -1289,6 +1289,7 @@ export const FISDeliverNote = [ { label: "出货数量", prop: "qty" }, { label: "出货库位", prop: "fromLocationCode" }, { label: "出货"+_Names.locationErpCode, prop: "fromLocationErpCode" }, + { label: "Mes器具号", prop: "mesDeliveryContainer" }, { label: "底盘号", prop: "identityNo" }, { label: "任务编号", prop: 'number' }, { label: "标包数量", prop: 'stdPackQty' }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 9dd66d280..16defff4d 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1505,6 +1505,7 @@ export const beforeGroundingReturnNote = [ width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "发货单号", prop: "asnNumber",width: orderWidth }, // { label: "收货单号", prop: "rpNumber", width: orderWidth }, { label: "订单号", prop: 'poNumber' }, @@ -1531,6 +1532,7 @@ export const PurchaseReturnRequest = [ { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, // { label: "备注", prop: 'remark' }, @@ -1551,6 +1553,7 @@ export const PurchaseReturnApprove = [ { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -1582,6 +1585,7 @@ export const PurchaseReturnJob = [ { label: "退货原因代码", prop: 'returnReason' }, { label: "退货原因说明", prop: 'returnReason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "操作员", prop: "worker" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, @@ -1601,6 +1605,7 @@ export const PurchaseReturnNote = [ { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, @@ -1835,7 +1840,6 @@ export const FISDeliverRequest = [ }, { label: "客户代码", prop: "customerCode" }, { label: "客户地址", prop: 'customerAddressCode' }, - { label: "车牌号", prop: 'mesTruckNumber' }, { label: "操作员", prop: 'worker' }, { label: "发货时间", prop: "deliverTime", type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 70619cbaf..dcfea2f14 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -939,6 +939,7 @@ export const automaticCallNote = [ export const beforeGroundingReturnNote = [ { label: "退货单号", prop: "number" }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: 'poNumber' }, { label: "操作员", prop: 'worker' }, @@ -954,6 +955,7 @@ export const PurchaseReturnRequest = [ { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: "poNumber" }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, @@ -967,6 +969,7 @@ export const PurchaseReturnApprove = [ { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: "poNumber" }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -985,6 +988,7 @@ export const PurchaseReturnJob = [ { label: "退货原因代码", prop: 'returnReason' }, { label: "退货原因说明", prop: 'returnReason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "操作员", prop: "worker" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, @@ -998,6 +1002,7 @@ export const PurchaseReturnNote = [ { label: "订单号", prop: "poNumber" }, { label: "发货单号", prop: "asnNumber" }, { label: "供应商代码", prop: "supplierCode" }, + { label: "供应商简称", prop: 'supplierShortName' }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, @@ -1176,7 +1181,6 @@ export const FISDeliverRequest = [ { label: "发货申请单号", prop: "number" }, { label: "客户代码", prop: "customerCode" }, { label: "客户地址", prop: 'customerAddressCode' }, - { label: "车牌号", prop: 'mesTruckNumber' }, { label: "操作员", prop: 'worker' }, { label: "发货时间", prop: "deliverTime", type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" },