From 3dba364170f9e02965f70ed297f977eabf2b5fc6 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 20 Jun 2024 08:39:34 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptJobMain.data.ts | 66 +++++++++++++++---- .../unplannedreceiptRequestMain.data.ts | 14 +++- 2 files changed, 65 insertions(+), 15 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index ac0036eef..c61f696fb 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -270,8 +270,8 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isSearch: true, - isTable: true, + isSearch: false, + isTable: false, sort: 'custom', table: { width: 150 @@ -310,6 +310,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ label: '优先级', field: 'priority', sort: 'custom', + isTable:false, + isForm:false, + isTableForm:false, table: { width: 150 }, @@ -321,6 +324,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ label: '优先级增量', field: 'priorityIncrement', sort: 'custom', + isTable:false, + isForm:false, + isTableForm:false, table: { width: 150 }, @@ -357,7 +363,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -376,7 +384,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -395,7 +405,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -414,7 +426,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -433,7 +447,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -452,7 +468,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -471,7 +489,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -490,7 +510,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -509,7 +531,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -528,7 +552,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, + isForm:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -630,6 +656,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ label: '最后更新时间', field: 'updateTime', formatter: dateFormatter, + isTable:false, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -650,6 +677,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ label: '最后更新者', field: 'updater', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -726,6 +754,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ label: '单据号', field: 'number', sort: 'custom', + hiddenInMain:true, table: { width: 180 }, @@ -782,6 +811,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ label: '器具号', field: 'containerNumber', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -861,6 +891,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ label: '成本中心代码', field: 'costcentreCode', sort: 'custom', + isTable:false, + isTableForm:false, + isForm:false, table: { width: 150 }, @@ -869,6 +902,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ label: '科目代码', field: 'qadProjectCode', sort: 'custom', + isTable:false, + isTableForm:false, + isForm:false, table: { width: 150 }, @@ -898,6 +934,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ label: '货主代码', field: 'ownerCode', sort: 'custom', + isTable:false, + isTableForm:false, + isForm:false, table: { width: 150 }, @@ -906,6 +945,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ label: '项目代码', field: 'projectCode', sort: 'custom', + isTable:false, + isTableForm:false, + isForm:false, table: { width: 150 }, diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index b06831bc9..a6d0e49f4 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -387,7 +387,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -408,7 +408,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -429,7 +429,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -481,6 +481,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable:false, sort: 'custom', table: { width: 180 @@ -500,6 +501,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive label: '创建者', field: 'creator', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -512,6 +514,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable:false, sort: 'custom', table: { width: 180 @@ -530,6 +533,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive label: '最后更新者', field: 'updater', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -596,6 +600,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Thu, 20 Jun 2024 08:42:29 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 312 +++++++++--------- 1 file changed, 154 insertions(+), 158 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index bb95948c3..a4c59b5f9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -874,83 +874,26 @@ export const SupplierinvoiceRequestMainRules = reactive({ */ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive([ { - label: '订单号', - field: 'poNumber', - form: { - componentProps: { - disabled: true - } - }, - sortTableDefault:7, - table: { - width: 150 - }, - tableForm:{ - disabled: true - } - }, - { - label: '订单行', - field: 'poLine', + label: '物料代码', + field: 'itemCode', table: { width: 150 }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - multiple:true,//多选 - isSearchList: true, - searchListPlaceholder: '请选择订单行', - searchField: 'poLine', - searchTitle: '待开票列表', - searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas, - searchPage: supplierinvoiceRequestDetailApi.getPoNumberPoLineInfo, - searchCondition: [ - { - key: 'supplierCode', - value: 'supplierCode', - message: '请填供应商信息！', - isMainValue: true - },{ - key: 'orderType', - value: 'orderType', - message: '请填订单类型！', - isMainValue: true - } - ] + disabled: true } }, - tableForm: { - multiple:true,//多选 - isInpuFocusShow: true, - searchListPlaceholder: '请选择订单行', - searchField: 'poLine', - searchTitle: '待开票列表', - searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas, - searchPage: supplierinvoiceRequestDetailApi.getPoNumberPoLineInfo, - searchCondition: [ - { - key: 'supplierCode', - value: 'supplierCode', - message: '请填供应商信息！', - isMainValue: true - }, - { - key: 'orderType', - value: 'orderType', - message: '请填订单类型！', - isMainValue: true - } - ] + tableForm:{ + disabled: true } }, { - label: '待开票单据号', - field: 'recvBillNum', + label: '物料名称', + field: 'itemName', table: { width: 150 }, - sortTableDefault:9, form: { componentProps: { disabled: true @@ -961,40 +904,55 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Thu, 20 Jun 2024 08:45:10 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRecordMain.data.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 2ec188bb6..22cce1484 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -348,6 +348,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( { label: '备注', field: 'remark', + isTable:false, sort: 'custom', table: { width: 150 @@ -357,6 +358,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( label: '创建时间', field: 'createTime', formatter: dateFormatter, + isTable:false, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -377,6 +379,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( label: '创建者', field: 'creator', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -395,7 +398,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -468,6 +471,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive Date: Thu, 20 Jun 2024 09:35:13 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/issueJobMain/index.ts | 2 +- .../wms/issueManage/issue/issueJobMain/index.vue | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts index d47210412..0cd21a3f7 100644 --- a/src/api/wms/issueJobMain/index.ts +++ b/src/api/wms/issueJobMain/index.ts @@ -99,7 +99,7 @@ export const abandonIssueMain = async (id) => { // 关闭发料任务 export const closeIssueMain = async (id) => { - return await request.get({ url: `/wms/issue-job-main/close?id=` + id }) + return await request.put({ url: `/wms/issue-job-main/close?id=` + id }) } // 执行发料任务 diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index 4bc931a4a..16d31db17 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -268,13 +268,17 @@ const buttonTableClick = async (val, row) => { }] }] } - IssueJobMainApi.executeIssueMain(aaa) + await IssueJobMainApi.executeIssueMain(aaa) + getList() } else if (val == 'mainJobAba') { // 放弃 - IssueJobMainApi.abandonIssueMain(row.masterId) + await IssueJobMainApi.abandonIssueMain(row.masterId) + getList() } else if (val == 'mainJobClo') { // 关闭 - IssueJobMainApi.closeIssueMain(row.masterId) + await IssueJobMainApi.closeIssueMain(row.masterId) + getList() } else if (val == 'mainJobAcc') { // 承接 - IssueJobMainApi.acceptIssueMain(row.masterId) + await IssueJobMainApi.acceptIssueMain(row.masterId) + getList() } } // 获取部门 用于详情 部门回显 From 5f6019a96d1c985eb6b16a6656114b1fa51c3ab1 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 20 Jun 2024 09:53:30 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRecordMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 22cce1484..d923bcaa8 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -298,6 +298,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( label: '领用描述', field: 'usageDescription', sort: 'custom', + isTable:false, + isForm:false, + isTableForm:false, table: { width: 150 }, From 2f3b18bf64fb1cb590f59ad4ac66fc1155a1aa3c Mon Sep 17 00:00:00 2001 From: bjang03 Date: Thu, 20 Jun 2024 10:06:07 +0800 Subject: [PATCH 06/17] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?= =?UTF-8?q?=E9=95=BF=E6=98=A5=E6=B5=B7=E6=8B=89=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8=E8=B4=A2?= =?UTF-8?q?=E5=8A=A1=E5=AE=A1=E6=89=B9=E9=A9=B3=E5=9B=9E=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 2f6d9fd3a..e0ebcba1a 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -993,7 +993,7 @@ const importSuccess = () => { roleList.value = [] } if(roleList.value.indexOf('supplier_operator')>-1){ - detailButtonIsShowAddStatusArray.value = ['1','6','7'] + detailButtonIsShowAddStatusArray.value = ['1','6'] }else{ detailButtonIsShowAddStatusArray.value = [] } From 297159c803c9c7b948d06c093bcc8933e9a8b32d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 20 Jun 2024 10:11:06 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 4 ---- .../supplierinvoiceRequestMain.data.ts | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 306e6f951..c1881761b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -273,10 +273,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '采购审批人', field: 'procurementCreatorName', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, sort: 'custom', table: { width: 180 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index a4c59b5f9..0f01db701 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -422,10 +422,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( { label: '采购审批人', field: 'procurementCreatorName', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, sort: 'custom', table: { width: 180 From f42aa3130c98e5cf5bce357d193f3e705984ed11 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 20 Jun 2024 11:12:55 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionTemplate/addForm.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/qms/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue index d19caa8db..2affd912a 100644 --- a/src/views/qms/inspectionTemplate/addForm.vue +++ b/src/views/qms/inspectionTemplate/addForm.vue @@ -839,14 +839,16 @@ const submitForm = async () => { // 检验上限值应大目标值大于下限值 const arr2 = data.value.process.filter( (item) => - // 上限值存在并且下限值存在时，上限值应大于下限值 - (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && (item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyLowlimit))|| - // 上限值存在并且目标值存在时，上限值应大于目标值 - (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyTarget))|| - // 下限值存在并且目标值存在时，下限值应小于目标值 - ( item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (item.inspectionCharacteristicsBaseVO.quantifyLowlimit >= item.inspectionCharacteristicsBaseVO.quantifyTarget))|| + { + // 上限值存在并且下限值存在时,目标值不存在，上限值应大于下限值 + return (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && !item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit)))|| + // 上限值存在并且目标值存在时，下限值不存在，上限值应大于目标值 + (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))|| + // 下限值存在并且目标值存在时，上限值不存在，下限值应小于目标值 + ( item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget&&!item.inspectionCharacteristicsBaseVO.quantifyIsCapping && (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >= parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))|| // 上限值，下限值，目标值都存在时，上限值应大于目标值大于下限值 - (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyLowlimit)||(item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyTarget)||(item.inspectionCharacteristicsBaseVO.quantifyLowlimit >= item.inspectionCharacteristicsBaseVO.quantifyTarget))) + (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) )||(parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget))||(parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >= parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))) + } ) console.log(99,arr2) if (arr2 && arr2.length > 0) { From c2c8cf8a951f98d048c20eb2b627435486e2f8c0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 20 Jun 2024 13:30:02 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/equipmentRepairRecordMain/index.vue | 4 +- src/views/eam/repairExperience/index.vue | 26 ++++++++--- .../repairExperience/repairExperience.data.ts | 44 ++++++++++--------- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue index a6b7eab22..d9b2fe9bc 100644 --- a/src/views/eam/equipmentRepairRecordMain/index.vue +++ b/src/views/eam/equipmentRepairRecordMain/index.vue @@ -242,7 +242,9 @@ const repairExperienceFormsSuccess = async (formType, data) => { const data1 = { repairNumber: data.number, name: data.name, - content: data.content + content: data.content, + masterId: data.id, + ooderType: 'REPAIR', } console.log(data1) try { diff --git a/src/views/eam/repairExperience/index.vue b/src/views/eam/repairExperience/index.vue index b6e1882b9..b393435de 100644 --- a/src/views/eam/repairExperience/index.vue +++ b/src/views/eam/repairExperience/index.vue @@ -27,9 +27,9 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > -