From c18e96fb7ba1fe1b8628b7aac475228011c97b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 9 Sep 2024 17:30:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=83=E9=A9=B0-=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?new=E3=80=91=E6=96=B0=E6=8E=A5=E5=8F=A3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PC/InterFace.New/public/config.js | 6 ++-- PC/InterFace.New/src/api/wms-api.js | 9 ++++++ PC/InterFace.New/src/lang/en.js | 3 +- PC/InterFace.New/src/lang/zh.js | 3 +- PC/InterFace.New/src/main.js | 4 ++- .../src/mixins/TableHeaderMixins.js | 32 +++++++++++++++++++ PC/InterFace.New/src/mixins/TableMixins.js | 6 +++- .../src/utils/baseData/urlOption.js | 2 ++ PC/InterFace.New/src/utils/defaultButtons.js | 12 +++++++ .../src/views/menuList/FromScp_AsnMstr.vue | 5 ++- .../views/menuList/FromScp_NoPoAsnMstr.vue | 5 ++- .../src/views/menuList/FromWms_Part.vue | 5 ++- .../src/views/menuList/FromWms_PoMstr.vue | 5 ++- .../views/menuList/FromWms_ReceiptMstr.vue | 5 ++- .../src/views/menuList/FromWms_Vend.vue | 5 ++- 15 files changed, 94 insertions(+), 13 deletions(-) diff --git a/PC/InterFace.New/public/config.js b/PC/InterFace.New/public/config.js index 8009538..87c0f0b 100644 --- a/PC/InterFace.New/public/config.js +++ b/PC/InterFace.New/public/config.js @@ -1,6 +1,6 @@ // dev_win -window.SITE_CONFIG['baseApi'] = 'http://192.168.1.75:60081' -window.SITE_CONFIG['authApi'] = 'http://192.168.1.75:60080' +window.SITE_CONFIG['baseApi'] = 'http://dev.ccwin-in.com:20016' +window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:20015' window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:20003' //是否登录配置信息【loginName】 window.SITE_CONFIG['isConfigLogin'] = false @@ -15,7 +15,7 @@ window.SITE_CONFIG['appClientId'] = 'InterFaceCenter_ScpWms' // 项目配置内部名称 window.SITE_CONFIG['appClientScope'] = 'InterFaceCenter_ScpWms' // 浏览器名称 -window.SITE_CONFIG['browserTitle'] = '接口看板-NEV' +window.SITE_CONFIG['browserTitle'] = 'WMS-SCP-接口中转中心' // 单点登录使用数据 window.SITE_CONFIG['oidcLogin_url'] = 'http://dev.ccwin-in.com:20006', window.SITE_CONFIG['oidcLogin_clientId'] = 'InterfaceDash_App' diff --git a/PC/InterFace.New/src/api/wms-api.js b/PC/InterFace.New/src/api/wms-api.js index cde9111..d57aaed 100644 --- a/PC/InterFace.New/src/api/wms-api.js +++ b/PC/InterFace.New/src/api/wms-api.js @@ -174,4 +174,13 @@ export function ApiTypeDelete(id, url) { method: 'delete', params:{id:id} }) +} + +// 批量重发 +export function UpdateReceiptStatusWithNewDataAsync(ids, url) { + return request({ + url: baseURL + url + '/UpdateReceiptStatusWithNewDataAsync', + method: 'post', + data:ids + }) } \ No newline at end of file diff --git a/PC/InterFace.New/src/lang/en.js b/PC/InterFace.New/src/lang/en.js index 482170a..1f631ef 100644 --- a/PC/InterFace.New/src/lang/en.js +++ b/PC/InterFace.New/src/lang/en.js @@ -28,7 +28,8 @@ export default { import:'导入', edit:'编辑', delete:'删除', - DetailedQuery:'所有明细查询' + DetailedQuery:'所有明细查询', + BatchRetry:'批量重发' }, columNames:{ CreationTime:'CreationTime', diff --git a/PC/InterFace.New/src/lang/zh.js b/PC/InterFace.New/src/lang/zh.js index 1565b72..dfe67fc 100644 --- a/PC/InterFace.New/src/lang/zh.js +++ b/PC/InterFace.New/src/lang/zh.js @@ -12,7 +12,8 @@ export default { import:'导入', edit:'编辑', delete:'删除', - DetailedQuery:'所有明细查询' + DetailedQuery:'所有明细查询', + BatchRetry:'批量重发' }, columNames:{ CreationTime:'创建时间', diff --git a/PC/InterFace.New/src/main.js b/PC/InterFace.New/src/main.js index 8f3f400..26817a9 100644 --- a/PC/InterFace.New/src/main.js +++ b/PC/InterFace.New/src/main.js @@ -34,7 +34,8 @@ import { defaultFilterBtn, defaultImportBtn, defaultExportBtn, - defaultFilterForDetailBtn + defaultFilterForDetailBtn, + defaultUpReceiptStaManyBtn } from '@/utils/defaultButtons'; Vue.prototype.defaultFieldSettingBtn = defaultFieldSettingBtn; @@ -44,6 +45,7 @@ Vue.prototype.defaultFilterBtn = defaultFilterBtn; Vue.prototype.defaultImportBtn = defaultImportBtn; Vue.prototype.defaultExportBtn = defaultExportBtn; Vue.prototype.defaultFilterForDetailBtn = defaultFilterForDetailBtn; +Vue.prototype.defaultUpReceiptStaManyBtn = defaultUpReceiptStaManyBtn; import * as filters from './filters' // global filters diff --git a/PC/InterFace.New/src/mixins/TableHeaderMixins.js b/PC/InterFace.New/src/mixins/TableHeaderMixins.js index f468695..1e10e27 100644 --- a/PC/InterFace.New/src/mixins/TableHeaderMixins.js +++ b/PC/InterFace.New/src/mixins/TableHeaderMixins.js @@ -1,6 +1,7 @@ import { getPageList, postExport, + UpdateReceiptStatusWithNewDataAsync } from "@/api/wms-api" export const TableHeaderMixins = { @@ -111,6 +112,37 @@ export const TableHeaderMixins = { else if(val == 'custom'){ item.customHandle() } + // 批量重推 /UpdateReceiptStatusWithNewDataAsync + else if(val == 'UpdateReceiptStatusMany'){ + if(!this.multipleSelection || this.multipleSelection.length <= 0){ + this.$warningMsg("请选择数据！") + return + } + this.$confirm('您确定要批量重发吗, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let _ids = [] + this.multipleSelection.forEach(item=>{_ids.push(item.id)}) + if(_ids.length <= 0 || this.Loading.tableLoading){return} + this.Loading.tableLoading = true + let _url = this.URLOption_base.slice(0,this.URLOption_base.indexOf('/')) + UpdateReceiptStatusWithNewDataAsync(_ids,_url) + .then(res=>{ + this.Loading.tableLoading = false + this.$successMsg("重发成功！") + this.paging() + this.$refs.tablePagination_Ref.clearTableSelection(); + }) + .catch(err=>{ + this.Loading.tableLoading = false + console.log(err) + }) + }).catch(() => { + + }); + } }, // 明细筛选弹窗页面显隐控制 changeFilterForDetailShow(data){ diff --git a/PC/InterFace.New/src/mixins/TableMixins.js b/PC/InterFace.New/src/mixins/TableMixins.js index 09f1cd8..3af8e95 100644 --- a/PC/InterFace.New/src/mixins/TableMixins.js +++ b/PC/InterFace.New/src/mixins/TableMixins.js @@ -425,6 +425,10 @@ export const tableMixins = { // 点击抽屉，获取明细后全局通用操作 inlineDialogCallback(){ this.Loading.DrawerLoading = false - } + }, + // 批量重发，可操作状态判断 + selectionForUpdateReceiptStatusMany(data){ + return data.receiptStatus == '2' || data.receiptStatus == '3' + }, } } diff --git a/PC/InterFace.New/src/utils/baseData/urlOption.js b/PC/InterFace.New/src/utils/baseData/urlOption.js index 6dbf55c..b525f57 100644 --- a/PC/InterFace.New/src/utils/baseData/urlOption.js +++ b/PC/InterFace.New/src/utils/baseData/urlOption.js @@ -1,3 +1,5 @@ +// 默认配置 +export const defalutMasterId = 'masterId' //开始------------------只有主表 FromScp_AsnDet------------------ export const FromScp_AsnDet = { diff --git a/PC/InterFace.New/src/utils/defaultButtons.js b/PC/InterFace.New/src/utils/defaultButtons.js index 34b1223..93330bb 100644 --- a/PC/InterFace.New/src/utils/defaultButtons.js +++ b/PC/InterFace.New/src/utils/defaultButtons.js @@ -43,6 +43,18 @@ export function defaultExportBtn(option) { }) } +// 批量重发 +export function defaultUpReceiptStaManyBtn(option) { + return __defaultBtnOption(option,{ + type: "warning", + icon: "el-icon-finished", + label: i18n.t('btns.BatchRetry'), + name: "UpdateReceiptStatusMany", + size: "mini", + isNoPermission:true + }) +} + // 字段设置 export function defaultFieldSettingBtn(option,source) { let _source = source ? source : 'list_api' diff --git a/PC/InterFace.New/src/views/menuList/FromScp_AsnMstr.vue b/PC/InterFace.New/src/views/menuList/FromScp_AsnMstr.vue index 2508e7f..57c63b2 100644 --- a/PC/InterFace.New/src/views/menuList/FromScp_AsnMstr.vue +++ b/PC/InterFace.New/src/views/menuList/FromScp_AsnMstr.vue @@ -1,6 +1,7 @@