From 98033afb112c0a03de39963fc7a31c6447b2e275 Mon Sep 17 00:00:00 2001 From: zhousq Date: Thu, 8 Aug 2024 21:52:26 +0800 Subject: [PATCH 001/136] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/systemInstallPackage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/systemInstallPackage/index.vue b/src/views/system/systemInstallPackage/index.vue index 6a8d47ec8..a5b4eef33 100644 --- a/src/views/system/systemInstallPackage/index.vue +++ b/src/views/system/systemInstallPackage/index.vue @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:system-install-package:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:system-install-package:delete'}), // 删除 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:system-install-package:delete'}), // 删除 ] // 列表-操作按钮事件 From 292d96dbb90df895b7b5fe930b5c23e215a723fa Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 9 Aug 2024 09:20:21 +0800 Subject: [PATCH 002/136] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecordFirst/addForm.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue index ebcab9ac7..4f4777f9a 100644 --- a/src/views/qms/inspectionRecordFirst/addForm.vue +++ b/src/views/qms/inspectionRecordFirst/addForm.vue @@ -715,6 +715,7 @@ if (props.basicFormWidth) { dialogWidth.value = props.isBusiness ? '60%' : '40%' } const rules = ref({ + inspectionSchemeCode: [{ required: true, message: '请选择检验方案', trigger: 'blur' }], inspectionTime: [{ required: true, message: '请选择检验时间', trigger: 'blur' }], 'inspectionJobCharacteristicsUpdateReqVO.description': [ { required: true, message: '请填写描述', trigger: ['blur', 'change'] } From acfd238950f56a37b8046a16c9d5a21b43a7942d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 9 Aug 2024 10:48:32 +0800 Subject: [PATCH 003/136] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspectionQ3/inspectionQ3.data.ts | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index ad671293b..1658dca07 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -20,8 +20,14 @@ export const Q3Rules = reactive({ qty: [required], code: [required], defectLocation: [required], - defectType: [required], - problemReason: [required], + defectType: [ + { required: true, message: '缺陷类型不能为空', trigger: 'blur' }, + { max: 64, message: '不得超过64个字符', trigger: 'blur' } + ], + problemReason: [ + { required: true, message: '问题原因不能为空', trigger: 'blur' }, + { max: 64, message: '不得超过64个字符', trigger: 'blur' } + ], priority: [required], amount: [required], costCode: [required], @@ -232,24 +238,26 @@ export const Q3 = useCrudSchemas( label: '缺陷类型', field: 'defectType', sort: 'custom', - dictType: DICT_TYPE.DEFECT_TYPE, - dictClass: 'string', isSearch: false, isTable: false, - tableForm: { - type: 'Select' + table: { + width: '150' + }, + form: { + component: 'Input' } }, { label: '问题原因', field: 'problemReason', sort: 'custom', - dictType: DICT_TYPE.PROBLEM_REASON, - dictClass: 'string', isSearch: false, isTable: false, - tableForm: { - type: 'Select' + table: { + width: '150' + }, + form: { + component: 'Input' } }, { From ea8ac3af5214ca360ca283d14290424690288dac Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 10:52:11 +0800 Subject: [PATCH 004/136] =?UTF-8?q?WMS=E7=94=B5=E8=84=91=E7=AB=AF=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E4=BF=9D=E6=8C=81=E4=B8=8D=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerDeliveryForecast/index.vue | 16 ++++++++-- .../relegate/relegateRecord/index.vue | 16 ++++++++-- .../relegate/relegateRequest/index.vue | 28 ++++++++++++------ .../countManage/count/countJobMain/index.vue | 8 ++--- .../countManage/count/countPlanMain/index.vue | 22 ++++++++------ .../count/countRecordMain/index.vue | 2 +- .../count/countRequestMain/index.vue | 28 ++++++++++-------- .../countadjustRequestMain/index.vue | 20 ++++++++----- .../customerreceiptRequestMain/index.vue | 20 ++++++++----- .../customerreturnJobMain/index.vue | 12 ++++---- .../customerreturnRequestMain/index.vue | 20 ++++++++----- .../deliver/deliverJobMain/index.vue | 8 ++--- .../deliver/deliverRequestMain/index.vue | 20 ++++++++----- .../deliverplan/deliverPlanMain/index.vue | 22 ++++++++------ .../deliverplan/saleMain/index.vue | 8 +++-- .../saleShipmentMainRecord/index.vue | 16 ++++++++-- .../saleShipmentMainRequest/index.vue | 22 ++++++++------ .../stockup/stockupMainJob/index.vue | 8 ++--- .../stockup/stockupMainRequest/index.vue | 20 ++++++++----- .../wms/inventoryManage/balance/index.vue | 2 +- .../containerBindRecord/index.vue | 8 +++-- .../containerinit/containerRepair/index.vue | 8 +++-- .../containerUnbindRecord/index.vue | 8 +++-- .../containerinit/containerinitadd/index.vue | 12 +++++--- .../containerinitrecord/index.vue | 8 +++-- .../wms/inventoryManage/expectin/index.vue | 4 +-- .../wms/inventoryManage/expectout/index.vue | 4 +-- .../locationcapacity/index.vue | 2 +- .../wms/inventoryManage/transaction/index.vue | 2 +- .../wms/inventoryManage/transferlog/index.vue | 2 +- .../containerMainRequest/index.vue | 28 ++++++++++++------ .../containerRecordMain/index.vue | 10 +++++-- .../initialContainerMainRequest/index.vue | 28 ++++++++++++------ .../scrapContainerMainRequest/index.vue | 28 ++++++++++++------ .../inventoryinitRequestMain/index.vue | 20 ++++++++----- .../packageoverJobMain/index.vue | 22 ++++++++++---- .../packageoverRequestMain/index.vue | 20 ++++++++----- .../packageoverRetrospect/index.vue | 8 ++++- .../scrap/scrapJobMain/index.vue | 6 ++-- .../scrap/scrapRequestMain/index.vue | 20 ++++++++----- .../sparepartsrequisitionJobMain/index.vue | 6 ++-- .../unplannedissueJobMain/index.vue | 6 ++-- .../unplannedissueRequestMain/index.vue | 20 ++++++++----- .../unplannedreceiptJobMain/index.vue | 6 ++-- .../unplannedreceiptRequestMain/index.vue | 20 ++++++++----- .../issueManage/issue/issueJobMain/index.vue | 8 ++--- .../issue/issueRequestMain/index.vue | 20 ++++++++----- .../productionreceiptJobMain/index.vue | 6 ++-- .../productionreturnJobMain/index.vue | 6 ++-- .../productionreturnRequestMain/index.vue | 20 ++++++++----- .../productionreturnRequestMainNo/index.vue | 20 ++++++++----- .../productionscrapRequestMain/index.vue | 20 ++++++++----- .../repleinsh/repleinshJobMain/index.vue | 6 ++-- .../repleinsh/repleinshRequestMain/index.vue | 20 ++++++++----- .../inventorychangeRequestMain/index.vue | 20 ++++++++----- .../inventorymoveJobMain/index.vue | 6 ++-- .../inventorymoveRequestMain/index.vue | 20 ++++++++----- .../productionplan/productionMain/index.vue | 28 ++++++++++-------- .../productionMainAssemble/index.vue | 28 ++++++++++-------- .../productionMainAssembleSparePart/index.vue | 28 ++++++++++-------- .../productionMainPredictSparePart/index.vue | 29 +++++++++++-------- .../qadproductionplan/index.vue | 14 +++++++-- .../productputawayJobMain/index.vue | 6 ++-- .../productputawayRequestMain/index.vue | 20 ++++++++----- .../productputawayAssembleJobMain/index.vue | 6 ++-- .../index.vue | 20 ++++++++----- .../productreceiptJobMain/index.vue | 6 ++-- .../productreceiptRecordMain/index.vue | 2 +- .../productreceiptRequestMain/index.vue | 20 ++++++++----- .../productreceiptAssembleJobMain/index.vue | 6 ++-- .../index.vue | 4 +-- .../index.vue | 20 ++++++++----- .../productreceiptscrapJobMain/index.vue | 6 ++-- .../productreceiptscrapRequestMain/index.vue | 20 ++++++++----- .../productredressJobMain/index.vue | 16 ++++++---- .../productredressRecordMain/index.vue | 8 ++++- .../productredressRequestMain/index.vue | 28 ++++++++++++------ .../productscrapRequestMain/index.vue | 20 ++++++++----- 78 files changed, 702 insertions(+), 429 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue index 8753a492e..0a8ef27a1 100644 --- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -180,7 +186,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +208,7 @@ const handleDelete = async (id: number) => { await CustomerDeliveryForecastApi.deleteCustomerDeliveryForecast(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue index 84cc1d5d0..501d78c97 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue @@ -147,7 +147,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -193,7 +199,11 @@ const submitForm = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -211,7 +221,7 @@ const handleDelete = async (id: number) => { await RelegateRecordMainApi.deleteRelegateRecordMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index c2f08f68a..7497dabc6 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -364,7 +364,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -417,7 +423,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -428,7 +434,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -439,7 +445,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -450,7 +456,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -461,7 +467,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -485,7 +491,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -630,7 +636,11 @@ const submitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -674,7 +684,7 @@ const handleDelete = async (id: number) => { await RelegateRequestMainApi.deleteRelegateRequestMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index 4590adb4f..b09b17706 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -239,7 +239,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = true try { await CountJobMainApi.abandonCountJobMain(row.id) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -249,7 +249,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = true try { await CountJobMainApi.acceptCountJobMain(row.id) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -271,7 +271,7 @@ const handleClose = async (id: number) => { tableObject.loading = true await CountJobMainApi.closeCountJobMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -282,7 +282,7 @@ const handleDone = async (id: number) => { await message.confirm('确认完成吗？') tableObject.loading = true await CountJobMainApi.doneCountJobMain(id) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 252a39a52..c911417c1 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('打开成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -320,7 +320,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('关闭成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -333,7 +333,7 @@ const buttonTableClick = async (val, row) => { await CountPlanMainApi.submit(row.id) message.success(t('提交审批成功')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } else if (val == 'mainPlanTur') { // 驳回 await message.confirm('确认要驳回吗？') @@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('驳回成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('审批已通过')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -370,7 +370,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('发布成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -384,7 +384,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -606,7 +606,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -689,7 +689,11 @@ const submitForm = async (formType, data) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue index ab0a9db8b..830bf6e65 100644 --- a/src/views/wms/countManage/count/countRecordMain/index.vue +++ b/src/views/wms/countManage/count/countRecordMain/index.vue @@ -140,7 +140,7 @@ const buttonTableClick = async (val, row) => { CountRecordMainApi.generateCountRecordMain(row.id).then(()=>{ message.success(t('生成成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index e1de90f2d..cd29c597c 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -183,7 +183,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) => CountRequestMainApi.reCount(row).then((res)=>{ message.success('重盘成功') getLoading?.close() - getList() + buttonBaseClick('refresh',null) }).catch((err) => { getLoading?.close() }) @@ -198,7 +198,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) => CountRequestMainApi.superviseCount(row).then((res)=>{ message.success('监盘成功') getLoading?.close() - getList() + buttonBaseClick('refresh',null) }).catch((err) => { getLoading?.close() }) @@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('关闭成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -336,7 +336,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('添加成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -350,7 +350,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('提交审批成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -364,7 +364,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('驳回成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -378,7 +378,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('审批已通过')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -392,7 +392,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('处理成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -429,7 +429,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('已生成盘点调整申请')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -443,7 +443,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('解冻成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -486,7 +486,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -545,7 +545,11 @@ const submitForm = async (formType, data) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index ee5554732..3d5f41c6f 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -206,7 +206,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.close(row.id).then(() => { message.success(t('关闭成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -217,7 +217,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.reAdd(row.id).then(() => { message.success(t('添加成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -228,7 +228,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.submit(row.id).then(() => { message.success(t('提交审批成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -239,7 +239,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.refused(row.id).then(() => { message.success(t('驳回成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -250,7 +250,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.agree(row.id).then(() => { message.success(t('审批已通过')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -266,7 +266,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.handle(row.id).then(() => { message.success(t('处理成功')) getLoading?.close() - getList() + buttonBaseClick('refresh',null) }).catch(err => { getLoading?.close() console.log(err) @@ -306,7 +306,7 @@ const handleDelete = async (id: number) => { await CountadjustRequestMainApi.deleteCountadjustRequestMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -365,7 +365,11 @@ const submitForm = async (formType, data) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue index 2cd3757d9..47b5b1aab 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue @@ -218,7 +218,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -229,7 +229,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -240,7 +240,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -251,7 +251,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -262,7 +262,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -273,7 +273,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -313,7 +313,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -374,7 +374,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue index a8dc7be9c..4a7a883b2 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue @@ -305,12 +305,12 @@ const buttonTableClick = async (val, row) => { handleHandle(aaa) } else if (val == 'mainJobAba') { // 放弃 await CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) // await message.confirm('确认要放弃吗？') // console.log('列表-操作按钮事件-放弃') // CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => { // message.success(t('common.updateSuccess')) - // getList() + // buttonBaseClick('refresh',null) // }).catch(err => { // console.log(err) // }) @@ -319,18 +319,18 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-关闭') CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.masterId).then(() => { message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) } else if (val == 'mainJobAcc') { // 承接 await CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) // await message.confirm('确认要承接吗？') // console.log('列表-操作按钮事件-承接') // CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => { // message.success(t('common.updateSuccess')) - // getList() + // buttonBaseClick('refresh',null) // }).catch(err => { // console.log(err) // }) @@ -352,7 +352,7 @@ const handleHandle = async (data) => { await message.confirm(t('common.confirmHandle')) await CustomerreturnJobMainApi.executeCustomerreturnJobMain(data) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index a65804247..b46e6663e 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -358,7 +358,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.close(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -368,7 +368,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.reAdd(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -379,7 +379,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.submit(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -390,7 +390,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.refused(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -401,7 +401,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.agree(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -412,7 +412,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.handle(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -625,7 +625,7 @@ const handleDelete = async (id: number) => { await CustomerreturnRequestMainApi.deleteCustomerreturnRequestMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -742,7 +742,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 83153f2cf..142ca8905 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -313,13 +313,13 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 await DeliverJobMainApi.abandonDeliverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await DeliverJobMainApi.closeDeliverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await DeliverJobMainApi.acceptDeliverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 @@ -337,7 +337,7 @@ const handleHandle = async (data) => { await message.confirm(t('common.confirmHandle')) await DeliverJobMainApi.executeDeliverJobMain(data) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index eab590c56..59a449b0c 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -313,7 +313,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -335,7 +335,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -346,7 +346,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -357,7 +357,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -368,7 +368,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -461,7 +461,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -561,7 +561,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 72507bad8..031b80c78 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -318,7 +318,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -329,7 +329,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -340,7 +340,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -351,7 +351,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -362,7 +362,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -373,7 +373,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -384,7 +384,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -420,7 +420,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -527,7 +527,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue index 04aac908e..7bd7a29e7 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue @@ -240,7 +240,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -296,7 +296,11 @@ const submitForm = async (formType, data) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index 59d72454d..c59689fbf 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -127,7 +127,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -165,7 +171,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -183,7 +193,7 @@ const handleDelete = async (id: number) => { await SaleShipmentMainRecordApi.deleteSaleShipmentMainRecord(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index d5407b550..2ded90f16 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -258,7 +258,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -269,7 +269,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -291,7 +291,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -302,7 +302,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -313,7 +313,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.abort(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -385,7 +385,11 @@ const submitForm = async (formType, submitData) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -430,7 +434,7 @@ const handleDelete = async (id: number) => { await SaleShipmentMainApi.deleteSaleShipmentMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index 3c0bd0bb5..0ab075f66 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -202,13 +202,13 @@ const buttonTableClick = async (val, row) => { handleHandle } else if (val == 'mainJobAba') { // 放弃 await StockupJobMainApi.abandonStockupMainJob(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await StockupJobMainApi.closeStockupMainJob(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await StockupJobMainApi.acceptStockupMainJob(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 @@ -226,7 +226,7 @@ const handleHandle = async (data) => { await message.confirm(t('common.confirmHandle')) await StockupJobMainApi.executeStockupMainJob(data) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index ef987afd1..7ea3de8f5 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -277,7 +277,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -288,7 +288,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -299,7 +299,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -310,7 +310,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -321,7 +321,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -332,7 +332,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -398,7 +398,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -486,7 +486,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index cb7edfa86..1d0d36a8b 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -285,7 +285,7 @@ const handleDelete = async (id: number) => { await BalanceApi.deleteBalance(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue index 94f4f18c6..acad54469 100644 --- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue @@ -208,7 +208,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -241,7 +241,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue index 9b60a6338..a24731e90 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue @@ -207,7 +207,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -240,7 +240,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue index dddc7cb22..5e637cf70 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -207,7 +207,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -240,7 +240,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index 036d0a32c..bf6823ad5 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -193,7 +193,7 @@ const repairSubmit = async (id: number) => { await ContainerMainApi.repairSubmitContainerRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -205,7 +205,7 @@ const scrapSubmit = async (id: number) => { await ContainerMainApi.scrapSubmitContainerRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -259,7 +259,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -313,7 +313,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 初始化 **/ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue index 80788bf96..8e995910d 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue @@ -205,7 +205,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -238,7 +238,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue index 98e4ec8bd..79d3229be 100644 --- a/src/views/wms/inventoryManage/expectin/index.vue +++ b/src/views/wms/inventoryManage/expectin/index.vue @@ -170,7 +170,7 @@ const handleSelectionDelete = async ()=>{ message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - getList() + buttonBaseClick('refresh',null) } catch {} } @@ -213,7 +213,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue index 973c12b43..b433d8ae1 100644 --- a/src/views/wms/inventoryManage/expectout/index.vue +++ b/src/views/wms/inventoryManage/expectout/index.vue @@ -170,7 +170,7 @@ const handleSelectionDelete = async ()=>{ message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - getList() + buttonBaseClick('refresh',null) } catch {} } // 列表-操作按钮 @@ -212,7 +212,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue index 481e6799d..39d37e344 100644 --- a/src/views/wms/inventoryManage/locationcapacity/index.vue +++ b/src/views/wms/inventoryManage/locationcapacity/index.vue @@ -167,7 +167,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue index e2a013804..d08aec392 100644 --- a/src/views/wms/inventoryManage/transaction/index.vue +++ b/src/views/wms/inventoryManage/transaction/index.vue @@ -168,7 +168,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue index 1303b5ef2..a59a5d54b 100644 --- a/src/views/wms/inventoryManage/transferlog/index.vue +++ b/src/views/wms/inventoryManage/transferlog/index.vue @@ -167,7 +167,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 011b6b43d..67102c45b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -306,7 +306,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -348,7 +354,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -359,7 +365,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -370,7 +376,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -381,7 +387,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -392,7 +398,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -403,7 +409,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -477,7 +483,11 @@ const submitForm = async (formType,submitData) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -498,7 +508,7 @@ const handleDelete = async (id: number) => { await ContainerMainRequestApi.deleteContainerMainRequest(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index f4dba5289..6c8da9a16 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -162,7 +162,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -215,7 +221,7 @@ const handleDelete = async (id: number) => { await ContainerRecordMainApi.deleteContainerRecordMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 4563f3671..cdb1ec34a 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -268,7 +268,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -301,7 +307,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -312,7 +318,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -323,7 +329,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -334,7 +340,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -345,7 +351,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -356,7 +362,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -432,7 +438,11 @@ const submitForm = async (formType,submitData) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -453,7 +463,7 @@ const handleDelete = async (id: number) => { await ContainerMainRequestApi.deleteContainerMainRequest(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 34eb56e4c..dcf98de1c 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -290,7 +290,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -323,7 +329,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -334,7 +340,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -345,7 +351,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -356,7 +362,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -367,7 +373,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -378,7 +384,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -457,7 +463,11 @@ const submitForm = async (formType,submitData) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -478,7 +488,7 @@ const handleDelete = async (id: number) => { await ContainerMainRequestApi.deleteContainerMainRequest(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 6d9ca8f17..90793b7ac 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -297,7 +297,7 @@ const handleClose = async (id: number) => { await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -310,7 +310,7 @@ const handleReAdd = async (id: number) => { await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -323,7 +323,7 @@ const handleSubmit = async (id: number) => { await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id) message.success(t('common.updateSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -336,7 +336,7 @@ const handleAgree = async (id: number) => { await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -348,7 +348,7 @@ const handleHandle = async (id: number) => { tableObject.loading = true await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} tableObject.loading = false } @@ -362,7 +362,7 @@ const handleRefused = async (id: number) => { await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -392,7 +392,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // await InventoryinitRequestMainApi.deleteInventoryinitRequestMain(id) // message.success(t('common.delSuccess')) // // 刷新列表 -// await getList() +// buttonBaseClick('refresh',null) // } catch {} // } @@ -453,7 +453,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue index 2f6f71de1..14ae005fc 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue @@ -132,7 +132,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -167,17 +173,17 @@ const buttonTableClick = async (val, row) => { await message.confirm('确认要关闭吗？') await PackageoverJobMainApi.closePackageoverJobMain(row.masterId) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) }else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) } else if (val == 'mainJobAcc') { // 承接 await PackageoverJobMainApi.acceptPackageoverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAba') { // 放弃 await PackageoverJobMainApi.abandonPackageoverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } @@ -208,7 +214,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() @@ -229,7 +239,7 @@ const handleDelete = async (id: number) => { await PackageoverJobMainApi.deletePackageoverJobMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 1ac4e1452..7edb981c1 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -257,7 +257,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -268,7 +268,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -279,7 +279,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -290,7 +290,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -301,7 +301,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -312,7 +312,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -354,7 +354,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -419,7 +419,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index 80f672fb3..3f2ee68f7 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -126,7 +126,13 @@ const buttonBaseClick = (val, item) => { if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue index f7ddbe650..676beaacc 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await ScrapJobMainApi.abandonScrapJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await ScrapJobMainApi.closeScrapJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await ScrapJobMainApi.acceptScrapJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 814dab997..20177ff95 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -291,7 +291,7 @@ const handleClose = async (id: number) => { await ScrapRequestMainApi.closeScrapRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -303,7 +303,7 @@ const handleReAdd = async (id: number) => { await ScrapRequestMainApi.reAddScrapRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -315,7 +315,7 @@ const handleSubmit = async (id: number) => { await ScrapRequestMainApi.submitScrapRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -327,7 +327,7 @@ const handleRefused = async (id: number) => { await ScrapRequestMainApi.refusedScrapRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -339,7 +339,7 @@ const handleAgree = async (id: number) => { await ScrapRequestMainApi.agreeScrapRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -351,7 +351,7 @@ const handleHandle = async (id: number) => { await ScrapRequestMainApi.handleScrapRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -383,7 +383,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -461,7 +461,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue index 714ac4696..eb90f3cc6 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue index 19d7c0bb8..e53943ae3 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index aa62f4d82..72eb5df3a 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -294,7 +294,7 @@ const handleHandle = async (id: number) => { await UnplannedissueRequestMainApi.handleUnplannedissueRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 审批通过按钮操作 */ @@ -304,7 +304,7 @@ const handleAgree = async (id: number) => { await UnplannedissueRequestMainApi.agreeUnplannedissueRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 审批驳回按钮操作 */ @@ -314,7 +314,7 @@ const handleRefused = async (id: number) => { await UnplannedissueRequestMainApi.refusedUnplannedissueRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 提交按钮操作 */ @@ -324,7 +324,7 @@ const handleSubmit = async (id: number) => { await UnplannedissueRequestMainApi.submitUnplannedissueRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } @@ -335,7 +335,7 @@ const handleClose = async (id: number) => { await UnplannedissueRequestMainApi.closeUnplannedissueRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 重新添加按钮操作 */ @@ -345,7 +345,7 @@ const handleReAdd = async (id: number) => { await UnplannedissueRequestMainApi.reAddUnplannedissueRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 添加/修改操作 */ @@ -401,7 +401,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -481,7 +481,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue index 173434adf..34ba89d23 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await UnplannedreceiptJobMainApi.abandonUnplannedreceiptJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await UnplannedreceiptJobMainApi.closeUnplannedreceiptJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await UnplannedreceiptJobMainApi.acceptUnplannedreceiptJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index a77e37b73..596f9eaa7 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -513,7 +513,7 @@ const handleClose = async (id: number) => { await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -527,7 +527,7 @@ const handleReAdd = async (id: number) => { await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -541,7 +541,7 @@ const handleSubmit = async (id: number) => { await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -555,7 +555,7 @@ const handleRefused = async (id: number) => { await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -569,7 +569,7 @@ const handleAgree = async (id: number) => { await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -582,7 +582,7 @@ const handleHandle = async (id: number) => { try { await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -654,7 +654,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -741,7 +741,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index a0fc82fce..5489eadbd 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -269,16 +269,16 @@ const buttonTableClick = async (val, row) => { }] } await IssueJobMainApi.executeIssueMain(aaa) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAba') { // 放弃 await IssueJobMainApi.abandonIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await IssueJobMainApi.closeIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await IssueJobMainApi.acceptIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 43b0edb6f..2f8e7a6ab 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -328,7 +328,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -339,7 +339,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -350,7 +350,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -361,7 +361,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -372,7 +372,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -430,7 +430,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -519,7 +519,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index 611dd428c..096a6dc78 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -272,13 +272,13 @@ const buttonTableClick = async (val, row) => { ProductionreceiptJobMainApi.executeIssueMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductionreceiptJobMainApi.abandonIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductionreceiptJobMainApi.closeIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductionreceiptJobMainApi.acceptIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index 2d64cb732..922094c35 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -244,13 +244,13 @@ const buttonTableClick = async (val, row) => { ProductionreturnJobMainApi.executeProductionreturnMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 62d1cd711..7ed0e0d69 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -374,7 +374,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -385,7 +385,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -396,7 +396,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -407,7 +407,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -500,7 +500,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -594,7 +594,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -677,7 +677,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 2ad072261..e7c223aea 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -344,7 +344,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -366,7 +366,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -377,7 +377,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -388,7 +388,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -481,7 +481,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -538,7 +538,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -607,7 +607,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 3f8cae170..2e5272cea 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -374,7 +374,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -385,7 +385,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -396,7 +396,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -407,7 +407,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -500,7 +500,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -594,7 +594,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -676,7 +676,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue index d780368bc..c7d0035a6 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue @@ -303,13 +303,13 @@ const buttonTableClick = async (val, row) => { RepleinshJobMainApi.executeRepleinshMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await RepleinshJobMainApi.abandonRepleinshMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await RepleinshJobMainApi.closeRepleinshMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await RepleinshJobMainApi.acceptRepleinshMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue index 578d0b2ed..f3ee228f1 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue @@ -236,7 +236,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -247,7 +247,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -258,7 +258,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -269,7 +269,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -291,7 +291,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -331,7 +331,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -404,7 +404,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 3fd65259a..8aaab1ed4 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -297,7 +297,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -308,7 +308,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -319,7 +319,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -330,7 +330,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -341,7 +341,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -352,7 +352,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -392,7 +392,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -488,7 +488,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index 582b7104b..496dd016e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -272,13 +272,13 @@ const buttonTableClick = async (val, row) => { InventorymoveJobMainApi.executeInventorymoveMain(row.masterId) } else if (val == 'mainJobAba') { // 放弃 await InventorymoveJobMainApi.abandonInventorymoveMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await InventorymoveJobMainApi.closeInventorymoveMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await InventorymoveJobMainApi.acceptInventorymoveMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index d7c1d4a8c..499e908c3 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -510,7 +510,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -521,7 +521,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -532,7 +532,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -543,7 +543,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -554,7 +554,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -565,7 +565,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -627,7 +627,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -743,7 +743,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 70e5f5693..c107abc6d 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -316,7 +316,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -327,7 +327,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -353,7 +353,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -408,7 +408,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -420,7 +420,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -434,7 +434,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -481,7 +481,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } @@ -534,7 +534,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -607,7 +607,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index db022f33e..d9923a922 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -314,7 +314,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -325,7 +325,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -353,7 +353,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -398,7 +398,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -409,7 +409,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -421,7 +421,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -435,7 +435,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -497,7 +497,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -572,7 +572,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } @@ -609,7 +613,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index f18d7babd..f289523a4 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -332,7 +332,7 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -343,7 +343,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -386,7 +386,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -409,7 +409,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -423,7 +423,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -485,7 +485,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -559,7 +559,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } @@ -598,7 +602,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 37d343540..3585c8f56 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -332,7 +332,8 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) + }).catch(err => { tableObject.loading = false console.log(err) @@ -343,7 +344,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -355,7 +356,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -387,7 +388,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -398,7 +399,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -410,7 +411,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -424,7 +425,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -486,7 +487,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -562,7 +563,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } @@ -600,7 +605,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue index 333e11c55..8897f1807 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -173,7 +179,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue index 57a431d19..c14093312 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue @@ -202,13 +202,13 @@ const buttonTableClick = async (val, row) => { // ProductputawayJobMainApi.executeProductputawayMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductputawayJobMainApi.closeProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'documentPrint') { // 单据打印 handleDocumentPrint(row) diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 5e3567de0..f1d1619f0 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -232,7 +232,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -243,7 +243,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -254,7 +254,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -265,7 +265,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -276,7 +276,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -287,7 +287,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -327,7 +327,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -397,7 +397,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue index a7ba72a23..e0fe5c54a 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue @@ -203,13 +203,13 @@ const buttonTableClick = async (val, row) => { // ProductputawayJobMainApi.executeProductputawayMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductputawayJobMainApi.closeProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) }else if (val == 'documentPrint') { // 单据打印 handleDocumentPrint(row) diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index d3082f024..4f61b7c34 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -234,7 +234,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -245,7 +245,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -256,7 +256,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -267,7 +267,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -278,7 +278,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -289,7 +289,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -329,7 +329,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -398,7 +398,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index b9a0ae9fa..253fb0f49 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -322,13 +322,13 @@ const buttonTableClick = async (val, row) => { ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 3811c3b89..d418f49b3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -279,7 +279,7 @@ const handleCreateInspectRequest = async (number:string) => { tableObject.loading = true await ProductreceiptRecordMainApi.createInspectRequest(number) message.success(t('ts.到货检验申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 61f4c5984..f5f87a731 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -367,7 +367,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -378,7 +378,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -389,7 +389,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -400,7 +400,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -493,7 +493,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -552,7 +552,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -626,7 +626,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue index 195d84712..dac357f0d 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue @@ -262,13 +262,13 @@ const buttonTableClick = async (val, row) => { ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 5bc4a178a..67e177c28 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -255,7 +255,7 @@ const handleCreateInspectRequest = async (number:string) => { tableObject.loading = true await ProductreceiptRecordMainApi.createInspectRequest(number) message.success(t('ts.到货检验申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -268,7 +268,7 @@ const handleCreatePutawayRequest = async (number:string) => { tableObject.loading = true await ProductreceiptRecordMainApi.createPutawayRequest(number) message.success(t('ts.上架申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 4864d6187..37b729e3f 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -366,7 +366,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -377,7 +377,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -388,7 +388,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -399,7 +399,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -493,7 +493,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -552,7 +552,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -627,7 +627,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue index 7a96fc26d..a6a53d070 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue @@ -259,13 +259,13 @@ const buttonTableClick = async (val, row) => { ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index a0398bac6..6800b67e8 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -343,7 +343,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -354,7 +354,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -376,7 +376,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -387,7 +387,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -480,7 +480,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -539,7 +539,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -612,7 +612,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue index 51e97a100..19de72466 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue @@ -96,7 +96,13 @@ const buttonBaseClick = (val, item) => { if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -133,13 +139,13 @@ const buttonTableClick = async (val, row) => { handleDelete(row.masterId) } else if (val == 'mainJobAba') { // 放弃 await ProductredressJobMainApi.abandonProductredressJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductredressJobMainApi.closeProductredressJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductredressJobMainApi.acceptProductredressJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } @@ -176,7 +182,7 @@ const handleDelete = async (id: number) => { await ProductredressJobMainApi.deleteProductredressJobMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue index 9cf2196de..f85fe1943 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue @@ -94,7 +94,13 @@ const buttonBaseClick = (val, item) => { if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index a58f08d13..8a9c000a3 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -208,7 +208,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -249,7 +255,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -260,7 +266,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -271,7 +277,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -282,7 +288,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -293,7 +299,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -304,7 +310,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -361,7 +367,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -432,7 +438,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 29439169f..31d59a712 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -528,7 +528,7 @@ const handleClose = async (id: number) => { await ProductscrapRequestMainApi.closeProductscrapRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -542,7 +542,7 @@ const handleReAdd = async (id: number) => { await ProductscrapRequestMainApi.reAddProductscrapRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -556,7 +556,7 @@ const handleSubmit = async (id: number) => { await ProductscrapRequestMainApi.submitProductscrapRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -570,7 +570,7 @@ const handleRefused = async (id: number) => { await ProductscrapRequestMainApi.refusedProductscrapRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -584,7 +584,7 @@ const handleAgree = async (id: number) => { await ProductscrapRequestMainApi.agreeProductscrapRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -598,7 +598,7 @@ const handleHandle = async (id: number) => { await ProductscrapRequestMainApi.handleProductscrapRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -663,7 +663,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -756,7 +756,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } From d6d6cd4fb6323da0cbbab3197afc7d637378d3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 9 Aug 2024 11:22:04 +0800 Subject: [PATCH 005/136] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ3/inspectionQ3.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 1658dca07..44b946e48 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -216,7 +216,7 @@ export const Q3 = useCrudSchemas( sort: 'custom', dictType: DICT_TYPE.QMS_CODE, dictClass: 'string', - isSearch: false, + isSearch: true, isTable: true, tableForm: { type: 'Select' From bdf3aeaacfcd87de9836b52d8b706f2eb643b11b Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 9 Aug 2024 11:45:36 +0800 Subject: [PATCH 006/136] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + src/views/qms/inspectionJob/index.vue | 15 +- .../inspectionJob/inspectionJobMain.data.ts | 2 +- .../qms/inspectionJobProduction/addForm.vue | 1551 +++++++++++++++++ .../qms/inspectionJobProduction/detail.vue | 194 +++ .../qms/inspectionJobProduction/index.vue | 438 +++++ .../inspectionJobMain.data.ts | 864 +++++++++ .../qms/inspectionJobPurchase/addForm.vue | 1551 +++++++++++++++++ .../qms/inspectionJobPurchase/detail.vue | 194 +++ src/views/qms/inspectionJobPurchase/index.vue | 438 +++++ .../inspectionJobMain.data.ts | 864 +++++++++ 11 files changed, 6108 insertions(+), 4 deletions(-) create mode 100644 src/views/qms/inspectionJobProduction/addForm.vue create mode 100644 src/views/qms/inspectionJobProduction/detail.vue create mode 100644 src/views/qms/inspectionJobProduction/index.vue create mode 100644 src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts create mode 100644 src/views/qms/inspectionJobPurchase/addForm.vue create mode 100644 src/views/qms/inspectionJobPurchase/detail.vue create mode 100644 src/views/qms/inspectionJobPurchase/index.vue create mode 100644 src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 79b9bfc0b..22c46d617 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -203,6 +203,7 @@ export enum DICT_TYPE { CARRIER_TYPE = 'carrier_type', // 承运商类型 INSPECT_TYPE = 'inspect_type', // 检验类型 INSPECTION_TYPE = 'inspection_type', // 质量管理检验类型 + INSPECTION_TYPE_NEW = 'inspection_type_new', // 质量管理检验类型 NEXT_ACTION = 'next_action', // 下一步检验动作 SAMPLE_METHOD = 'sample_method', // 抽检方式 WAREHOUSE_TYPE = 'warehouse_type', // 仓库类型 diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 957192bd0..0a6e5d666 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -414,6 +414,14 @@ const handleImport = () => { // 筛选提交 const searchFormClick = (searchData) => { + let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType') + if (!isHave) { + searchData.filters.push({ + action: 'notIn', + column: 'inspectionType', + value: '1,4' + }) + } tableObject.params = { isSearch: true, filters: searchData.filters @@ -423,9 +431,10 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { -   tableObject.params = { -    available: true -  } + tableObject.params = { + available: true, + excludeInspectionType: '1,4' + } getList() // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate() }) diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index baef7aaa7..7bc8cf351 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -272,7 +272,7 @@ export const InspectionJobMain = useCrudSchemas( label: '检验类型', field: 'inspectionType', sort: 'custom', - dictType: DICT_TYPE.INSPECTION_TYPE, + dictType: DICT_TYPE.INSPECTION_TYPE_NEW, dictClass: 'string', isSearch: true, form: { diff --git a/src/views/qms/inspectionJobProduction/addForm.vue b/src/views/qms/inspectionJobProduction/addForm.vue new file mode 100644 index 000000000..93b717cd3 --- /dev/null +++ b/src/views/qms/inspectionJobProduction/addForm.vue @@ -0,0 +1,1551 @@ + + + + diff --git a/src/views/qms/inspectionJobProduction/detail.vue b/src/views/qms/inspectionJobProduction/detail.vue new file mode 100644 index 000000000..3dc132caf --- /dev/null +++ b/src/views/qms/inspectionJobProduction/detail.vue @@ -0,0 +1,194 @@ + + + + + diff --git a/src/views/qms/inspectionJobProduction/index.vue b/src/views/qms/inspectionJobProduction/index.vue new file mode 100644 index 000000000..6c52ef85c --- /dev/null +++ b/src/views/qms/inspectionJobProduction/index.vue @@ -0,0 +1,438 @@ + + + diff --git a/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts b/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts new file mode 100644 index 000000000..3eb07993c --- /dev/null +++ b/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts @@ -0,0 +1,864 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter2 } from '@/utils/formatTime' +import { validateHanset, validateEmail } from '@/utils/validator' +import { dateFormatter } from '@/utils/formatTime' +import { validateTwoNum, validateSixNum } from '@/utils/validator' +const { t } = useI18n() // 国际化 +import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +const resultEntryMethodList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY) +const featureTypeList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE) +const isCanUpdateList = [ + { + label: '是', + value: true + }, + { + label: '否', + value: false + } +] + +/** + * @returns {Array} 检验任务主表 + */ +export const InspectionJobMain = useCrudSchemas( + reactive([ + { + label: '编码', + field: 'number', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 200, + fixed: 'left' + } + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 200 + } + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 180 + } + }, + { + label: '供应商编码', + field: 'supplierCode', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 175 + } + }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + isSearch: false, + table: { + width: 175 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料编码', + field: 'itemCode', + sort: 'custom', + isSearch: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + isSearch: false, + table: { + width: 175 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料批次', + field: 'batch', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考订单号', + field: 'referenceOrderCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考订单行', + field: 'referenceOrderRow', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0, + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考凭证号', + field: 'referenceCertificateCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考凭证行', + field: 'referenceCertificateRow', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0, + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '检验方案编码', + field: 'inspectionSchemeCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 200 + } + }, + { + label: '批次', + field: 'inspectionBatch', + sort: 'custom', + isSearch: false, + isDetail: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '供应商批次', + field: 'supplierBatch', + sort: 'custom', + isSearch: false, + isDetail: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '检验批数量', + field: 'inspectionBatchAmount', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + // { + // label: '采样总数量', + // field: 'sampleTotalAmount', + // sort: 'custom', + // isSearch: false, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + // table: { + // width: 150 + // } + // }, + { + label: '检验类型', + field: 'inspectionType', + sort: 'custom', + dictType: DICT_TYPE.INSPECTION_TYPE, + dictClass: 'string', + isSearch: false, + form: { + component: 'Select', + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '完成人', + field: 'completeUser', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: false, + isDetail: false, + isSearch: true, + isTableForm: false, + isForm: false + }, + // { + // label: '检验批来源', + // field: 'inspectionBatchSource', + // sort: 'custom', + // isSearch: false, + // dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE, + // dictClass: 'string', + // form:{ + // componentProps:{ + // disabled:true + // } + // }, + // table: { + // width: 150 + // } + // }, + { + label: '检验阶段', + field: 'inspectionStage', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0, + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '检验严格性', + field: 'inspectionStringency', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.INSPECTION_SEVERITY, + dictClass: 'string', + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '计划开始时间', + field: 'planStartTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x', + disabled: true + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 175 + } + }, + { + label: '计划结束时间', + field: 'planEndTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x', + disabled: true + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 175 + } + }, + { + label: '检验水平', + field: 'inspectionLevel', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.INSPECTION_LEVEL, + dictClass: 'string', + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: 'AQL值', + field: 'aqlValue', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.BASIC_AQL, + dictClass: 'string', + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + // { + // label: '使用决策', + // field: 'usageDecision', + // sort: 'custom', + // isSearch: false, + // dictType: DICT_TYPE.USAGE_DECISION, + // form:{ + // componentProps:{ + // } + // } + // }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE', + // disabled:true + // } + // } + // }, + { + label: '承接人', + field: 'acceptUserName', + table: { + width: 130 + }, + isForm: false, + isTable: false, + isDetail: true + }, + { + label: '承接时间', + field: 'acceptTime', + isForm: false, + table: { + width: 180 + }, + isTable: false, + isDetail: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + + { + label: '收货时间', + field: 'deliveryTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 175 + } + }, + + { + label: '完成人', + field: 'completeUserName', + table: { + width: 130 + }, + isForm: false, + isTable: true, + isDetail: true + }, + { + label: '完成时间', + field: 'completeTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isForm: false, + isTable: true, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE' + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, + + { + label: '操作', + field: 'action', + isForm: false, + isDetail: false, + table: { + width: 300, + fixed: 'right' + } + } + ]) +) + +//表单校验 +export const InspectionJobMainRules = reactive({ + // usageDecision: [required], +}) + +/** + * @returns {Array} 检验任务子表 + */ +export const InspectionJobDetail = useCrudSchemas( + reactive([ + { + label: '编码', + field: 'number', + sort: 'custom', + isSearch: true + }, + { + label: '检验方案模板编码', + field: 'inspectionCode', + sort: 'custom', + isSearch: true + }, + { + label: '描述', + field: 'processDescribe', + sort: 'custom', + isSearch: true + }, + { + label: '顺序号', + field: 'sequenceCode', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + } + }, + { + label: '检验特性编号', + field: 'inspectionCharCode', + sort: 'custom', + isSearch: true + }, + { + label: '检验特性编码', + field: 'inspectionJobCharacteristicsRespVO.number', + sort: 'custom' + }, + { + label: '检验特性描述', + field: 'inspectionJobCharacteristicsRespVO.description', + sort: 'custom' + }, + { + label: '检验方法', + field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode', + sort: 'custom' + }, + { + label: '采样过程编码', + field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode', + sort: 'custom' + }, + { + label: '动态修改规则编码', + field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode', + sort: 'custom' + }, + { + label: '是否允许修改特征值', + field: 'inspectionJobCharacteristicsRespVO.isCanUpdate', + sort: 'custom', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return isCanUpdateList.find((account) => account.value == cellValue)?.label + } + }, + { + label: '结果录入方式', + field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod', + sort: 'custom', + // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY, + // dictClass: 'string', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return resultEntryMethodList.find((account) => account.value == cellValue)?.label + } + }, + { + label: '特征类型', + field: 'inspectionJobCharacteristicsRespVO.featureType', + sort: 'custom', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return featureTypeList.find((account) => account.value == cellValue)?.label + } + } + ]) +) + +//表单校验 +export const InspectionJobDetailRules = reactive({ + taskCode: [required], + processCode: [required], + sequenceCode: [required], + available: [required] +}) +/** + * @returns {Array} 检验任务包装 + */ +export const InspectionJobPackage = useCrudSchemas( + reactive([ + { + label: '编码', + field: 'number', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 200 + } + }, + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 200 + } + }, + { + label: '包装规格', + field: 'packageSpecificationCode', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 180 + } + }, + { + label: '数量', + field: 'amount', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + tableForm: { + disabled: true + }, + table: { + width: 150 + } + }, + { + label: '计量单位', + field: 'measuringUnit', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 150 + } + }, + { + label: '采样数量', + field: 'sampleAmount', + sort: 'custom', + isSearch: true, + isTable: false, + table: { + width: 150 + } + } + ]) +) +//表单校验 +export const InspectionJobPackageRules = reactive({ + sampleAmount: [required, { validator: validateSixNum, trigger: 'blur' }] +}) diff --git a/src/views/qms/inspectionJobPurchase/addForm.vue b/src/views/qms/inspectionJobPurchase/addForm.vue new file mode 100644 index 000000000..93b717cd3 --- /dev/null +++ b/src/views/qms/inspectionJobPurchase/addForm.vue @@ -0,0 +1,1551 @@ + + + + diff --git a/src/views/qms/inspectionJobPurchase/detail.vue b/src/views/qms/inspectionJobPurchase/detail.vue new file mode 100644 index 000000000..3dc132caf --- /dev/null +++ b/src/views/qms/inspectionJobPurchase/detail.vue @@ -0,0 +1,194 @@ + + + + + diff --git a/src/views/qms/inspectionJobPurchase/index.vue b/src/views/qms/inspectionJobPurchase/index.vue new file mode 100644 index 000000000..7fc015821 --- /dev/null +++ b/src/views/qms/inspectionJobPurchase/index.vue @@ -0,0 +1,438 @@ + + + diff --git a/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts b/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts new file mode 100644 index 000000000..3eb07993c --- /dev/null +++ b/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts @@ -0,0 +1,864 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter2 } from '@/utils/formatTime' +import { validateHanset, validateEmail } from '@/utils/validator' +import { dateFormatter } from '@/utils/formatTime' +import { validateTwoNum, validateSixNum } from '@/utils/validator' +const { t } = useI18n() // 国际化 +import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +const resultEntryMethodList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY) +const featureTypeList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE) +const isCanUpdateList = [ + { + label: '是', + value: true + }, + { + label: '否', + value: false + } +] + +/** + * @returns {Array} 检验任务主表 + */ +export const InspectionJobMain = useCrudSchemas( + reactive([ + { + label: '编码', + field: 'number', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 200, + fixed: 'left' + } + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 200 + } + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 180 + } + }, + { + label: '供应商编码', + field: 'supplierCode', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 175 + } + }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + isSearch: false, + table: { + width: 175 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料编码', + field: 'itemCode', + sort: 'custom', + isSearch: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + isSearch: false, + table: { + width: 175 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料批次', + field: 'batch', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考订单号', + field: 'referenceOrderCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考订单行', + field: 'referenceOrderRow', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0, + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考凭证号', + field: 'referenceCertificateCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '参考凭证行', + field: 'referenceCertificateRow', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0, + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '检验方案编码', + field: 'inspectionSchemeCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 200 + } + }, + { + label: '批次', + field: 'inspectionBatch', + sort: 'custom', + isSearch: false, + isDetail: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '供应商批次', + field: 'supplierBatch', + sort: 'custom', + isSearch: false, + isDetail: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '检验批数量', + field: 'inspectionBatchAmount', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + // { + // label: '采样总数量', + // field: 'sampleTotalAmount', + // sort: 'custom', + // isSearch: false, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + // table: { + // width: 150 + // } + // }, + { + label: '检验类型', + field: 'inspectionType', + sort: 'custom', + dictType: DICT_TYPE.INSPECTION_TYPE, + dictClass: 'string', + isSearch: false, + form: { + component: 'Select', + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '完成人', + field: 'completeUser', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: false, + isDetail: false, + isSearch: true, + isTableForm: false, + isForm: false + }, + // { + // label: '检验批来源', + // field: 'inspectionBatchSource', + // sort: 'custom', + // isSearch: false, + // dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE, + // dictClass: 'string', + // form:{ + // componentProps:{ + // disabled:true + // } + // }, + // table: { + // width: 150 + // } + // }, + { + label: '检验阶段', + field: 'inspectionStage', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0, + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '检验严格性', + field: 'inspectionStringency', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.INSPECTION_SEVERITY, + dictClass: 'string', + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: '计划开始时间', + field: 'planStartTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x', + disabled: true + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 175 + } + }, + { + label: '计划结束时间', + field: 'planEndTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x', + disabled: true + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 175 + } + }, + { + label: '检验水平', + field: 'inspectionLevel', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.INSPECTION_LEVEL, + dictClass: 'string', + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + { + label: 'AQL值', + field: 'aqlValue', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.BASIC_AQL, + dictClass: 'string', + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 150 + } + }, + // { + // label: '使用决策', + // field: 'usageDecision', + // sort: 'custom', + // isSearch: false, + // dictType: DICT_TYPE.USAGE_DECISION, + // form:{ + // componentProps:{ + // } + // } + // }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE', + // disabled:true + // } + // } + // }, + { + label: '承接人', + field: 'acceptUserName', + table: { + width: 130 + }, + isForm: false, + isTable: false, + isDetail: true + }, + { + label: '承接时间', + field: 'acceptTime', + isForm: false, + table: { + width: 180 + }, + isTable: false, + isDetail: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + + { + label: '收货时间', + field: 'deliveryTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 175 + } + }, + + { + label: '完成人', + field: 'completeUserName', + table: { + width: 130 + }, + isForm: false, + isTable: true, + isDetail: true + }, + { + label: '完成时间', + field: 'completeTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isForm: false, + isTable: true, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE' + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, + + { + label: '操作', + field: 'action', + isForm: false, + isDetail: false, + table: { + width: 300, + fixed: 'right' + } + } + ]) +) + +//表单校验 +export const InspectionJobMainRules = reactive({ + // usageDecision: [required], +}) + +/** + * @returns {Array} 检验任务子表 + */ +export const InspectionJobDetail = useCrudSchemas( + reactive([ + { + label: '编码', + field: 'number', + sort: 'custom', + isSearch: true + }, + { + label: '检验方案模板编码', + field: 'inspectionCode', + sort: 'custom', + isSearch: true + }, + { + label: '描述', + field: 'processDescribe', + sort: 'custom', + isSearch: true + }, + { + label: '顺序号', + field: 'sequenceCode', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + } + }, + { + label: '检验特性编号', + field: 'inspectionCharCode', + sort: 'custom', + isSearch: true + }, + { + label: '检验特性编码', + field: 'inspectionJobCharacteristicsRespVO.number', + sort: 'custom' + }, + { + label: '检验特性描述', + field: 'inspectionJobCharacteristicsRespVO.description', + sort: 'custom' + }, + { + label: '检验方法', + field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode', + sort: 'custom' + }, + { + label: '采样过程编码', + field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode', + sort: 'custom' + }, + { + label: '动态修改规则编码', + field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode', + sort: 'custom' + }, + { + label: '是否允许修改特征值', + field: 'inspectionJobCharacteristicsRespVO.isCanUpdate', + sort: 'custom', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return isCanUpdateList.find((account) => account.value == cellValue)?.label + } + }, + { + label: '结果录入方式', + field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod', + sort: 'custom', + // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY, + // dictClass: 'string', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return resultEntryMethodList.find((account) => account.value == cellValue)?.label + } + }, + { + label: '特征类型', + field: 'inspectionJobCharacteristicsRespVO.featureType', + sort: 'custom', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return featureTypeList.find((account) => account.value == cellValue)?.label + } + } + ]) +) + +//表单校验 +export const InspectionJobDetailRules = reactive({ + taskCode: [required], + processCode: [required], + sequenceCode: [required], + available: [required] +}) +/** + * @returns {Array} 检验任务包装 + */ +export const InspectionJobPackage = useCrudSchemas( + reactive([ + { + label: '编码', + field: 'number', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 200 + } + }, + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 200 + } + }, + { + label: '包装规格', + field: 'packageSpecificationCode', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 180 + } + }, + { + label: '数量', + field: 'amount', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + tableForm: { + disabled: true + }, + table: { + width: 150 + } + }, + { + label: '计量单位', + field: 'measuringUnit', + sort: 'custom', + isSearch: true, + tableForm: { + disabled: true + }, + table: { + width: 150 + } + }, + { + label: '采样数量', + field: 'sampleAmount', + sort: 'custom', + isSearch: true, + isTable: false, + table: { + width: 150 + } + } + ]) +) +//表单校验 +export const InspectionJobPackageRules = reactive({ + sampleAmount: [required, { validator: validateSixNum, trigger: 'blur' }] +}) From 9d90dfbd24b74641f2b28fa56229560876823433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 9 Aug 2024 11:53:42 +0800 Subject: [PATCH 007/136] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 0a6e5d666..3b8ea5c23 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -343,8 +343,8 @@ const handleAccept = async (id: number) => { // 发起承接 await InspectionJobMainApi.acceptInspectionJobMain(id) message.success(t('common.acceptSuccess')) - // 刷新列表 - await getList() + // 刷新列表(TB反馈，取消承接后刷新页面) + // await getList() } catch {} } // 放弃任务 From dcefc23ba2cedd287ad074d2406425eb081159c1 Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 9 Aug 2024 12:00:13 +0800 Subject: [PATCH 008/136] test huanjign --- .env.test | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.test b/.env.test index 2c1e25575..314cbd94e 100644 --- a/.env.test +++ b/.env.test @@ -4,10 +4,10 @@ NODE_ENV=test VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' +VITE_BASE_URL='http://dev.ccwin-in.com:29000/api' # 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://dev.ccwin-in.com:29000/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -31,13 +31,13 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 -VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' +VITE_INTERFACE_URL='http://dev.ccwin-in.com:29000/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:29000' # 租户配置 -VITE_TENANT='["长春1379","成都1397","长春2379"]' +VITE_TENANT='["长春","成都"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' From fa81883d6753b794d9931a5d594f3ef596d36941 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 12:22:42 +0800 Subject: [PATCH 009/136] =?UTF-8?q?WMS=E7=94=B5=E8=84=91=E7=AB=AF=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E4=BF=9D=E6=8C=81=E4=B8=8D=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/agvManage/agvLocationrelation/index.vue | 16 +++++++++++++--- .../customerManage/customer/index.vue | 8 ++++++-- .../customerManage/customerdock/index.vue | 8 ++++++-- .../customerManage/customeritem/index.vue | 8 ++++++-- .../customerManage/project/index.vue | 8 ++++++-- .../customerManage/saleprice/index.vue | 8 ++++++-- .../documentSetting/businesstype/index.vue | 4 ++-- .../documentSetting/documentsetting/index.vue | 8 ++++++-- .../documentSetting/jobsetting/index.vue | 8 ++++++-- .../documentSetting/plansetting/index.vue | 8 ++++++-- .../documentSetting/recordsetting/index.vue | 8 ++++++-- .../documentSetting/requestsetting/index.vue | 8 ++++++-- .../documentSetting/switch/index.vue | 4 ++-- .../documentSetting/transactiontype/index.vue | 8 ++++++-- .../factoryModeling/areabasic/index.vue | 8 ++++++-- .../factoryModeling/dock/index.vue | 8 ++++++-- .../factoryModeling/location/index.vue | 8 ++++++-- .../factoryModeling/locationgroup/index.vue | 8 ++++++-- .../factoryModeling/process/index.vue | 8 ++++++-- .../factoryModeling/productionline/index.vue | 8 ++++++-- .../factoryModeling/warehouse/index.vue | 8 ++++++-- .../factoryModeling/workshop/index.vue | 8 ++++++-- .../factoryModeling/workstation/index.vue | 8 ++++++-- .../wms/basicDataManage/itemManage/bom/index.vue | 8 ++++++-- .../itemManage/itemarea/index.vue | 8 ++++++-- .../itemManage/itembasic/index.vue | 8 ++++++-- .../itemManage/itempackage/index.vue | 8 ++++++-- .../itemManage/packageunit/index.vue | 16 +++++++++++++--- .../productionitemcodeSpareitemcode/index.vue | 16 +++++++++++++--- .../itemManage/productionlineitem/index.vue | 8 ++++++-- .../itemManage/stdcostprice/index.vue | 9 ++++++--- .../labelManage/barcode/index.vue | 8 ++++++-- .../labelManage/callmaterials/index.vue | 16 +++++++++++++--- .../labelManage/labeltype/index.vue | 8 ++++++-- .../labelManage/locationLabel/index.vue | 2 +- .../labelManage/manufacturePackage/index.vue | 8 ++++++-- .../labelManage/purchasePackage/index.vue | 8 ++++++-- .../labelManage/utensilPackage/index.vue | 2 +- .../orderManage/carrier/index.vue | 8 ++++++-- .../basicDataManage/orderManage/owner/index.vue | 8 ++++++-- .../basicDataManage/orderManage/shift/index.vue | 8 ++++++-- .../basicDataManage/orderManage/team/index.vue | 8 ++++++-- .../strategySetting/rule/index.vue | 8 ++++++-- .../strategy/arrivalInspectionStrategy/index.vue | 2 +- .../strategy/batchStrategy/index.vue | 2 +- .../strategy/downShelfStrategy/index.vue | 2 +- .../strategy/inspectStrategy/index.vue | 2 +- .../strategy/purchaseReceiptStrategy/index.vue | 2 +- .../strategy/storageCapacityStrategy/index.vue | 2 +- .../strategy/supplieDeliveryStrategy/index.vue | 2 +- .../strategy/upShelfStrategy/index.vue | 2 +- .../strategy/utensilCapacityStrategy/index.vue | 2 +- .../strategy/warehouseStorageStrategy/index.vue | 2 +- .../wms/basicDataManage/subject/mstr/index.vue | 16 +++++++++++++--- .../subject/qadCostcentre/index.vue | 16 +++++++++++++--- .../basicDataManage/subject/qadProject/index.vue | 14 ++++++++++++-- .../subject/subjectAccount/index.vue | 16 +++++++++++++--- .../supplierManage/purchaseprice/index.vue | 8 ++++++-- .../supplierManage/supplier/index.vue | 8 ++++++-- .../supplierManage/supplieritem/index.vue | 8 ++++++-- .../systemSetting/accountcalendar/index.vue | 8 ++++++-- .../systemSetting/currencyexchange/index.vue | 8 ++++++-- .../systemSetting/systemcalendar/index.vue | 8 ++++++-- src/views/wms/buttMesManage/mesBarCode/index.vue | 16 +++++++++++++--- src/views/wms/inventoryManage/package/index.vue | 8 ++++++-- 65 files changed, 384 insertions(+), 127 deletions(-) diff --git a/src/views/wms/agvManage/agvLocationrelation/index.vue b/src/views/wms/agvManage/agvLocationrelation/index.vue index 1a35d6065..0119205df 100644 --- a/src/views/wms/agvManage/agvLocationrelation/index.vue +++ b/src/views/wms/agvManage/agvLocationrelation/index.vue @@ -128,7 +128,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -202,7 +208,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -220,7 +230,7 @@ const handleDelete = async (id: number) => { await AgvLocationrelationApi.deleteAgvLocationrelation(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue index a2a85341c..fc31bf8a3 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue @@ -195,7 +195,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -215,7 +219,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index bff35210f..04deb10e1 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -198,7 +198,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -230,7 +234,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index 1888b081a..18b1c7b29 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -204,7 +204,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const onEnter = async (field,value)=>{ console.log(field,value) @@ -254,7 +258,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue index 1f7f8010a..17a7ce28e 100644 --- a/src/views/wms/basicDataManage/customerManage/project/index.vue +++ b/src/views/wms/basicDataManage/customerManage/project/index.vue @@ -195,7 +195,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -224,7 +228,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue index 29b1ac834..f5ea4d21e 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue +++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue @@ -199,7 +199,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -228,7 +232,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index dd394b284..b5ddadaa5 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -287,7 +287,7 @@ const formsSuccess = async (formType, submitData) => { .then(async () => { message.success(t('common.updateSuccess')) basicFormRef.value.dialogVisible = false - await getList() + buttonBaseClick('refresh',null) }) .catch(() => { data.itemTypes = data.itemTypes.split(',') @@ -352,7 +352,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue index 7cbb2c584..0d2e5e767 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue @@ -176,7 +176,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -196,7 +200,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue index c96f041dc..9132137cb 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue @@ -176,7 +176,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -196,7 +200,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue index b71de84b7..48405deac 100644 --- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue index 4b0dac5c4..ecce4f292 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue index 9cb8b0297..34bb3745b 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index 100d91892..66339989c 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -176,7 +176,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -225,7 +225,7 @@ const success = async (formType, data) => { const res = await SwitchApi.updateSwitch(data) if(true===res){ message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }else{ message.error('修改失败') } diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue index c9c74251a..cdd17db2f 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue @@ -178,7 +178,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +202,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 2e2135bc6..6be85ba6b 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -201,7 +201,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -230,7 +234,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index 25e09d46c..9adc80970 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -230,7 +230,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 删除按钮操作 */ @@ -244,7 +248,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue index 195c1bbee..98f0c1283 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue @@ -219,7 +219,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -248,7 +252,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue index 7af3ab2f0..db65ec6f0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue @@ -200,7 +200,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -229,7 +233,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue index a076365ef..b112d1837 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue @@ -207,7 +207,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -236,7 +240,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue index 1da242abe..b1a2b22cd 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue @@ -200,7 +200,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -229,7 +233,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue index c176cd9f1..bc20bb421 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue @@ -189,7 +189,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -209,7 +213,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue index 10a23c941..f086a1428 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue @@ -191,7 +191,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -211,7 +215,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index 0415294f6..5c963542e 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -209,7 +209,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -238,7 +242,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue index 7f21ff7b8..2b97a0628 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/index.vue +++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue @@ -206,7 +206,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -241,7 +245,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 787bbce56..eb9f347ae 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -323,7 +323,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -380,7 +380,11 @@ const submitForm = async (formType, data) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index 2a331987c..e91e4dfc3 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -248,7 +248,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const detailRef = ref() @@ -268,7 +272,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 41db7ca3e..aff7fc3ad 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -235,7 +235,11 @@ const formsSuccess = async (formType, data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const onEnter = async (field,value)=>{ console.log('onEnter',field,value) @@ -304,7 +308,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue index 5904d8b09..0a3f2ff1b 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue +++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue @@ -128,7 +128,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -224,7 +230,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -242,7 +252,7 @@ const handleDelete = async (id: number) => { await PackageunitApi.deletePackageunit(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue index ca030de9f..984683424 100644 --- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -198,7 +204,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -216,7 +226,7 @@ const handleDelete = async (id: number) => { await ProductionitemcodeSpareitemcodeApi.deleteProductionitemcodeSpareitemcode(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue index a04119f7e..938528ba7 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue @@ -199,7 +199,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -228,7 +232,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue index 48e5c9bae..d312c53c9 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue @@ -192,8 +192,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false basicFormRef.value.formLoading = false - - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -222,7 +225,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue index 231a58889..91ea8cbab 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue @@ -181,7 +181,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -201,7 +205,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 74d8dd474..0350c674a 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -183,7 +183,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else if (val=='selection_point'){//批量打印 handleSelectionPoint() @@ -249,7 +255,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -267,7 +277,7 @@ const handleDelete = async (id: number) => { await CallmaterialsApi.deleteCallmaterials(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue index ec20b19ba..458599ffc 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue +++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue @@ -183,7 +183,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -212,7 +216,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index b9607c6ff..b39ba8e44 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -164,7 +164,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 1abf79216..6aa6e2db1 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -233,7 +233,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -302,7 +302,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 导入 */ diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 14ddbd0ed..c13cfd8d5 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -234,7 +234,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -298,7 +298,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 导入 */ diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index 90eaa3478..bf41d8eac 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -216,7 +216,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue index dcd05eb8b..6e087650c 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue +++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue @@ -196,7 +196,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -216,7 +220,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue index 32c90fb63..8c999e712 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/index.vue +++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue @@ -197,7 +197,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -217,7 +221,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue index 4ba329af0..8e18c295d 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/index.vue +++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue @@ -203,7 +203,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -223,7 +227,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue index 01b077a75..36770fa22 100644 --- a/src/views/wms/basicDataManage/orderManage/team/index.vue +++ b/src/views/wms/basicDataManage/orderManage/team/index.vue @@ -188,7 +188,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const getData = async() => { getList(); @@ -211,7 +215,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue index de47835d7..e79792b66 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue @@ -176,7 +176,11 @@ const formsSuccess = async (formType, data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -196,7 +200,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue index 1b306e0a9..7df989b6a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue index e1a580c7d..bc85162de 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue index 730760adb..cdf7fcb76 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue @@ -108,7 +108,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue index 77b078fe9..dd7fa9f1a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue index 3444efabc..c2c9c958c 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue index 4d0f74dd4..fa3ad01de 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue index b6b18e322..0d8c6776a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue index e4d5a6c92..690f7fd36 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue @@ -108,7 +108,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue index ccc2777aa..bcddf5f6a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue index 88d59eab1..c8d4a5005 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue index ca220e13a..56634a966 100644 --- a/src/views/wms/basicDataManage/subject/mstr/index.vue +++ b/src/views/wms/basicDataManage/subject/mstr/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -171,7 +177,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -189,7 +199,7 @@ const handleDelete = async (id: number) => { await MstrApi.deleteMstr(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue index d0b0f19c9..87b6a5273 100644 --- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue +++ b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -180,7 +186,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +208,7 @@ const handleDelete = async (id: number) => { await QadCostcentreApi.deleteQadCostcentre(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue index f34285ac2..0658d4d47 100644 --- a/src/views/wms/basicDataManage/subject/qadProject/index.vue +++ b/src/views/wms/basicDataManage/subject/qadProject/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -180,7 +186,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue index 96ceefbac..cb5cc5ac0 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue +++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue @@ -133,7 +133,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -189,7 +195,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -207,7 +217,7 @@ const handleDelete = async (id: number) => { await SubjectAccountApi.deleteSubjectAccount(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue index aebe21773..3c89f73ad 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue @@ -199,7 +199,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -228,7 +232,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index 410f5ab11..1b276f79d 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -191,7 +191,11 @@ const formsSuccess = async (formType, data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ const detailRef = ref() @@ -210,7 +214,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index a439b6bbf..24c8f9c64 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -210,7 +210,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -243,7 +247,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue index 10989ddfb..c1b7af032 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue index 4ef2e5be9..69e50046b 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue @@ -178,7 +178,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +202,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue index 9181412d6..d9830e769 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue index 5d441845d..7d4cda97d 100644 --- a/src/views/wms/buttMesManage/mesBarCode/index.vue +++ b/src/views/wms/buttMesManage/mesBarCode/index.vue @@ -136,7 +136,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -182,7 +188,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -200,7 +210,7 @@ const handleDelete = async (id: number) => { await MesBarCodeApi.deleteMesBarCode(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 8551bc8a0..ecdd102b5 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -221,7 +221,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -260,7 +260,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 标签打印 // const handlePoint = async (row) => { From ed6ae3cfc06372f736be715a8e9f01d87d65ec80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 9 Aug 2024 13:15:26 +0800 Subject: [PATCH 010/136] =?UTF-8?q?=E5=BA=93=E7=A7=BB=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inventorymoveRecordMain/index.ts | 2 +- .../inventorymoveRecordMainNew/index.vue | 301 ++++++++ .../inventorymoveRecordMain.data.ts | 730 ++++++++++++++++++ 3 files changed, 1032 insertions(+), 1 deletion(-) create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index 9d9c4f083..03e2f36a3 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -45,7 +45,7 @@ export const getInventorymoveRecordMain = async (id: number) => { // 新增库存转移记录主 export const createInventorymoveRecordMain = async (data: InventorymoveRecordMainVO) => { - return await request.post({ url: `/wms/inventorymove-record-main/create`, data }) + return await request.post({ url: `/wms/inventorymove-record-main/createMove`, data }) } // 修改库存转移记录主 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue new file mode 100644 index 000000000..956224a28 --- /dev/null +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -0,0 +1,301 @@ + + + diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts new file mode 100644 index 000000000..9611e7f26 --- /dev/null +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts @@ -0,0 +1,730 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' + +/** + * @returns {Array} 库存转移记录主表 + */ +export const InventorymoveRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + isSearch: true + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true + }, + { + label: '任务单号', + field: 'jobNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true + }, + // { + // label: '使用在途库', + // field: 'useOnTheWayLocation', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + // { + // label: '申请时间', + // field: 'requestTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, + // { + // label: '执行时间', + // field: 'executeTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, + // { + // label: '生效日期', + // field: 'activeDate', + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + }, + // { + // label: '从库区类型范围', + // field: 'fromAreaTypes', + // dictType: DICT_TYPE.AREA_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到库区类型范围', + // field: 'toAreaTypes', + // dictType: DICT_TYPE.AREA_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从库区代码范围', + // field: 'fromAreaCodes', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到库区代码范围', + // field: 'toAreaCodes', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + }, + + // { + // label: '部门', + // field: 'departmentCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '接口类型', + // field: 'interfaceType', + // dictType: DICT_TYPE.INTERFACE_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isSearch: true, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, +])) + +//表单校验 +export const InventorymoveRecordMainRules = reactive({ + requestNumber: [ + { required: true, message: '请选择申请单号', trigger: 'change' } + ], + fromWarehouseCode: [ + { required: true, message: '请选择从仓库代码', trigger: 'change' } + ], + fromAreaTypes: [ + { required: true, message: '请选择从库区类型范围', trigger: 'change' } + ], + fromAreaCodes: [ + { required: true, message: '请选择从库区代码范围', trigger: 'change' } + ], + toWarehouseCode: [ + { required: true, message: '请选择到仓库代码', trigger: 'change' } + ], + toAreaTypes: [ + { required: true, message: '请选择到库区类型范围', trigger: 'change' } + ], + outTransaction: [ + { required: true, message: '请输入出库事务类型', trigger: 'blur' } + ], + inTransaction: [ + { required: true, message: '请输入入库事务类型', trigger: 'blur' } + ], + executeTime: [ + { required: true, message: '请输入执行时间', trigger: 'change' } + ], + activeDate: [ + { required: true, message: '请输入生效日期', trigger: 'change' } + ], + available: [ + { required: true, message: '请输入是否可用', trigger: 'blur' } + ], + departmentCode: [ + { required: true, message: '请输入部门', trigger: 'blur' } + ], + interfaceType: [ + { required: true, message: '请选择接口类型', trigger: 'change' } + ], + number: [ + { required: true, message: '请输入单据号', trigger: 'blur' } + ], + businessType: [ + { required: true, message: '请输入业务类型', trigger: 'blur' } + ], + createTime: [ + { required: true, message: '请输入创建时间', trigger: 'blur' } + ], + creator: [ + { required: true, message: '请输入创建者', trigger: 'blur' } + ], +}) + +/** + * @returns {Array} 库存转移记录子表 + */ +export const InventorymoveRecordDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain: true, + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + // { + // label: '在途库库位', + // field: 'onTheWayLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库位组代码', + field: 'fromLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库位组代码', + field: 'toLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库区代码', + field: 'fromAreaCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库区代码', + field: 'toAreaCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '任务明细ID', + // field: 'jobDetailId', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '创建时间', + // field: 'createTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, + // { + // label: '创建者', + // field: 'creator', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, +])) + +//表单校验 +export const InventorymoveRecordDetailRules = reactive({ + fromPackingNumber: [ + { required: true, message: '请选择从包装号', trigger: 'change' } + ], + fromBatch: [ + { required: true, message: '请输入从批次', trigger: 'blur' } + ], + fromLocationCode: [ + { required: true, message: '请选择从库位代码', trigger: 'change' } + ], + fromLocationGroupCode: [ + { required: true, message: '请选择从库位组代码', trigger: 'change' } + ], + fromAreaCode: [ + { required: true, message: '请选择从库区代码', trigger: 'change' } + ], + fromInventoryStatus: [ + { required: true, message: '请选择从库存状态', trigger: 'change' } + ], + toPackingNumber: [ + { required: true, message: '请选择到包装号', trigger: 'change' } + ], + toBatch: [ + { required: true, message: '请输入到批次', trigger: 'blur' } + ], + toLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'change' } + ], + toLocationGroupCode: [ + { required: true, message: '请选择到库位组代码', trigger: 'change' } + ], + toAreaCode: [ + { required: true, message: '请选择到库区代码', trigger: 'change' } + ], + toInventoryStatus: [ + { required: true, message: '请选择到库存状态', trigger: 'change' } + ], + number: [ + { required: true, message: '请输入单据号', trigger: 'blur' } + ], + itemCode: [ + { required: true, message: '请选择物料代码', trigger: 'change' } + ], + createTime: [ + { required: true, message: '请输入创建时间', trigger: 'blur' } + ], + creator: [ + { required: true, message: '请输入创建者', trigger: 'blur' } + ], +}) From 552e2892533499edfc52fd6236229a041bfd677d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 9 Aug 2024 13:34:30 +0800 Subject: [PATCH 011/136] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=B8=BB=E5=AD=90=E8=A1=A8=E9=83=BD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRecordMain.data.ts | 2 +- .../unplannedissueRequestMain.data.ts | 16 ++++++++-------- .../unplannedreceiptRequestMain.data.ts | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index a24d5b002..160b3ee62 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -736,7 +736,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, + isTable: true, hiddenInMain:true, }, // { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index ba2f86dbd..0a39c2256 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -996,14 +996,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive isTableForm: false, isTable:false, }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 4b2310c5d..d23824193 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1237,7 +1237,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Fri, 9 Aug 2024 14:40:36 +0800 Subject: [PATCH 012/136] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecordMainNew/index.vue | 83 ++- .../inventorymoveRecordRequestMain.data.ts | 492 ++++++++++++++++++ 2 files changed, 551 insertions(+), 24 deletions(-) create mode 100644 src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 956224a28..3173482dd 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -42,16 +42,17 @@ - +./inventorymoveRecordRequestMain.data \ No newline at end of file diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts new file mode 100644 index 000000000..20784f2cc --- /dev/null +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts @@ -0,0 +1,492 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import * as getRequestsettingApi from '@/api/wms/requestsetting/index' + +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + +import * as WarehouseApi from '@/api/wms/warehouse' +import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' + +const { t } = useI18n() // 国际化 + +// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 +const queryParams = { + pageSize:10, + pageNo:1, + code:'MoveRequest' +} + const data = await getRequestsettingApi.getRequestsettingPage(queryParams) + const requestsettingData =data?.list[0]||{} + + // 获取当前操作人的部门 + import { useUserStore } from '@/store/modules/user' + import { TableColumn } from '@/types/table' + const userStore = useUserStore() + const userDept = userStore.userSelfInfo.dept + // id 转str 否则form回显匹配不到 + userDept.id = userDept.id.toString() + const userDeptArray:any = [userDept] + +/** + * @returns {Array} 库存转移申请主表 + */ +export const InventorymoveRequestMain = useCrudSchemas(reactive([ + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从仓库代码', + searchField: 'code', + searchTitle: '仓库基础信息', + searchAllSchemas: Warehouse.allSchemas, + searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'businessType', + value: 'Move', + isMainValue: false + },{ + key: 'isIn', + value: 'out', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择从仓库代码', + searchField: 'code', + searchTitle: '仓库基础信息', + searchAllSchemas: Warehouse.allSchemas, + searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'businessType', + value: 'Move', + isMainValue: false + },{ + key: 'isIn', + value: 'out', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, + { + label: '截止时间', + field: 'dueTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'businessType', + value: 'Move', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + isRepeat:true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'businessType', + value: 'Move', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'businessType', + value: 'Move', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + isRepeat:true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'businessType', + value: 'Move', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, +])) + +//表单校验 +export const InventorymoveRequestMainRules = reactive({ + fromWarehouseCode: [ + { required: true, message: '请选择从仓库代码', trigger: 'blur' } + ], + fromLocationCode: [ + { required: true, message: '请选择从库位代码', trigger: 'change' } + ], + toLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'change' } + ] +}) + +/** + * @returns {Array} 库存转移申请子表 + */ +export const InventorymoveRequestDetail = useCrudSchemas(reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + multiple:true, + disabled: true, + isInpuFocusShow: false, // 开启查询弹窗 + searchListPlaceholder: '请选择从包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key: 'businessType', + value: 'Move', + isMainValue: false + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled: true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择从包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key: 'businessType', + value: 'Move', + isMainValue: false + }] + } + } + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: true, + isForm: false, + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + }, + + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + }, + tableForm: { + disabled: true, + type: 'InputNumber', + min: 0, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + + { + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: false, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + } +])) + +//表单校验 +export const InventorymoveRequestDetailRules = reactive({ + itemCode: [ + { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' } + ], + fromLocationCode: [ + { required: true, message: '请选择从库位代码', trigger: 'change' } + ], + fromPackingNumber: [ + { required: true, message: '请选择从包装号', trigger: 'change' } + ], + fromInventoryStatus: [ + { required: true, message: '请选择从库存状态', trigger: 'change' } + ], + toLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'change' } + ], + remark: [ + { max: 50, message: '不得超过50个字符', trigger: 'blur' } + ], +}) From bcc70cb17e664625479c065dfe39cecbb33f9c83 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 14:50:40 +0800 Subject: [PATCH 013/136] =?UTF-8?q?=E5=BD=93=E6=95=B0=E9=87=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=82=B9=E5=87=BB=E5=9B=9E=E8=BD=A6=EF=BC=8C=E6=95=B4?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index c839d2937..149dc0bc2 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -65,7 +65,7 @@ :width="headerItem?.tableForm?.width" :min-width="headerItem?.tableForm?.minWidth || '200px'" > - Date: Fri, 9 Aug 2024 15:09:21 +0800 Subject: [PATCH 014/136] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecordMainNew/index.vue | 29 +++-- .../inventorymoveRecordRequestMain.data.ts | 120 ++++-------------- 2 files changed, 42 insertions(+), 107 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 3173482dd..4bea72d15 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -253,17 +253,17 @@ const submitForm = async (formType, submitData) => { } formRef.value.formLoading = true console.log('data',data) - // try { - // if (formType === 'create') { - // await InventorymoveRecordMainApi.createInventorymoveRecordMain(data) - // message.success(t('common.createSuccess')) - // } - // formRef.value.dialogVisible = false - // // 刷新当前列表 - // getList() - // } finally { - // formRef.value.formLoading = false - // } + try { + if (formType === 'create') { + await InventorymoveRecordMainApi.createInventorymoveRecordMain(data) + message.success(t('common.createSuccess')) + } + formRef.value.dialogVisible = false + // 刷新当前列表 + getList() + } finally { + formRef.value.formLoading = false + } } // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { @@ -292,6 +292,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} + if(formField=='fromLocationCode'){ + //从库位代码 + setV['fromWarehouseCode'] = val[0]['warehouseCode'] + }else if(formField=='toLocationCode'){ + //到库位代码 + setV['toWarehouseCode'] = val[0]['warehouseCode'] + } setV[formField] = val[0][searchField] formRef.setValues(setV) } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts index 20784f2cc..4674afe6c 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts @@ -35,102 +35,6 @@ const queryParams = { * @returns {Array} 库存转移申请主表 */ export const InventorymoveRequestMain = useCrudSchemas(reactive([ - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - enterSearch: true, - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从仓库代码', - searchField: 'code', - searchTitle: '仓库基础信息', - searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.pageBusinessTypeToWarehouse, - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'businessType', - value: 'Move', - isMainValue: false - },{ - key: 'isIn', - value: 'out', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择从仓库代码', - searchField: 'code', - searchTitle: '仓库基础信息', - searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.pageBusinessTypeToWarehouse, - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'businessType', - value: 'Move', - isMainValue: false - },{ - key: 'isIn', - value: 'out', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, { label: '从库位代码', field: 'fromLocationCode', @@ -263,6 +167,27 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '截止时间', + field: 'dueTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, ])) //表单校验 @@ -270,6 +195,9 @@ export const InventorymoveRequestMainRules = reactive({ fromWarehouseCode: [ { required: true, message: '请选择从仓库代码', trigger: 'blur' } ], + toWarehouseCode: [ + { required: true, message: '请选择到仓库代码', trigger: 'blur' } + ], fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } ], From 92dc941dfd23cfc12fd8927ae65cf03404587df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 9 Aug 2024 15:17:41 +0800 Subject: [PATCH 015/136] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionJob/inspectionJobMain.data.ts | 1 + src/views/qms/inspectionRequest/index.vue | 2 +- .../inspectionRequestMain.data.ts | 49 +++++++++++++------ 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 7bc8cf351..c7646d0dd 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -567,6 +567,7 @@ export const InspectionJobMain = useCrudSchemas( dictClass: 'string', isForm: false, isTable: true, + isSearch: true, sort: 'custom', table: { width: 150 diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue index 04c95aacc..715987e86 100644 --- a/src/views/qms/inspectionRequest/index.vue +++ b/src/views/qms/inspectionRequest/index.vue @@ -148,7 +148,7 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-request-main:create' }), // 新增 // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入 - // defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-request-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts index 6d0b11612..95728e0e1 100644 --- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts +++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts @@ -250,14 +250,16 @@ export const InspectionMain = useCrudSchemas( isMainValue: false } ], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 } } }, @@ -300,14 +302,16 @@ export const InspectionMain = useCrudSchemas( isMainValue: false } ], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 } } }, @@ -445,6 +449,19 @@ export const InspectionMain = useCrudSchemas( width: 150 } }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isForm: false, + isTable: true, + isSearch: true, + sort: 'custom', + table: { + width: 150 + } + }, { label: '是否可用', field: 'available', From 631a0578bbd5f911abcecb5fc51ce15a1c2995a8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 15:20:38 +0800 Subject: [PATCH 016/136] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95-=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecordMainNew/index.vue | 4 +- .../inventorymoveRecordRequestMain.data.ts | 82 +++++++++---------- 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 4bea72d15..213534050 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -43,7 +43,7 @@ console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) nextTick(() => { if (type == 'tableForm') { - if(formField == 'fromPackingNumber'){ + if(formField == 'itemCode'){ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['origin_fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) if(val.length==0) return val.forEach(item=>{ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts index 4674afe6c..e9b5422f8 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts @@ -217,14 +217,45 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - tableForm: { - disabled: true + tableForm:{ + multiple:true, + disabled: true, + isInpuFocusShow: false, // 开启查询弹窗 + searchListPlaceholder: '请选择从包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key: 'businessType', + value: 'Move', + isMainValue: false + },{ + key:'locationCode', // 查询列表中字段 + value:'fromLocationCode', // 指主表某字段 + message: '请选择从库位代码！', // 当前置条件为空时 弹出信息提示 + isMainValue: true, // 表示查询条件是主表的字段的值 + action: '==', // 查询拼接条件 + }] }, form: { + // labelMessage: '信息提示说明！！！', componentProps: { - disabled: true + disabled: true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择从包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key: 'businessType', + value: 'Move', + isMainValue: false + }] } } + }, { label: '批次', @@ -249,36 +280,12 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - tableForm:{ - multiple:true, - disabled: true, - isInpuFocusShow: false, // 开启查询弹窗 - searchListPlaceholder: '请选择从包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.selectLocationTypeToBalance, - searchCondition: [{ - key: 'businessType', - value: 'Move', - isMainValue: false - }] + tableForm: { + disabled: true }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - disabled: true, - isSearchList: false, // 开启查询弹窗 - searchListPlaceholder: '请选择从包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.selectLocationTypeToBalance, - searchCondition: [{ - key: 'businessType', - value: 'Move', - isMainValue: false - }] + disabled: true } } }, @@ -402,19 +409,10 @@ export const InventorymoveRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' } ], - fromLocationCode: [ - { required: true, message: '请选择从库位代码', trigger: 'change' } - ], - fromPackingNumber: [ - { required: true, message: '请选择从包装号', trigger: 'change' } - ], fromInventoryStatus: [ { required: true, message: '请选择从库存状态', trigger: 'change' } ], - toLocationCode: [ - { required: true, message: '请选择到库位代码', trigger: 'change' } - ], - remark: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], + toInventoryStatus: [ + { required: true, message: '请选择到库存状态', trigger: 'change' } + ] }) From 89d6cbc063d49194a6de33c56835b839b500eda5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 15:28:29 +0800 Subject: [PATCH 017/136] =?UTF-8?q?=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRecordMainNew/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 213534050..33d2cfee8 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -238,7 +238,7 @@ const submitForm = async (formType, submitData) => { } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { - item.fromBatch = data.toBatch + item.toBatch = item.fromBatch item.fromLocationCode = data.fromLocationCode item.toLocationCode = data.toLocationCode if(item.qty == 0){ From c5633050182bc8a1cdf45aa36e2eb9ebcd62ca4b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 15:36:32 +0800 Subject: [PATCH 018/136] =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 3b8ea5c23..bce9678ad 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -198,7 +198,13 @@ const buttonBaseClick = (val, item) => { handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { @@ -320,7 +326,7 @@ const handleClose = async (id: number) => { await InspectionJobMainApi.closeInspectionJobMain(id) message.success(t('common.closeSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } /** 发布按钮操作 */ @@ -332,7 +338,7 @@ const handleRelease = async (id: number) => { await InspectionJobMainApi.releaseInspectionJobMain(id) message.success('发布成功！') // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } // 承接 @@ -344,7 +350,7 @@ const handleAccept = async (id: number) => { await InspectionJobMainApi.acceptInspectionJobMain(id) message.success(t('common.acceptSuccess')) // 刷新列表(TB反馈，取消承接后刷新页面) - // await getList() + buttonBaseClick('refresh',null) } catch {} } // 放弃任务 @@ -356,7 +362,7 @@ const handleAbandon = async (id: number) => { await InspectionJobMainApi.abandonInspectionJobMain(id) message.success(t('common.giveupSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -400,7 +406,11 @@ const submitForm = async (formType, data) => { formRef.value.dialogVisible = false formRef.value.formLoading = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } From ba7865739ef52fcc58c819aad503d8a13da2eb7e Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 9 Aug 2024 15:42:45 +0800 Subject: [PATCH 019/136] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=98=B5=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/index.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 361595667..541a7f3ef 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -29,6 +29,10 @@ start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" /> + + + 搜索 @@ -125,7 +129,8 @@ const queryParams = reactive({ mobile: undefined, status: undefined, deptId: undefined, - createTime: [] + createTime: [], + nickeName:undefined }) const queryFormRef = ref() // 搜索的表单 From b890ad1de7e687c0d2d15647f7aabb7c8eb15c4e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 17:23:35 +0800 Subject: [PATCH 020/136] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecordMain.data.ts | 124 +++++++++--------- .../inventorymoveRecordRequestMain.data.ts | 100 +++++++------- 2 files changed, 111 insertions(+), 113 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts index 9611e7f26..a89421081 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts @@ -15,24 +15,24 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true + // }, + // { + // label: '任务单号', + // field: 'jobNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true + // }, // { // label: '使用在途库', // field: 'useOnTheWayLocation', @@ -133,15 +133,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ // } // }, // }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, + // { + // label: '发货单号', + // field: 'asnNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isForm: false, + // }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -588,41 +588,41 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '接口类型', + // field: 'interfaceType', + // dictType: DICT_TYPE.INTERFACE_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, // { // label: '备注', // field: 'remark', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts index e9b5422f8..d11803178 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts @@ -258,8 +258,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, { - label: '批次', - field: 'fromBatch', + label: '从包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 @@ -274,14 +274,28 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: true, + isForm: false, + }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, tableForm: { - disabled: true + disabled: true, + type: 'Select' }, form: { componentProps: { @@ -290,14 +304,24 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, { - label: '到包装号', - field: 'toPackingNumber', + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: true, - isForm: false, + tableForm: { + disabled: false, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '包装规格', @@ -319,7 +343,22 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false, }, - + { + label: '批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '数量', field: 'qty', @@ -360,47 +399,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( disabled: true } } - }, - - { - label: '从库存状态', - field: 'fromInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '到库存状态', - field: 'toInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: false, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } } ])) From 8ff64f3e895fca583dab18abdce55af4f93bb085 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 9 Aug 2024 17:34:55 +0800 Subject: [PATCH 021/136] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 3 ++- src/views/qms/inspectionJobProduction/addForm.vue | 3 ++- src/views/qms/inspectionJobPurchase/addForm.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 93b717cd3..6b2e16b28 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -502,7 +502,8 @@ - + - + - + Date: Fri, 9 Aug 2024 17:45:17 +0800 Subject: [PATCH 022/136] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueJobMain.data.ts | 6 +++--- .../unplannedissueRecordMain.data.ts | 6 +++--- .../unplannedissueRequestMain.data.ts | 7 +++---- .../unplannedreceiptJobMain.data.ts | 18 +++++++++--------- .../unplannedreceiptRecordMain.data.ts | 6 +++--- .../unplannedreceiptRequestMain.data.ts | 6 +++--- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 689b8a90a..6dd1a6df5 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -367,8 +367,8 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ isTable:false, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', isTable:false, table: { @@ -894,7 +894,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 160b3ee62..fe94f3e9f 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -374,8 +374,8 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -730,7 +730,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 0a39c2256..efea9aa1e 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -496,14 +496,13 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ } }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 }, sortTableDefault: 1000, - isTable: true, }, { label: '直接生成记录', @@ -997,7 +996,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive isTable:false, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 5d1ea6aef..c3133decd 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -350,14 +350,14 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '备注(主)', + field: 'remarkMain', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '自动完成', field: 'autoComplete', @@ -1016,7 +1016,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index a9f5d795b..3527d66e8 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -349,8 +349,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( }, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', isTable:false, sort: 'custom', table: { @@ -785,7 +785,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive } }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -1231,7 +1231,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Fri, 9 Aug 2024 17:52:41 +0800 Subject: [PATCH 023/136] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 21 +++++++++---------- src/views/qms/inspectionJob/index.vue | 1 + .../qms/inspectionQ3/inspectionQ3.data.ts | 4 ++-- src/views/qms/inspectionRecord/index.vue | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 6b2e16b28..5627ed1a2 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -414,6 +414,16 @@ + + + + + @@ -502,17 +512,6 @@ - - - - - + @@ -80,6 +82,14 @@ import download from '@/utils/download' import { InventorymoveRecordMain,InventorymoveRecordMainRules,InventorymoveRecordDetail,InventorymoveRecordDetailRules } from './inventorymoveRecordMain.data' import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRecordRequestMain.data' +import { + SupplierdeliverRequestPackage +} from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' + +import { getAccessToken } from '@/utils/auth' + +import * as PackageApi from '@/api/wms/package' +import { getJmreportBaseUrl } from '@/utils/systemParam' import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain' import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain' import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail' @@ -165,17 +175,77 @@ const openForm =async (type: string, row?: number) => { formRef.value.open(type, row) } +// 列表-操作按钮 // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 if(findIndex>-1&&findIndex<$index){ return [] } - return [] + return [ + defaultButtons.mainListPointBtn(null), // 标签打印 + ] } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { + if (val == 'point') { // 标签打印 + labelPrint(row) + } +} +const BASE_URL = getJmreportBaseUrl() +// 标签打印 +const searchTableRef = ref() +const labelType = ref('') // 标签类别 采购还是制造等 +const labelPrint = async (row) => { + tableObject.loading = true + //获取类型 + let resType = await PackageApi.getPackagePage({ + requestNumber: row.number + }) + if(resType.list.length > 0){ + if (resType.list[0].productionLineCode != null) { + labelType.value = 'zz' + } else { + labelType.value = 'cg' + } + } + const defaultParams = {'moduleName':'productreceipt_predict','tableName':'record_productreceipt_main','recordNumber':row.number} + const {tableObject:tableObjectPrint ,tableMethods} = useTable({ + defaultParams, + getListApi: PackageApi.getLabelDetailPage // 分页接口 + }) + // 获得表格的各种操作 + const { getList:getListPrint } = tableMethods + getListPrint() + tableObject.loading = false + const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns + tableColumns.forEach((item) => { + item.width = item.table?.width || 150 + }) + searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) +} +// 批量打印--预生产收货 +const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => { + console.log('批量打印',val) + + if(val.length == 0){ + message.warning("请先选择要打印的数据!") + return + } + await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { + console.log(res) + if (labelType.value == 'cg') { + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res) + } else { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res) + } + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts index a89421081..3fb619aec 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts @@ -338,6 +338,16 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ // } // } // }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 120, + fixed: 'right' + }, + } ])) //表单校验 From 03787a3f84c146ea4b4e6006015105ee33750617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 10 Aug 2024 12:29:00 +0800 Subject: [PATCH 040/136] =?UTF-8?q?Q1=20Q2=20Q3=20=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 3 +++ src/views/qms/inspectionQ1/inspectionQ1.data.ts | 2 +- src/views/qms/inspectionQ2/inspectionQ2.data.ts | 2 +- src/views/qms/inspectionQ3/inspectionQ3.data.ts | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 22c46d617..5c75f708f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -323,6 +323,9 @@ export enum DICT_TYPE { QUALITY_NOTIFICATION_PRIORITY = 'quality_notification_priority', // 质量通知优先级 CLAIM_REASON = 'claim_Reason', // 质量通知索赔原因 QMS_CODE = 'qms_code', // 质量通知代码 + QMS_Q1_CODE = 'qms_Q1_code', + QMS_Q2_CODE = 'qms_Q2_code', + QMS_Q3_CODE = 'qms_Q3_code', DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置 DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型 PROBLEM_REASON = 'problem_reason', // 质量通知问题原因 diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 39fc07837..6850c5e94 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -179,7 +179,7 @@ export const Q1 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.QMS_CODE, + dictType: DICT_TYPE.QMS_Q1_CODE, dictClass: 'string', isSearch: false, isTable: true, diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 55df4ad9f..5c647f76f 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -286,7 +286,7 @@ export const Q2 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.QMS_CODE, + dictType: DICT_TYPE.QMS_Q2_CODE, dictClass: 'string', isSearch: false, isTable: true, diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 66d54dabb..db0f5fe1a 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -214,7 +214,7 @@ export const Q3 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.QMS_CODE, + dictType: DICT_TYPE.QMS_Q3_CODE, dictClass: 'string', isSearch: true, isTable: true, From 597317aba90e7bfde39f06164ebb88202307806c Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Sat, 10 Aug 2024 13:14:46 +0800 Subject: [PATCH 041/136] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA=E9=85=8D=E7=BD=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index eb9f347ae..ce408d873 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -52,7 +52,7 @@ :tableData="tableData" :apiUpdate="ItemareaApi.updateItemarea" :apiCreate="ItemareaApi.createItemarea" - :isBusiness="true" + :isBusiness="false" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" :isShowReduceButtonSelection="true" @@ -68,7 +68,7 @@ Date: Sat, 10 Aug 2024 13:17:44 +0800 Subject: [PATCH 042/136] InventorymoveRecordMainNew --- .../inventorymoveRecordMainNew/index.vue | 20 +++++++++---------- ....ts => inventorymoveRecordMainNew.data.ts} | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) rename src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/{inventorymoveRecordMain.data.ts => inventorymoveRecordMainNew.data.ts} (98%) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 7a08ce4d9..a46ddc264 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -1,7 +1,7 @@