From c1aaff8ffeb3fa249c1ffff85eaf14a6ac0c133f Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 09:12:37 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE--=E7=A8=8E=E7=8E=87=E4=B8=BA0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Descriptions/src/Descriptions.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index a7c49f853..23ed47eb2 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -149,7 +149,7 @@ const showAll = () =>{
- + {{ data[item.field] }} From 2adad14390ca5a28f5ecc64ee94ae34f298e07cc Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 09:24:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 7ed2bd95e..f32625fd4 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -10,7 +10,7 @@ :allSchemas="PurchasePlanMain.allSchemas" :detailAllSchemas="PurchasePlanDetail.allSchemas"> From 73641f35469aa71adf8fa7a696682f7e196e8991 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 09:27:39 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9D=A8=E7=8E=89=E7=A6=8F=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index ce7df9147..bd99f01f0 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -22,10 +22,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ sort: 'custom', table: { width: 180, - fixed: 'left' }, sortSearchDefault:1, - sortTableDefault:1, + sortTableDefault:99999, isSearch: true }, { From 0bca2d92db6af03c7af6137d81a00efe78ac2f21 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 09:50:55 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=BF=81=E7=A7=BBalert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 4 ++++ public/systemConfig.js | 4 +++- src/utils/systemParam.ts | 23 +++++++++++++++++++++++ src/views/login/components/LoginForm.vue | 11 +++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.env.prod b/.env.prod index cb7c3aa46..c269d3296 100644 --- a/.env.prod +++ b/.env.prod @@ -41,3 +41,7 @@ VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' + +# 登录系统升级的提示 +VITE_SYSTERM_UPDATE_ALERT = true +VITE_SYSTERM_UPDATE_URL = 'https://scptest.faway-hella.com/' diff --git a/public/systemConfig.js b/public/systemConfig.js index 1908c7089..c84fd37fb 100644 --- a/public/systemConfig.js +++ b/public/systemConfig.js @@ -10,5 +10,7 @@ let systemConfig = { // 查看质检报告环境 reportUrl: 'https://scp.faway-hella.com', // 租户配置 - tenant: '["成都"]' + tenant: '["成都"]', + systermUpdateAlert: true, + systermUpdateUrl: 'https://scptest.faway-hella.com/' } diff --git a/src/utils/systemParam.ts b/src/utils/systemParam.ts index 347b564dd..d165d58fa 100644 --- a/src/utils/systemParam.ts +++ b/src/utils/systemParam.ts @@ -4,6 +4,9 @@ const interfaceUrl = ref(import.meta.env.VITE_INTERFACE_URL) const jmreportBaseUrl = ref(import.meta.env.VITE_JMREPORT_BASE_URL) const reportUrl = ref(import.meta.env.VITE_REPORT_URL) const tenant = ref(import.meta.env.VITE_TENANT) +const systermUpdateAlert = ref(import.meta.env.VITE_SYSTERM_UPDATE_ALERT) +const systermUpdateUrl = ref(import.meta.env.VITE_SYSTERM_UPDATE_URL) + const mode = ref(import.meta.env.MODE) // 获取baseUrl export const getBaseUrl = () => { @@ -53,3 +56,23 @@ export const getTenant = () => { return tenant.value } } + + +// 获取系统升级是否弹出alert +export const getSystermUpdateAlert = () => { + if(mode.value === 'prod') { + return systemConfig.systermUpdateAlert + } else { + return systermUpdateAlert.value + } +} + +// 获取系统升级是否弹出alert地址 +export const getSystermUpdateUrl = () => { + if(mode.value === 'prod') { + return systemConfig.systermUpdateUrl + } else { + return systermUpdateUrl.value + } +} + diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 9409377c3..3fb492c08 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -96,6 +96,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import * as DeptApi from '@/api/system/dept' import { getTenant } from '@/utils/systemParam' + import { getSystermUpdateAlert,getSystermUpdateUrl } from '@/utils/systemParam' defineOptions({ name: 'LoginForm' }) @@ -211,6 +212,16 @@ // 登录 const handleLogin = async (params) => { console.log('登录-185') + if(getSystermUpdateAlert()){ + await ElMessageBox.alert( + '系统迁移，请移步至' + + `${getSystermUpdateUrl()}`, + '重要提示', + { + dangerouslyUseHTMLString: true, + } + ) + } loginLoading.value = true try { await getTenantId() From 380d007cc1643415494781b8bf586c32d6bcec55 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 29 Jul 2024 09:59:26 +0800 Subject: [PATCH 05/10] =?UTF-8?q?qms-=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=86=B3=E7=AD=96=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/inspectionRecord/inspectionRecordMain/index.ts | 4 ++++ src/views/qms/inspectionRecordFirst/index.vue | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts index 375e69b2f..dfd99059f 100644 --- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts +++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts @@ -46,6 +46,10 @@ export const createInspectionRecordMain = async (data: InspectionRecordMainVO) = // 修改检验申请 export const updateInspectionRecordMain = async (data: InspectionRecordMainVO) => { + return await request.put({ url: `/qms/inspection-record-main/update`, data }) +} +// 首件检验保存 +export const updateInspectionRecordFirstMain = async (data: InspectionRecordMainVO) => { return await request.put({ url: `/qms/inspection-record-main/firstInspectionUpdate`, data }) } diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue index de5d008bf..75bff36cf 100644 --- a/src/views/qms/inspectionRecordFirst/index.vue +++ b/src/views/qms/inspectionRecordFirst/index.vue @@ -135,7 +135,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑 + defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑 defaultButtons.mainListDeleteBtn({hasPermi: 'wms:inspection-recode-first-main:delete' }), // 删除 defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi:'qms:inspection-recode-first-main:pub'}), // 发布 ] @@ -228,7 +228,7 @@ const buttonBaseClick = (val, item) => { await InspectionRecordMainApi.createInspectionRecordMain(data) message.success(t('common.createSuccess')) }else { - await InspectionRecordMainApi.updateInspectionRecordMain(data) + await InspectionRecordMainApi.updateInspectionRecordFirstMain(data) message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false From 5d715e089ddd0acd37a7d621b3df8d11b01f0b58 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 10:00:35 +0800 Subject: [PATCH 06/10] =?UTF-8?q?bug=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=97=B6,=E9=80=89=E6=8B=A9=E5=B7=A5=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E5=8E=9F=E6=96=99=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueManage/preparetoissueplan/preparetoissueMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index c2fc2f467..2600494c4 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -128,6 +128,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => tableData.value.push(newRow) }) }else{ + row['toLocationCode'] = val[0]['rawLocationCode'] row[formField] = val[0][searchField] } From 3f8cc61e1d07e8669371263e416dcb46fbdd0737 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 29 Jul 2024 11:57:48 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRequestMain.data.ts | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 6c3837065..d90dd8f79 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -473,14 +473,14 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false }, - // { - // label: '批次', - // field: 'batch', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '包装号', // field: 'packingNumber', @@ -816,6 +816,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( field: 'packUnit', isTable: true, sort: 'custom', + table: { + width: 150 + }, form: { componentProps: { enterSearch: true, @@ -901,6 +904,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( field: 'secondPackUnit', isTable: true, sort: 'custom', + table: { + width: 150 + }, form: { componentProps: { enterSearch: true, @@ -986,8 +992,10 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( label: '入库存包装规格', field: 'balancePackUnit', sort: 'custom', + table: { + width: 150 + }, form: { - width: 150, componentProps: { enterSearch: true, disabled: true, From 665b382072a691faa6d4f2cf8e15e838001ba85d Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 29 Jul 2024 13:06:17 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRecordSpareMain.data.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts index 278a1c099..f742061be 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts @@ -558,7 +558,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( } }, sortTableDefault: 1004, - hiddenInMain:true, isForm:false, tableForm:{ type:'InputNumber', From 194598df3cba8d59181f303d46895023c8e1693f Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 13:27:57 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=80=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E6=9C=89=EF=BC=9A=E5=8F=AF=E7=94=A8=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E8=8C=83=E5=9B=B4=E3=80=81=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=BA=93=E5=8C=BA=E7=B1=BB=E5=9E=8B=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E3=80=81=E5=85=A5=E5=BA=93=E5=BA=93=E5=8C=BA=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E3=80=81=E5=87=BA=E5=BA=93=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=8C=83=E5=9B=B4=E3=80=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 + src/hooks/web/useCrudSchemas.ts | 4 + .../businesstype/businesstype.data.ts | 11 ++ .../documentSetting/businesstype/index.vue | 112 ++++++++++++++++-- 4 files changed, 120 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 237938dee..0e77af65b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ ## dev发布2024-06-01-002 **xxxx.data.ts 文件配置说明** +dictType: DICT_TYPE.INVENTORY_STATUS, +dictClass: 'string', +dictAllOption:true,// true 字典中--下拉框中展示全选按钮 +dictAllValue:'全选', // 全选按钮的value值 **form表单查询弹窗配置** form: { labelMessage: '信息提示说明！！！', diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts index 541ca87b6..5f6c183f9 100644 --- a/src/hooks/web/useCrudSchemas.ts +++ b/src/hooks/web/useCrudSchemas.ts @@ -264,6 +264,10 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For options.push(dict) }) } else { + if(schemaItem.dictAllOption){ + const allOptions: ComponentOptions = { label: '全选', value: schemaItem.dictAllValue||'' } + options.push(allOptions) + } getDictOptions(schemaItem.dictType).forEach((dict) => { options.push(dict) }) diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts index d04cd3304..bdef4ffcb 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts @@ -45,6 +45,8 @@ export const Businesstype = useCrudSchemas(reactive([ field: 'itemTypes', dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', + dictAllOption:true,// 全选按钮 + dictAllValue:'全选', isTable: true, sort: 'custom', table: { @@ -57,6 +59,7 @@ export const Businesstype = useCrudSchemas(reactive([ }, } }, + { label: '可用物料状态范围', field: 'itemStatuses', @@ -73,6 +76,8 @@ export const Businesstype = useCrudSchemas(reactive([ field: 'outAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', + dictAllOption:true,// 全选按钮 + dictAllValue:'全选', isTable: true, sort: 'custom', table: { @@ -90,6 +95,8 @@ export const Businesstype = useCrudSchemas(reactive([ field: 'inAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', + dictAllOption:true,// 全选按钮 + dictAllValue:'全选', isTable: true, sort: 'custom', table: { @@ -163,6 +170,8 @@ export const Businesstype = useCrudSchemas(reactive([ field: 'outInventoryStatuses', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', + dictAllOption:true,// 全选按钮 + dictAllValue:'全选', isTable: true, sort: 'custom', table: { @@ -180,6 +189,8 @@ export const Businesstype = useCrudSchemas(reactive([ field: 'inInventoryStatuses', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', + dictAllOption:true,// 全选按钮 + dictAllValue:'全选', isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index 6813664dd..faff79448 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -53,6 +53,7 @@ @searchTableSuccess="searchTableSuccess" :isBusiness="false" :basicFormWidth="75" + @onChange="onChange" /> @@ -76,6 +77,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' // 业务类型 defineOptions({ name: 'Businesstype' }) @@ -157,11 +159,44 @@ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 const rowSplit = JSON.parse(JSON.stringify(row)) - rowSplit.itemTypes = rowSplit.itemTypes.split(',') - rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',') - rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',') - rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',') - rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',') + // rowSplit.itemTypes = rowSplit.itemTypes.split(',') + // 可用物料类型范围 + const allItemTypesValue = getStrDictOptions(DICT_TYPE.ITEM_TYPE).map(item=>(item.value)) + if(rowSplit.itemTypes == allItemTypesValue){ + rowSplit.itemTypes = ['全选'] + }else{ + rowSplit.itemTypes = rowSplit.itemTypes.split(',') + } + + // 出库库区类型范围 入库库区类型范围 + const allValue = getStrDictOptions(DICT_TYPE.AREA_TYPE).map(item=>(item.value)) + if(rowSplit.outAreaTypes == allValue){ + rowSplit.outAreaTypes = ['全选'] + }else{ + rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',') + } + + if(rowSplit.inAreaTypes == allValue){ + rowSplit.inAreaTypes = ['全选'] + }else{ + rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',') + } + // rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',') + // rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',') + + const allInventoryStatusesValue = getStrDictOptions(DICT_TYPE.INVENTORY_STATUS).map(item=>(item.value)) + if(rowSplit.outInventoryStatuses == allInventoryStatusesValue){ + rowSplit.outInventoryStatuses = ['全选'] + }else{ + rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',') + } + if(rowSplit.inInventoryStatuses == allInventoryStatusesValue){ + rowSplit.inInventoryStatuses = ['全选'] + }else{ + rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',') + } + // rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',') + // rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',') openForm('update', rowSplit) } else if (val == 'delete') { // 删除 @@ -176,7 +211,8 @@ const openForm = (type: string, row?: any) => { } // form表单提交 -const formsSuccess = async (formType, data) => { +const formsSuccess = async (formType, submitData) => { + let data = {...submitData} var isHave = Businesstype.allSchemas.formSchema.some(function (item) { return item.field === 'activeTime' || item.field === 'expireTime' }) @@ -188,11 +224,47 @@ const formsSuccess = async (formType, data) => { } if (data.activeTime == 0) data.activeTime = null if (data.expireTime == 0) data.expireTime = null - data.itemTypes = data.itemTypes.join(',') - data.outAreaTypes = data.outAreaTypes.join(',') - data.inAreaTypes = data.inAreaTypes.join(',') - data.outInventoryStatuses = data.outInventoryStatuses.join(',') - data.inInventoryStatuses = data.inInventoryStatuses.join(',') + // data.itemTypes = data.itemTypes.join(',') + const allItemTypesValue = getStrDictOptions(DICT_TYPE.ITEM_TYPE).map(item=>(item.value)) + if(data.itemTypes[data.itemTypes.length-1]=='全选'){ + data.itemTypes = allItemTypesValue.join(',') + }else{ + data.itemTypes = data.itemTypes.join(',') + } + + // data.outAreaTypes = data.outAreaTypes.join(',') + // data.inAreaTypes = data.inAreaTypes.join(',') + //全选的值 + const allValue = getStrDictOptions(DICT_TYPE.AREA_TYPE).map(item=>(item.value)) + if(data.outAreaTypes[data.outAreaTypes.length-1]=='全选'){ + data.outAreaTypes = allValue.join(',') + }else{ + data.outAreaTypes = data.outAreaTypes.join(',') + } + + if(data.inAreaTypes[data.inAreaTypes.length-1]=='全选'){ + data.inAreaTypes = allValue.join(',') + }else{ + data.inAreaTypes = data.inAreaTypes.join(',') + } + + + // 出库库存状态范围 入库库存状态范围 + // data.outInventoryStatuses = data.outInventoryStatuses.join(',') + // data.inInventoryStatuses = data.inInventoryStatuses.join(',') + const allInventoryStatusesValue = getStrDictOptions(DICT_TYPE.INVENTORY_STATUS).map(item=>(item.value)) + if(data.outInventoryStatuses[data.outInventoryStatuses.length-1]=='全选'){ + data.outInventoryStatuses = allInventoryStatusesValue.join(',') + }else{ + data.outInventoryStatuses = data.outInventoryStatuses.join(',') + } + if(data.inInventoryStatuses[data.inInventoryStatuses.length-1]=='全选'){ + data.inInventoryStatuses = allInventoryStatusesValue.join(',') + }else{ + data.inInventoryStatuses = data.inInventoryStatuses.join(',') + } + + if (formType === 'create') { await BusinesstypeApi.createBusinesstype(data) .then(async () => { @@ -224,6 +296,24 @@ const formsSuccess = async (formType, data) => { } } +const onChange = (field, value)=>{ + console.log('onChange',field,value) + if(field=='outAreaTypes'||field=='inAreaTypes'||field=='itemTypes'||field=='outInventoryStatuses'||field=='inInventoryStatuses'){ + //出库区类型范围 入库区类型范围 可用物料类型范围 出库库存状态范围 入库库存状态范围 + if(value.length>0){ + if(value[value.length-1]=='全选'){ + //全选 + basicFormRef.value.formRef.setValues({ + [field]:['全选'] + }) + }else{ + basicFormRef.value.formRef.setValues({ + [field]:value.filter(item=>item!='全选') + }) + } + } + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { From 1c62982934bcc834da421b077213d12f7ebc130c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 29 Jul 2024 14:06:52 +0800 Subject: [PATCH 10/10] =?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/api/qms/inspectionScheme/index.ts | 13 +++++++++---- src/api/qms/inspectionTemplate/index.ts | 17 ++++++++++------- .../qms/inspectionQ2/inspectionQ2.data.ts | 2 +- .../qms/inspectionQ3/inspectionQ3.data.ts | 2 +- src/views/qms/inspectionScheme/index.vue | 19 ++++++++++++++++++- src/views/qms/inspectionTemplate/index.vue | 18 +++++++++++++++++- src/views/qms/selectedSet/index.vue | 2 +- 7 files changed, 57 insertions(+), 16 deletions(-) diff --git a/src/api/qms/inspectionScheme/index.ts b/src/api/qms/inspectionScheme/index.ts index 3c5f30e93..53c305c2a 100644 --- a/src/api/qms/inspectionScheme/index.ts +++ b/src/api/qms/inspectionScheme/index.ts @@ -1,21 +1,21 @@ import request from '@/config/axios' // 新增 export const InspectionSchemeCreat = async (data) => { - return await request.post({ url: `/qms/inspection-scheme/create`,data}) + return await request.post({ url: `/qms/inspection-scheme/create`, data }) } // 编辑 export const InspectionSchemeUpdate = async (data) => { - return await request.put({ url: `/qms/inspection-scheme/update`,data}) + return await request.put({ url: `/qms/inspection-scheme/update`, data }) } // 删除 export const InspectionSchemeDelete = async (id) => { - return await request.delete({ url: `/qms/inspection-scheme/delete?id=`+id}) + return await request.delete({ url: `/qms/inspection-scheme/delete?id=` + id }) } // 列表 export const InspectionSchemePage = async (params) => { if (params.isSearch) { delete params.isSearch - const data = {...params} + const data = { ...params } return request.post({ url: '/qms/inspection-scheme/senior', data }) } else { return await request.get({ url: `/qms/inspection-scheme/page`, params }) @@ -31,6 +31,11 @@ export const disableInspectionScheme = async (id: number) => { return await request.disable({ url: `/qms/inspection-scheme/disable?id=` + id }) } +// 导出检验阶段 Excel +export const exportInspectionScheme = async (params) => { + return await request.download({ url: `/qms/inspection-scheme/export-excel`, params }) +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/qms/inspection-scheme/get-import-template' }) diff --git a/src/api/qms/inspectionTemplate/index.ts b/src/api/qms/inspectionTemplate/index.ts index eb80285c8..577fadd6f 100644 --- a/src/api/qms/inspectionTemplate/index.ts +++ b/src/api/qms/inspectionTemplate/index.ts @@ -1,28 +1,26 @@ import request from '@/config/axios' - - // 列表 export const getListByTempleteCode = async (code) => { - return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code}) + return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=` + code }) } // 新增 export const inspectionTemplateCreat = async (data) => { - return await request.post({ url: `/qms/programme-template/create`,data}) + return await request.post({ url: `/qms/programme-template/create`, data }) } // 编辑 export const inspectionTemplateUpdate = async (data) => { - return await request.put({ url: `/qms/programme-template/update`,data}) + return await request.put({ url: `/qms/programme-template/update`, data }) } // 删除 export const inspectionTemplateDelete = async (id) => { - return await request.delete({ url: `/qms/programme-template/delete?id=`+id}) + return await request.delete({ url: `/qms/programme-template/delete?id=` + id }) } // 列表 export const inspectionTemplatePage = async (params) => { if (params.isSearch) { delete params.isSearch - const data = {...params} + const data = { ...params } return request.post({ url: '/qms/programme-template/senior', data }) } else { return await request.get({ url: `/qms/programme-template/page`, params }) @@ -38,6 +36,11 @@ export const disableInspectionTemplate = async (id: number) => { return await request.disable({ url: `/qms/programme-template/disable?id=` + id }) } +// 导出检验模版 Excel +export const exportInspectionTemplate = async (params) => { + return await request.download({ url: `/qms/programme-template/export-excel`, params }) +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/qms/programme-template/get-import-template' }) diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 9085a2ffd..2367309c2 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -50,7 +50,7 @@ export const Q2 = useCrudSchemas( } }, { - label: 'q1通知单号', + label: 'Q1通知单号', field: 'q1Number', sort: 'custom', table: { diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 62606af62..ed0b771d3 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -44,7 +44,7 @@ export const Q3 = useCrudSchemas( } }, { - label: 'q1通知单号', + label: 'Q1通知单号', field: 'q1Number', sort: 'custom', table: { diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue index 1241fda5d..e385e67c2 100644 --- a/src/views/qms/inspectionScheme/index.vue +++ b/src/views/qms/inspectionScheme/index.vue @@ -59,6 +59,7 @@