From eac667a2d422f69921bca216b44cf4a3a2b9e047 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 16 Jul 2024 15:09:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/business/inputBlur.ts | 14 +++- .../issueRequestMain/issueRequestMain.data.ts | 65 +++++++++++++++++-- .../productionreturnRequestMain.data.ts | 51 +++++++++++++-- 3 files changed, 115 insertions(+), 15 deletions(-) diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 53574165c..02da3da92 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -66,7 +66,15 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f filters.push({ action: searchCondition[i].action || '==', column: searchCondition[i].key, - value: formRef.formModel[searchCondition[i].value] + value: formRef.formModel[ + searchCondition[i].value + ] + ? formRef.formModel[searchCondition[i].value] + : detailData + ? detailData[searchCondition[i].value] + : row + ? row[searchCondition[i].value] + : '' }) } else if (searchCondition[i].isTableRowValue) { if (searchCondition[i].required) { @@ -828,10 +836,10 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form let repeatCode = [] if (tableData.length > 0) { tableData.forEach((item) => { - const findIndex = arr1.findIndex(valItem => valItem == item[field]) + const findIndex = arr1.findIndex(valItem => valItem == item[headerItem.field]) if (findIndex > -1) { arr1.splice(findIndex, 1) - repeatCode.push(item[field]) + repeatCode.push(item[headerItem.field]) } }) } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 74fe76479..197eed5b0 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -81,7 +81,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -95,6 +103,7 @@ export const IssueRequestMain = useCrudSchemas( isTable: false, hiddenInMain: true, tableForm: { + enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -113,11 +122,20 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -136,7 +154,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -168,7 +194,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', @@ -192,7 +226,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -792,7 +834,18 @@ export const IssueRequestDetail = useCrudSchemas( value: 'Issue', isMainValue: false } - ] + ], + + verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index d11ab5ea3..17a4a832a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -90,6 +90,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择车间代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -100,7 +101,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, }, @@ -114,6 +123,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -129,7 +139,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive value: 'workshopCode', message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示 isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ @@ -579,7 +597,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive Date: Tue, 16 Jul 2024 15:18:09 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9C=80=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMainDifference/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue index 843f27d4f..7943cd2c9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue @@ -4,7 +4,7 @@ From 63bf3b69c95a36eaed9fbd95e189788d1cc59bc5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 16 Jul 2024 15:34:39 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=9C=80=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMainDifference/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue index 7943cd2c9..4806bd522 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue @@ -4,7 +4,7 @@ From aad0d55193d094b35346c56a486bbf06c15ffb9a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 16 Jul 2024 15:48:42 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/business/inputBlur.ts | 7 +-- src/api/wms/productionlineitem/index.ts | 4 +- .../productionMain/productionMain.data.ts | 60 +++++++++++++++++-- 3 files changed, 59 insertions(+), 12 deletions(-) diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 02da3da92..754ec10f9 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -815,10 +815,9 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form console.log(999, verificationParams) if (verificationParams && verificationParams.length > 0) { for (let i = 0; i < verificationParams.length; i++) { - if (verificationParams[i].key == 'code') { - verificationParams[i].key = 'codes' - } - params.value[verificationParams[i].key] = val + console.log(54565, verificationParams[i].key) + verificationParams[i].key1 = verificationParams[i].key +'s' + params.value[verificationParams[i].key1] = val } } await tableFormSchemaObj.verificationPage(params.value).then(async (res) => { diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts index 0b3b03e20..430a0e9e5 100644 --- a/src/api/wms/productionlineitem/index.ts +++ b/src/api/wms/productionlineitem/index.ts @@ -69,6 +69,6 @@ export const importTemplate = () => { } -export const getProductionLineCodelistByCodes = (data) => { - return request.get({ url: `/wms/productionlineitem/listByCodes?productionLineCode=`+data.productionLineCode +'&itemCodes='+data.itemCodes}) +export const getProductionLineCodelistByCodes = async (params) => { + return await request.get({ url: `/wms/productionlineitem/listByCodes`, params }) } diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 2faf81f81..7a6ee49d1 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -129,6 +138,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, searchListPlaceholder: '请选择生产线', searchField: 'code', @@ -144,7 +154,15 @@ export const ProductionMain = useCrudSchemas(reactive([ value: 'workshop', message: '请填写车间代码！', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -158,6 +176,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -168,7 +187,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -182,6 +209,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -192,7 +220,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -651,7 +687,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + } }, tableForm:{ @@ -672,7 +709,18 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + + verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { From 864e1f032b6a2570572ec142d9af9decae2ad194 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 16 Jul 2024 15:58:49 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customeritem/customeritem.data.ts | 2 +- .../itemManage/itembasic/itembasic.data.ts | 45 ++++++++++--------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index fee2ec949..396528e7b 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -191,7 +191,7 @@ export const Customeritem = useCrudSchemas(reactive([ componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE', - disabled: true + // disabled: true } }, isSearch: true diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index b59f27657..50d706355 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -27,6 +27,26 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isSearch: true, + table: { + width: 120 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, { label: '描述1', field: 'desc1', @@ -50,9 +70,9 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_STATUS, dictClass: 'string', - isForm: true, - isSearch: true, - isTable: true, + isForm: false, + isSearch: false, + isTable: false, table: { width: 100 } , @@ -346,25 +366,6 @@ export const Itembasic = useCrudSchemas(reactive([ } }, }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - table: { - width: 120 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - }, { label: '生效时间', field: 'activeTime', From a977612a324aeac231c723e227c18d62d9686b43 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 16 Jul 2024 16:06:37 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 68db0280c..652c6919b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -980,6 +980,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive Date: Tue, 16 Jul 2024 16:10:24 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableFormCountPlan/src/TableFormCountPlan.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue index 40b628fb8..166a9b241 100644 --- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue +++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue @@ -71,7 +71,7 @@ v-model="row.value" :placeholder="tableFields[1].placeholder || '请输入' + tableFields[1].label" :disabled = "row.disabled || false" - style="flex: 1" + style="flex: 1;width: 0px;" /> From ef896850dcbd0663b1f4e516fcc5a7dfeec4f377 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 16 Jul 2024 16:28:51 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TableFormCountPlan/src/TableFormCountPlan.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue index 166a9b241..24ca1a1ad 100644 --- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue +++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue @@ -66,16 +66,18 @@ row.type == 'LOCATION_CODE' " > - + + + @@ -263,4 +264,12 @@ defineExpose({ } } } +.input-box{ + display: flex; + flex: 1!important; +} +.input-box ::v-deep .el-input{ + flex: 1!important; + width: 0px!important; +} From ea0a6d87211e71a6273098be76208a733389e01d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 16 Jul 2024 16:31:11 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=B4=A7=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 5 ++++- .../supplierinvoiceRequestMainDifference.data.ts | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index dab603fea..d6b173054 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1957,10 +1957,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Tue, 16 Jul 2024 16:33:50 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=B4=A7=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 6 ++++++ .../supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 652c6919b..ce7df9147 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1366,9 +1366,15 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive label: '货币', field: 'currency', sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', table: { width: 150 }, + tableForm:{ + type:'Select', + disabled: true + } }, { label: '合同价格', diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts index 90bc1fa9e..230009a74 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -188,9 +188,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ label: '货币', field: 'currency', sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', table: { width: 150 }, + tableForm:{ + type:'Select', + disabled: true + } }, { label: '创建时间', From 6de553796675644bf69785301c847f7d0e458c81 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 16 Jul 2024 16:52:36 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrapRequestMain/scrapRequestMain.data.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 4865fc301..b26be7afc 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -491,10 +491,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ searchAllSchemas: Balance.allSchemas, searchPage: BalanceApi.getBalanceItemPage, searchCondition: [{ + message: '请填写从仓库代码！', key: 'warehouseCode', value: 'fromWarehouseCode', - message: '请填写从仓库代码！', - isMainValue: true + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:true, // 前置添加必有，和isFormModel结合使用 + action: '==', + isSearch: true, + isMainValue: false },{ key: 'businessType', value: 'Scrap', @@ -507,12 +511,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ action: '==', isSearch: true, isMainValue: false - },{ - key: 'inventoryStatus', - value: 'SCRAP', - action: '==', - isSearch: true, - isMainValue: false }] }, form: {