From 965b13eb612a4a311b6108d4914f4a3e10f683a5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 10:20:24 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/LoginForm.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 7751297e1..084b29a4e 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -33,7 +33,7 @@ :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" /> - +
{ @@ -234,7 +234,7 @@ return } let res = null - if(needCode.value=='false'){ + if(!needCode){ res = await LoginApi.loginNoCode(loginData.loginForm) }else{ res = await LoginApi.login(loginData.loginForm) From 0c8be0a04bd8bc19959b7646c14ad6b652b4d4bc Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 10:31:53 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=20=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E7=99=BB=E5=BD=95+=E6=9D=A8=E7=8E=89=E7=A6=8F?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E6=8E=89=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/LoginForm.vue | 4 +- .../supplierinvoiceRequestMain/index.vue | 40 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 084b29a4e..661c0c0eb 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -174,7 +174,7 @@ // } // } function getCode() { - if(!needCode){ + if(!needCode.value){ return } getCodeImg().then(res => { @@ -234,7 +234,7 @@ return } let res = null - if(!needCode){ + if(!needCode.value){ res = await LoginApi.loginNoCode(loginData.loginForm) }else{ res = await LoginApi.login(loginData.loginForm) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index bca5b0524..8c363166d 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -702,16 +702,16 @@ const buttonTableClick = async (val, row) => { handleRepeal(row.id) } } -const procurementCreators = ref([]) -SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ - roleCode: 'purchase', - pageSize: 1000, - pageNo: 1, - sort: '', - by: 'ASC' -}).then((res) => { -procurementCreators.value = res.list -}) +// const procurementCreators = ref([]) +// SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ +// roleCode: 'purchase', +// pageSize: 1000, +// pageNo: 1, +// sort: '', +// by: 'ASC' +// }).then((res) => { +// procurementCreators.value = res.list +// }) /** 添加/修改操作 */ const formRef = ref() const openForm = async (type: string, row?: any) => { @@ -787,10 +787,10 @@ const openForm = async (type: string, row?: any) => { item.componentProps.disabled = false } - if (item.field == 'procurementCreator') { - item.componentProps.options = procurementCreators.value + // if (item.field == 'procurementCreator') { + // item.componentProps.options = procurementCreators.value - } + // } }) } if (row && (row.status == '3' || row.status == '7')) { @@ -813,13 +813,13 @@ const openForm = async (type: string, row?: any) => { } tableData.value = [] // 重置明细数据 formRef.value.open(type, row) - if(type=='create'){ - nextTick(() => { - formRef.value.formRef.setValues({ - procurementCreator:procurementCreators.value[0].id - }) - }) - } + // if(type=='create'){ + // nextTick(() => { + // formRef.value.formRef.setValues({ + // procurementCreator:procurementCreators.value[0].id + // }) + // }) + // } }) } const defaultSupplierCode = ref('') From 7ed7a0901a84da1bfcac0f214cadd382df4111ac Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 17 Aug 2024 10:45:10 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5405=20?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99=E5=85=B3=E7=B3=BB=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=A3=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=B6=85=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/supplieritem/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index 1184dbc18..486c73b79 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -77,14 +77,14 @@ const route = useRoute() //路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Supplieritem.allSchemas.tableColumns) -if(routeName.value.includes('SCP')){ - tableColumns.value = tableColumns.value.filter(item=>item.field!='action') -} +// if(routeName.value.includes('SCP')){ +// tableColumns.value = tableColumns.value.filter(item=>item.field!='action') +// } //字段设置 更新主列表字段 const updataTableColumns = (val) => { - if(routeName.value.includes('SCP')){ - val = val.filter(item=>item.field!='action') - } + // if(routeName.value.includes('SCP')){ + // val = val.filter(item=>item.field!='action') + // } tableColumns.value = val } const { tableObject, tableMethods } = useTable({ From c5298daa3b5cb80427e1c79929824cc3010f6788 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sat, 17 Aug 2024 10:47:12 +0800 Subject: [PATCH 04/11] =?UTF-8?q?HL-5354=20=E8=A3=85=E9=85=8D=E5=88=B6?= =?UTF-8?q?=E5=93=81=E4=B8=8A=E6=9E=B6=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productputawayRecordDetail/index.ts | 2 +- src/api/wms/productputawayRecordMain/index.ts | 8 +++++++- .../stockup/stockupMainJob/index.vue | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/api/wms/productputawayRecordDetail/index.ts b/src/api/wms/productputawayRecordDetail/index.ts index 4464c5c7e..5b46db206 100644 --- a/src/api/wms/productputawayRecordDetail/index.ts +++ b/src/api/wms/productputawayRecordDetail/index.ts @@ -54,7 +54,7 @@ export const getProductputawayRecordDetailPage = async (params) => { // 查询制品上架记录子列表 export const getProductputawayRecordDetailPageAssemble = async (params) => { -   params.type = 'assemble' + params.type = 'assemble' if (params.isSearch) { const cmd = { 'column':'type', diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts index 897de3153..f411cfb30 100644 --- a/src/api/wms/productputawayRecordMain/index.ts +++ b/src/api/wms/productputawayRecordMain/index.ts @@ -74,8 +74,14 @@ export const deleteProductputawayRecordMain = async (id: number) => { // 导出制品上架记录主 Excel export const exportProductputawayRecordMain = async (params) => { - params.type = 'predict' + params.type = 'assemble' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'assemble' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data }) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index 92a3e9db4..1551887fb 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -142,7 +142,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-job-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-main-job:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 From bb01965e61ae11d48efa97843d371726c08b9621 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sat, 17 Aug 2024 11:00:37 +0800 Subject: [PATCH 05/11] =?UTF-8?q?HL-5400=20=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index c68de58d5..542698de4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -305,6 +305,15 @@ const handleExport = async () => { // 筛选提交 const searchFormClick = (searchData) => { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + if (!Array.isArray(searchData.filters)) { + searchData.filters = []; + } + searchData.filters.push(cmd) tableObject.params = { isSearch: true, filters: searchData.filters From ebc5855f54b78b3341256b83c3f3b800aafc2ea9 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 11:05:00 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=96=B0=E7=89=88-=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMainNew/index.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index d065fb8d6..81a5268d7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -83,7 +83,7 @@ - +