diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 9358b43cb..4132cc3db 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -270,6 +270,18 @@ export const InspectionJobMain = useCrudSchemas( width: 150 } }, + { + label: '承接人', + field: 'completeUser', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: false, + isDetail: false, + isSearch: true, + isTableForm: false, + isForm: false, + }, // { // label: '检验批来源', // field: 'inspectionBatchSource', @@ -439,6 +451,71 @@ export const InspectionJobMain = useCrudSchemas( // } // } // }, + { + label: '承接人', + field: 'acceptUserName', + table: { + width: 130 + }, + isForm: false, + isTable: false, + isDetail: true + }, + { + label: '承接时间', + field: 'acceptTime', + isForm: false, + table: { + width: 180 + }, + isTable: false, + isDetail: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + + { + label: '完成人', + field: 'completeUserName', + table: { + width: 130 + }, + isForm: false, + isTable: true, + isDetail:true + }, + { + label: '完成时间', + field: 'completeTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 796782b5c..17fe92209 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1473,7 +1473,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive { +const priceFormart = (row, column, cellValue) => { cellValue= Number(cellValue).toFixed(2) cellValue = cellValue + '' || '' @@ -1487,6 +1487,20 @@ const singlePriceFormart = (row, column, cellValue) => { return x1+x2 } +const singlePriceFormart = (row, column, cellValue) => { + cellValue= Number(cellValue).toFixed(4) + cellValue = cellValue + '' || '' + + let x = cellValue.split('.') + let x1 = x[0] + let x2 = x.length > 1 ? '.' + x[1] : '' + const reg = /(\d+)(\d{3})/ + while(reg.test(x1)){ + x1 = x1.replace(reg, '$1,$2') + } + return x1+x2 +} + function validateTaxRate(rule, value, callback) { if (value>0) { callback() @@ -1695,13 +1709,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive