From d0615b3718f2f549025664a660b401689debdedf Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 09:36:04 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierApbalance/supplierApbalanceMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue index e5a762365..9d8b24505 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -370,6 +370,9 @@ const selectChange = (value,field)=>{ } if(dayList.value.length>0){ day.value = dayList.value[0]['value'] + searchRef.value.setFormValues({ + 'day':day.value, + }) } } } From a7b527075736367afe1ec53bf67212b6f2ef7d39 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 10:04:22 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierApbalance/supplierApbalanceMain/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue index 9d8b24505..459811915 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -248,7 +248,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => { const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/973017727126409216?token=' + getAccessToken()) const handlePrint = async (row) => { - window.open(src.value+'&id='+row.id) + window.open(src.value+'&id='+row.id+'&searchTime='+tableObject.params.searchTime) } @@ -381,6 +381,7 @@ const resetClick = async (data)=>{ year.value = '' month.value = '' day.value = '' + data['searchTime'] = '' searchClick(data) } @@ -395,7 +396,9 @@ const searchClick = async (data)=>{ if((''+data['day']).length==1){ data['day'] = '0' + data['day'] } - data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}` + if(data['year']&&data['month']&&data['day']){ + data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}` + } setSearchParams(data) } /** 初始化 **/ From c9aead922fbad728fbb6bc5c6a809839fe604290 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 10:18:24 +0800 Subject: [PATCH 03/11] undefined --- .../supplierApbalance/supplierApbalanceMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue index 459811915..4586e8290 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -248,7 +248,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => { const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/973017727126409216?token=' + getAccessToken()) const handlePrint = async (row) => { - window.open(src.value+'&id='+row.id+'&searchTime='+tableObject.params.searchTime) + window.open(src.value+'&id='+row.id+'&searchTime='+`${tableObject.params.searchTime||''}`) } From cdd9db2588144414893249c658ee17b3602f356d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 10:21:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierApbalanceMain/supplierApbalanceMain.data.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts index cedc89710..72f3f1c10 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts @@ -45,6 +45,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTable:false, + isDetail:false, }, { label: '月', @@ -52,7 +53,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTable:false, - + isDetail:false, }, { label: '日', @@ -60,7 +61,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTable:false, - + isDetail:false, }, // { // label: '账户类型', From c47672ebbf22241fbd0ce42679dcd2a622bed91a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 10:31:19 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierApbalanceMain.data.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts index 72f3f1c10..858334c5b 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts @@ -19,14 +19,14 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isForm: false, }, - { - label: '状态', - field: 'replyStatus', - sort: 'custom', - isSearch: true, - dictType: DICT_TYPE.REPLY_STATUS, - dictClass: 'string', - }, + // { + // label: '状态', + // field: 'replyStatus', + // sort: 'custom', + // isSearch: true, + // dictType: DICT_TYPE.REPLY_STATUS, + // dictClass: 'string', + // }, { label: '公司代码', field: 'ttCompany', From e35096db173795e76a7ca9ea1368c78a9fb6e21b Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 10:35:26 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=A7=94=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backflushDetailbQad/backflushDetailbQad.data.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts index 14b82105e..76bea1dd6 100644 --- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts +++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts @@ -106,6 +106,13 @@ export const BackflushDetailbQad = useCrudSchemas(reactive([ field: 'qty', sort: 'custom', }, + { + label: '是否委外', + field: 'isWw', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + }, { label: '操作', field: 'action', From 001997e861b62845146eb4a9badaef66a2b48308 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 13:57:50 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRequestMain.data.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index cdca664aa..938de9583 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -173,6 +173,19 @@ export const ProductscrapRequestMain = useCrudSchemas( } } }, + { + label: '成本中心类型', + field: 'costCenterType', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + }, { label: '原因代码', field: 'reasonCodeRequisition', From 9761f76e37b87d7254d5f0eabafed9db4d2df7b4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 14:46:46 +0800 Subject: [PATCH 08/11] =?UTF-8?q?SCP=E5=8E=BB=E6=8E=89=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceipt/purchasereceiptJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 16b901b6a..51b472a5c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -177,7 +177,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出 - defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置 + defaultButtons.defaultUpdateTaskSettingBtn({hide:routeName.value.includes('SCP')}), // 更新任务设置 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 From adcac0a5cd70d8df755e69ccd8c31c60166dd316 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 6 Nov 2024 15:51:44 +0800 Subject: [PATCH 09/11] =?UTF-8?q?HL-6386=E5=8E=9F=E5=9B=A0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=BB=98=E8=AE=A4SC99=EF=BC=8C=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=BB=98=E8=AE=A4DEFC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain/index.vue | 16 ++++++++++++++++ .../productionscrapRequestMain.data.ts | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 5096dda96..58f1f53d8 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -230,6 +230,11 @@ const clearSearchInput = (field)=>{ }) } } +const defaultReasonCodeRequisition = ref(true) +const setDefaultrReasonCodeRequisition = ()=>{ + formRef.value.setDefaultBlurValue('reasonCodeRequisition','SC99') + defaultReasonCodeRequisition.value = false +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(async () => { @@ -324,6 +329,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV[formField] = val[0][searchField] tableData.value = [] // 重置明细数据 formRef.setValues(setV) + if(formField == 'costCenterCode'){ + if(defaultReasonCodeRequisition.value){ + setDefaultrReasonCodeRequisition() + } + } } }) } @@ -641,6 +651,12 @@ const openForm =async (type: string, row?: number) => { }) } formRef.value.open(type, row) + if(type == 'create'){ + nextTick(()=>{ + defaultReasonCodeRequisition.value = true + formRef.value.setDefaultBlurValue('costCenterCode','DEFC') + }) + } } // 批量打印--生产退料 diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 959141c48..4fe78c5f4 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -892,7 +892,7 @@ export const ProductionscrapRequestMain = useCrudSchemas( table: { width: 150 }, - isForm:false, + isForm:true, isTable:false, isTableForm:false, form: { From 788b0c74da1aec9d2edb4c8543b67cae927385ca Mon Sep 17 00:00:00 2001 From: chenfang <1057876684@qq.com> Date: Wed, 6 Nov 2024 19:53:04 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=99=A8=E5=85=B7=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balanceContainer/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryManage/balanceContainer/index.vue b/src/views/wms/inventoryManage/balanceContainer/index.vue index 2d4ee1064..a00fdf2ec 100644 --- a/src/views/wms/inventoryManage/balanceContainer/index.vue +++ b/src/views/wms/inventoryManage/balanceContainer/index.vue @@ -107,7 +107,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: BalanceApi.getBalanceByQJ // 分页接口 + getListApi: BalanceApi.getBalanceByQJToScrap // 分页接口 }) // 获得表格的各种操作 From c8624ebac6835fe0151ce85138a08e2d3758470f Mon Sep 17 00:00:00 2001 From: chenfang <1057876684@qq.com> Date: Thu, 7 Nov 2024 08:36:42 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../balanceContainer/index.vue | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/views/wms/inventoryManage/balanceContainer/index.vue b/src/views/wms/inventoryManage/balanceContainer/index.vue index a00fdf2ec..c72deb283 100644 --- a/src/views/wms/inventoryManage/balanceContainer/index.vue +++ b/src/views/wms/inventoryManage/balanceContainer/index.vue @@ -150,9 +150,11 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else if (val=='selection_point'){// 批量打印 - handleSelectionPoint() - } else { // 其他按钮 + } + // else if (val=='selection_point'){// 批量打印 + // handleSelectionPoint() + // } + else { // 其他按钮 console.log('其他按钮', item) } } @@ -220,22 +222,22 @@ const handleSelectionPoint = async ()=>{ // window.open(srcPoint.value+'&relateNumber='+rows.join(',')) } // 列表-操作按钮 -const butttondata = [ - { - label: '标签信息', - name: 'bqxx', - hide: false, - type: 'primary', - icon: '', - color: '', - link: true, - float:'right', - hasPermi: '' - }, - defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 -] +// const butttondata = [ +// { +// label: '标签信息', +// name: 'bqxx', +// hide: false, +// type: 'primary', +// icon: '', +// color: '', +// link: true, +// float:'right', +// hasPermi: '' +// }, +// defaultButtons.mainListPointBtn(null), // 标签打印 +// // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 +// // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 +// ] // 列表-操作按钮事件 const buttonTableClick = async (val, row) => {