diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index 8cb05c0..61ca5e5 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -48,11 +48,11 @@ { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, + { text: '委托书编号', value: 'orderCode', align: 'center' }, { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' }, { text: '委托方名称', value: 'customerName', align: 'center' }, { text: '送检人', value: 'deliverer', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' }, { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' }, ]) @@ -61,12 +61,12 @@ { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, + { text: '委托书编号', value: 'orderCode', align: 'center' }, { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' }, { text: '委托方名称', value: 'customerName', align: 'center' }, { text: '实际送达时间', value: 'realDeliverTime', align: 'center' }, { text: '要求检完时间', value: 'requireOverTime', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' }, { text: '当前检定环节', value: 'currentSegment', align: 'center' }, { text: '证书出具', value: 'Certifications', align: 'center' }, @@ -156,6 +156,7 @@ ...item, Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`), sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品', + isUrgentName: item.isUrgent == 1 ? '是' : '否', } }) total.value = parseInt(response.data.total) diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index 8cb05c0..61ca5e5 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -48,11 +48,11 @@ { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, + { text: '委托书编号', value: 'orderCode', align: 'center' }, { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' }, { text: '委托方名称', value: 'customerName', align: 'center' }, { text: '送检人', value: 'deliverer', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' }, { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' }, ]) @@ -61,12 +61,12 @@ { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, + { text: '委托书编号', value: 'orderCode', align: 'center' }, { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' }, { text: '委托方名称', value: 'customerName', align: 'center' }, { text: '实际送达时间', value: 'realDeliverTime', align: 'center' }, { text: '要求检完时间', value: 'requireOverTime', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' }, { text: '当前检定环节', value: 'currentSegment', align: 'center' }, { text: '证书出具', value: 'Certifications', align: 'center' }, @@ -156,6 +156,7 @@ ...item, Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`), sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品', + isUrgentName: item.isUrgent == 1 ? '是' : '否', } }) total.value = parseInt(response.data.total) diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts index e5140a4..f1a3f91 100644 --- a/src/views/business/schedule/interchange/interchange_interface.ts +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -24,7 +24,7 @@ customerId: string // 委托方代码 customerName: string // 委托方名称 deliverer: string // 送检人 - isUrgent: string // 是否加急 + isUrgent: number | string // 是否加急 sampleBelong: string // 样品属性 planDeliverTime: string // 预计送达时间 deliverTime: string // 实际送达时间 diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index 8cb05c0..61ca5e5 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -48,11 +48,11 @@ { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, + { text: '委托书编号', value: 'orderCode', align: 'center' }, { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' }, { text: '委托方名称', value: 'customerName', align: 'center' }, { text: '送检人', value: 'deliverer', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' }, { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' }, ]) @@ -61,12 +61,12 @@ { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'manufacturingNo', align: 'center' }, - { text: '委托书编号', value: 'orderNo', align: 'center' }, + { text: '委托书编号', value: 'orderCode', align: 'center' }, { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' }, { text: '委托方名称', value: 'customerName', align: 'center' }, { text: '实际送达时间', value: 'realDeliverTime', align: 'center' }, { text: '要求检完时间', value: 'requireOverTime', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } }, { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' }, { text: '当前检定环节', value: 'currentSegment', align: 'center' }, { text: '证书出具', value: 'Certifications', align: 'center' }, @@ -156,6 +156,7 @@ ...item, Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`), sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品', + isUrgentName: item.isUrgent == 1 ? '是' : '否', } }) total.value = parseInt(response.data.total) diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts index e5140a4..f1a3f91 100644 --- a/src/views/business/schedule/interchange/interchange_interface.ts +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -24,7 +24,7 @@ customerId: string // 委托方代码 customerName: string // 委托方名称 deliverer: string // 送检人 - isUrgent: string // 是否加急 + isUrgent: number | string // 是否加急 sampleBelong: string // 样品属性 planDeliverTime: string // 预计送达时间 deliverTime: string // 实际送达时间 diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue index d340091..e674b32 100644 --- a/src/views/business/schedule/order/orderList.vue +++ b/src/views/business/schedule/order/orderList.vue @@ -40,7 +40,7 @@ { text: '送样人', value: 'deliverer', align: 'center' }, { text: '联系方式', value: 'customerPhone', align: 'center' }, { text: '样品数量', value: 'sampleCount', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } }, { text: '接收状态', value: 'statusName', align: 'center', width: '100px' }, { text: '创建时间', value: 'createTime', align: 'center', width: '180px' }, { text: '备注', value: 'remark', align: 'center' }, @@ -101,7 +101,13 @@ listQuery.value.offset = 1 } getOrderList(listQuery.value).then((response) => { - list.value = response.data.rows + list.value = response.data.rows.map((item: IOrderList) => { + return { + ...item, + isUrgentName: item.isUrgent == 1 ? '是' : '否', + } + }) + total.value = parseInt(response.data.total) loadingTable.value = false })