diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index d8b4a66..226089a 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index d8b4a66..226089a 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index 023f97d..d3045e1 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index d8b4a66..226089a 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index 023f97d..d3045e1 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
diff --git a/src/views/equipement/source/cert/cert-interface.ts b/src/views/equipement/source/cert/cert-interface.ts
index 0d35d04..3e1dc63 100644
--- a/src/views/equipement/source/cert/cert-interface.ts
+++ b/src/views/equipement/source/cert/cert-interface.ts
@@ -1,11 +1,17 @@
export interface IListQuery {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
- equipmentName: string // 设备名称
- equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
- validDateEnd: string // 检定有效期结束
- validDateStart: string // 检定有效期开始
+ certificateName: string // 证书名称
+ certificateNo: string // 证书编号
+ equipmentName: string // 设备名称
+ equipmentNo: string // 设备编号
+ manufactureNo: string // 出厂编号
+ manufacturer: string // 生产厂家
+ meterIdentify: string // 计量标识(字典code)
+ model: string // 规格型号
+ traceCompany: string // 溯源单位名
+ traceDateEnd: string // 测试、校准或检定日期结束
+ traceDateStart: string // 测试、校准或检定日期开始
+ validDateEnd: string // 检定有效期结束
+ validDateStart: string // 检定有效期开始
limit: number
offset: number
}
@@ -22,16 +28,24 @@
}
export interface IForm {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
+ certificateName?: string // 证书名称
+ certificateNo?: string // 证书编号
equipmentId: string // 设备id
equipmentName: string // 设备名称
equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
+ model: string // 规格型号
+ manufacturer: string // 生产厂家
+ manufactureNo: string // 出厂编号
+ labCodeName: string // 实验室
+ labCode: string // 实验室
+ groupCode: string // 部门
+ groupCodeName: string // 部门名称
+ directorId: string // 负责人id
+ directorName: string // 负责人
+ validDate: string // 检定有效期
traceDate: string // 检定日期
- validDate: string // 证书有效期
- meterIdentify: string // 计量标识(字典code)
- meterIdentifyName: string // 计量标识(字典value)
+ certificateValid: string // 证书有效期
+ meterIdentify: string // 计量标识(字典code)
+ meterIdentifyName: string // 计量标识(字典value)
remark: string // 备注
- certificateFile: string // 证书报告附件
}
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index d8b4a66..226089a 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index 023f97d..d3045e1 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
diff --git a/src/views/equipement/source/cert/cert-interface.ts b/src/views/equipement/source/cert/cert-interface.ts
index 0d35d04..3e1dc63 100644
--- a/src/views/equipement/source/cert/cert-interface.ts
+++ b/src/views/equipement/source/cert/cert-interface.ts
@@ -1,11 +1,17 @@
export interface IListQuery {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
- equipmentName: string // 设备名称
- equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
- validDateEnd: string // 检定有效期结束
- validDateStart: string // 检定有效期开始
+ certificateName: string // 证书名称
+ certificateNo: string // 证书编号
+ equipmentName: string // 设备名称
+ equipmentNo: string // 设备编号
+ manufactureNo: string // 出厂编号
+ manufacturer: string // 生产厂家
+ meterIdentify: string // 计量标识(字典code)
+ model: string // 规格型号
+ traceCompany: string // 溯源单位名
+ traceDateEnd: string // 测试、校准或检定日期结束
+ traceDateStart: string // 测试、校准或检定日期开始
+ validDateEnd: string // 检定有效期结束
+ validDateStart: string // 检定有效期开始
limit: number
offset: number
}
@@ -22,16 +28,24 @@
}
export interface IForm {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
+ certificateName?: string // 证书名称
+ certificateNo?: string // 证书编号
equipmentId: string // 设备id
equipmentName: string // 设备名称
equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
+ model: string // 规格型号
+ manufacturer: string // 生产厂家
+ manufactureNo: string // 出厂编号
+ labCodeName: string // 实验室
+ labCode: string // 实验室
+ groupCode: string // 部门
+ groupCodeName: string // 部门名称
+ directorId: string // 负责人id
+ directorName: string // 负责人
+ validDate: string // 检定有效期
traceDate: string // 检定日期
- validDate: string // 证书有效期
- meterIdentify: string // 计量标识(字典code)
- meterIdentifyName: string // 计量标识(字典value)
+ certificateValid: string // 证书有效期
+ meterIdentify: string // 计量标识(字典code)
+ meterIdentifyName: string // 计量标识(字典value)
remark: string // 备注
- certificateFile: string // 证书报告附件
}
diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue
index f0aea4e..84d679e 100644
--- a/src/views/equipement/source/cert/detail.vue
+++ b/src/views/equipement/source/cert/detail.vue
@@ -34,7 +34,7 @@
equipmentId: '', // 设备id
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
manufactureNo: '', // 出厂编号
labCodeName: '', // 实验室
@@ -43,24 +43,22 @@
groupCodeName: '', // 部门名称
directorId: '', // 负责人id
directorName: '', // 负责人
- measureValidDate: '', // 检定有效期
+ validDate: '', // 检定有效期
traceDate: '', // 检定日期
- validDate: '', // 证书有效期
- // traceCompany: '', // 溯源单位名
- meterIdentify: '', // 计量标识(字典code)
+ certificateValid: '', // 证书有效期
+ meterIdentify: '1', // 计量标识(字典code)
meterIdentifyName: '', // 计量标识(字典value)
remark: '', // 备注
- // certificateFile: '', // 证书报告附件
})
// 校验规则
const formRules = ref({
- certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
- certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+ // certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+ // certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['blur', 'change'] }],
- validDate: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
+ certificateValid: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
meterIdentify: [{ required: true, message: '计量标识不能为空', trigger: ['blur', 'change'] }],
})
@@ -72,7 +70,7 @@
// 获取字典值
async function getDict() {
// 计量标识
- getDictByCode('bizMeterIdentify').then((response) => {
+ getDictByCode('equipmentSourceMeterIdentify').then((response) => {
meterIdentifyDict.value = response.data
})
// 实验室
@@ -108,7 +106,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentName = res.data.equipmentInfoApproval.equipmentName // 设备名称
form.value.equipmentNo = res.data.equipmentInfoApproval.equipmentNo // 统一编号
- form.value.model = res.data.equipmentInfoApproval.model // 型号规格
+ form.value.model = res.data.equipmentInfoApproval.model // 规格型号
form.value.manufacturer = res.data.equipmentInfoApproval.manufacturer // 生产厂家
form.value.manufactureNo = res.data.equipmentInfoApproval.manufactureNo // 出厂编号
form.value.labCodeName = res.data.equipmentInfoApproval.labCodeName // 实验室
@@ -117,7 +115,7 @@
form.value.groupCodeName = res.data.equipmentInfoApproval.groupCodeName // 部门名称
form.value.directorId = res.data.equipmentInfoApproval.directorId // 负责人id
form.value.directorName = res.data.equipmentInfoApproval.directorName // 负责人
- form.value.measureValidDate = res.data.equipmentInfoApproval.measureValidDate // 检定有效期
+ form.value.validDate = res.data.equipmentInfoApproval.validDate // 检定有效期
})
}
}
@@ -130,13 +128,13 @@
certificateType: '', // 证书类型
certificateNo: '', // 证书编号
traceCompany: '', // 溯源单位
- jdzs: '', // 检定证书
+ certificateFile: '', // 检定证书
}
const columns = [ // 表头
{ text: '证书类型', value: 'certificateType', required: true },
{ text: '证书编号', value: 'certificateNo', required: true },
{ text: '溯源单位', value: 'traceCompany', required: true },
- { text: '检定证书', value: 'jdzs', required: true },
+ { text: '检定证书', value: 'certificateFile', required: true },
]
/**
@@ -160,18 +158,6 @@
const handleSelectionChange = (e: any) => {
checkoutList.value = e
}
-// --------------------------------------------选择溯源机构---------------------------------------
-const selectSourceDialogRef = ref() // 选择溯源机构组件ref
-// 点击选择溯源机构
-const selectsupplier = () => {
- selectSourceDialogRef.value.initDialog()
-}
-
-// 确定选择溯源机构
-const confirmSelectedSource = (val: any) => {
- form.value.traceCompany = val[0].supplierName // 溯源机构名称
-}
-
// -------------------------------------------文件上传--------------------------------------
const fileRef = ref() // 文件上传input
const uploadIndex = ref(0) // 要上传文件到第几行
@@ -190,7 +176,7 @@
})
UploadFile(fd).then((res) => {
if (res.code === 200) {
- list.value[uploadIndex.value].jdzs = res.data[0]
+ list.value[uploadIndex.value].certificateFile = res.data[0]
// 重置当前验证
ElMessage.success('文件上传成功')
loading.close()
@@ -214,15 +200,30 @@
// 保存
const save = () => {
+ if (!list.value.length) {
+ ElMessage.warning('表格不能为空')
+ return false
+ }
+ if (!useCheckList(list.value, columns, '表格')) { return false }
ruleFormRef.value!.validate((valid: boolean) => {
if (valid) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
+ const params = {
+ ...form.value,
+ id: infoId.value,
+ certificateDetailList: list.value.map((item: Object) => {
+ return {
+ ...item,
+ certificateId: infoId.value, // 证书主表id
+ }
+ }),
+ }
// 新建
if (pageType.value === 'add') { // 新建
- addSourceCertList(form.value).then((res) => {
+ addSourceCertList(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -232,7 +233,7 @@
}
// 保存
else if (pageType.value === 'edit') { // 编辑
- updateSourceCert({ ...form.value, id: infoId.value }).then((res) => {
+ updateSourceCert(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -251,26 +252,15 @@
getDict().then(() => {
if (pageType.value !== 'add') {
form.value = $route.query as any
- form.value.certificateName = $route.query.certificateName as string // 证书名称
- form.value.certificateNo = $route.query.certificateNo as string // 证书编号
- form.value.equipmentId = $route.query.equipmentId as string // 设备id
- form.value.equipmentName = $route.query.equipmentName as string // 设备名称
- form.value.equipmentNo = $route.query.equipmentNo as string // 设备编号
- form.value.traceCompany = $route.query.traceCompany as string // 溯源单位名
- form.value.traceDate = $route.query.traceDate as string // 检定日期
- form.value.validDate = $route.query.validDate as string // 证书有效期
- form.value.meterIdentify = $route.query.meterIdentify as string // 计量标识(字典code)
- form.value.meterIdentifyName = $route.query.meterIdentifyName as string// 计量标识(字典value)
- form.value.remark = $route.query.remark as string // 备注
- form.value.certificateFile = $route.query.certificateFile as string // 证书报告附件
- infoId.value = $route.query.id as string// id
+ infoId.value = $route.query.id as string // id
+ list.value = JSON.parse($route.query.certificateDetailList as any)
}
})
})
-
+
@@ -377,9 +367,9 @@
-
+
-
+
-
-
@@ -503,30 +462,30 @@
*{{ item.text }}
-
-
+
+
测试
-
+
校准
-
+
检定
-
+
- {{ scope.row.jdzs === '' ? '上传' : '更换附件' }}
+ {{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
+ {{ scope.row[item.value] }}
@@ -539,9 +498,9 @@
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index d8b4a66..226089a 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index 023f97d..d3045e1 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
diff --git a/src/views/equipement/source/cert/cert-interface.ts b/src/views/equipement/source/cert/cert-interface.ts
index 0d35d04..3e1dc63 100644
--- a/src/views/equipement/source/cert/cert-interface.ts
+++ b/src/views/equipement/source/cert/cert-interface.ts
@@ -1,11 +1,17 @@
export interface IListQuery {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
- equipmentName: string // 设备名称
- equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
- validDateEnd: string // 检定有效期结束
- validDateStart: string // 检定有效期开始
+ certificateName: string // 证书名称
+ certificateNo: string // 证书编号
+ equipmentName: string // 设备名称
+ equipmentNo: string // 设备编号
+ manufactureNo: string // 出厂编号
+ manufacturer: string // 生产厂家
+ meterIdentify: string // 计量标识(字典code)
+ model: string // 规格型号
+ traceCompany: string // 溯源单位名
+ traceDateEnd: string // 测试、校准或检定日期结束
+ traceDateStart: string // 测试、校准或检定日期开始
+ validDateEnd: string // 检定有效期结束
+ validDateStart: string // 检定有效期开始
limit: number
offset: number
}
@@ -22,16 +28,24 @@
}
export interface IForm {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
+ certificateName?: string // 证书名称
+ certificateNo?: string // 证书编号
equipmentId: string // 设备id
equipmentName: string // 设备名称
equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
+ model: string // 规格型号
+ manufacturer: string // 生产厂家
+ manufactureNo: string // 出厂编号
+ labCodeName: string // 实验室
+ labCode: string // 实验室
+ groupCode: string // 部门
+ groupCodeName: string // 部门名称
+ directorId: string // 负责人id
+ directorName: string // 负责人
+ validDate: string // 检定有效期
traceDate: string // 检定日期
- validDate: string // 证书有效期
- meterIdentify: string // 计量标识(字典code)
- meterIdentifyName: string // 计量标识(字典value)
+ certificateValid: string // 证书有效期
+ meterIdentify: string // 计量标识(字典code)
+ meterIdentifyName: string // 计量标识(字典value)
remark: string // 备注
- certificateFile: string // 证书报告附件
}
diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue
index f0aea4e..84d679e 100644
--- a/src/views/equipement/source/cert/detail.vue
+++ b/src/views/equipement/source/cert/detail.vue
@@ -34,7 +34,7 @@
equipmentId: '', // 设备id
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
manufactureNo: '', // 出厂编号
labCodeName: '', // 实验室
@@ -43,24 +43,22 @@
groupCodeName: '', // 部门名称
directorId: '', // 负责人id
directorName: '', // 负责人
- measureValidDate: '', // 检定有效期
+ validDate: '', // 检定有效期
traceDate: '', // 检定日期
- validDate: '', // 证书有效期
- // traceCompany: '', // 溯源单位名
- meterIdentify: '', // 计量标识(字典code)
+ certificateValid: '', // 证书有效期
+ meterIdentify: '1', // 计量标识(字典code)
meterIdentifyName: '', // 计量标识(字典value)
remark: '', // 备注
- // certificateFile: '', // 证书报告附件
})
// 校验规则
const formRules = ref({
- certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
- certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+ // certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+ // certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['blur', 'change'] }],
- validDate: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
+ certificateValid: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
meterIdentify: [{ required: true, message: '计量标识不能为空', trigger: ['blur', 'change'] }],
})
@@ -72,7 +70,7 @@
// 获取字典值
async function getDict() {
// 计量标识
- getDictByCode('bizMeterIdentify').then((response) => {
+ getDictByCode('equipmentSourceMeterIdentify').then((response) => {
meterIdentifyDict.value = response.data
})
// 实验室
@@ -108,7 +106,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentName = res.data.equipmentInfoApproval.equipmentName // 设备名称
form.value.equipmentNo = res.data.equipmentInfoApproval.equipmentNo // 统一编号
- form.value.model = res.data.equipmentInfoApproval.model // 型号规格
+ form.value.model = res.data.equipmentInfoApproval.model // 规格型号
form.value.manufacturer = res.data.equipmentInfoApproval.manufacturer // 生产厂家
form.value.manufactureNo = res.data.equipmentInfoApproval.manufactureNo // 出厂编号
form.value.labCodeName = res.data.equipmentInfoApproval.labCodeName // 实验室
@@ -117,7 +115,7 @@
form.value.groupCodeName = res.data.equipmentInfoApproval.groupCodeName // 部门名称
form.value.directorId = res.data.equipmentInfoApproval.directorId // 负责人id
form.value.directorName = res.data.equipmentInfoApproval.directorName // 负责人
- form.value.measureValidDate = res.data.equipmentInfoApproval.measureValidDate // 检定有效期
+ form.value.validDate = res.data.equipmentInfoApproval.validDate // 检定有效期
})
}
}
@@ -130,13 +128,13 @@
certificateType: '', // 证书类型
certificateNo: '', // 证书编号
traceCompany: '', // 溯源单位
- jdzs: '', // 检定证书
+ certificateFile: '', // 检定证书
}
const columns = [ // 表头
{ text: '证书类型', value: 'certificateType', required: true },
{ text: '证书编号', value: 'certificateNo', required: true },
{ text: '溯源单位', value: 'traceCompany', required: true },
- { text: '检定证书', value: 'jdzs', required: true },
+ { text: '检定证书', value: 'certificateFile', required: true },
]
/**
@@ -160,18 +158,6 @@
const handleSelectionChange = (e: any) => {
checkoutList.value = e
}
-// --------------------------------------------选择溯源机构---------------------------------------
-const selectSourceDialogRef = ref() // 选择溯源机构组件ref
-// 点击选择溯源机构
-const selectsupplier = () => {
- selectSourceDialogRef.value.initDialog()
-}
-
-// 确定选择溯源机构
-const confirmSelectedSource = (val: any) => {
- form.value.traceCompany = val[0].supplierName // 溯源机构名称
-}
-
// -------------------------------------------文件上传--------------------------------------
const fileRef = ref() // 文件上传input
const uploadIndex = ref(0) // 要上传文件到第几行
@@ -190,7 +176,7 @@
})
UploadFile(fd).then((res) => {
if (res.code === 200) {
- list.value[uploadIndex.value].jdzs = res.data[0]
+ list.value[uploadIndex.value].certificateFile = res.data[0]
// 重置当前验证
ElMessage.success('文件上传成功')
loading.close()
@@ -214,15 +200,30 @@
// 保存
const save = () => {
+ if (!list.value.length) {
+ ElMessage.warning('表格不能为空')
+ return false
+ }
+ if (!useCheckList(list.value, columns, '表格')) { return false }
ruleFormRef.value!.validate((valid: boolean) => {
if (valid) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
+ const params = {
+ ...form.value,
+ id: infoId.value,
+ certificateDetailList: list.value.map((item: Object) => {
+ return {
+ ...item,
+ certificateId: infoId.value, // 证书主表id
+ }
+ }),
+ }
// 新建
if (pageType.value === 'add') { // 新建
- addSourceCertList(form.value).then((res) => {
+ addSourceCertList(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -232,7 +233,7 @@
}
// 保存
else if (pageType.value === 'edit') { // 编辑
- updateSourceCert({ ...form.value, id: infoId.value }).then((res) => {
+ updateSourceCert(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -251,26 +252,15 @@
getDict().then(() => {
if (pageType.value !== 'add') {
form.value = $route.query as any
- form.value.certificateName = $route.query.certificateName as string // 证书名称
- form.value.certificateNo = $route.query.certificateNo as string // 证书编号
- form.value.equipmentId = $route.query.equipmentId as string // 设备id
- form.value.equipmentName = $route.query.equipmentName as string // 设备名称
- form.value.equipmentNo = $route.query.equipmentNo as string // 设备编号
- form.value.traceCompany = $route.query.traceCompany as string // 溯源单位名
- form.value.traceDate = $route.query.traceDate as string // 检定日期
- form.value.validDate = $route.query.validDate as string // 证书有效期
- form.value.meterIdentify = $route.query.meterIdentify as string // 计量标识(字典code)
- form.value.meterIdentifyName = $route.query.meterIdentifyName as string// 计量标识(字典value)
- form.value.remark = $route.query.remark as string // 备注
- form.value.certificateFile = $route.query.certificateFile as string // 证书报告附件
- infoId.value = $route.query.id as string// id
+ infoId.value = $route.query.id as string // id
+ list.value = JSON.parse($route.query.certificateDetailList as any)
}
})
})
-
+
@@ -377,9 +367,9 @@
-
+
-
+
-
-
@@ -503,30 +462,30 @@
*{{ item.text }}
-
-
+
+
测试
-
+
校准
-
+
检定
-
+
- {{ scope.row.jdzs === '' ? '上传' : '更换附件' }}
+ {{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
+ {{ scope.row[item.value] }}
@@ -539,9 +498,9 @@
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index d8b4a66..226089a 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index 023f97d..d3045e1 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
diff --git a/src/views/equipement/source/cert/cert-interface.ts b/src/views/equipement/source/cert/cert-interface.ts
index 0d35d04..3e1dc63 100644
--- a/src/views/equipement/source/cert/cert-interface.ts
+++ b/src/views/equipement/source/cert/cert-interface.ts
@@ -1,11 +1,17 @@
export interface IListQuery {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
- equipmentName: string // 设备名称
- equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
- validDateEnd: string // 检定有效期结束
- validDateStart: string // 检定有效期开始
+ certificateName: string // 证书名称
+ certificateNo: string // 证书编号
+ equipmentName: string // 设备名称
+ equipmentNo: string // 设备编号
+ manufactureNo: string // 出厂编号
+ manufacturer: string // 生产厂家
+ meterIdentify: string // 计量标识(字典code)
+ model: string // 规格型号
+ traceCompany: string // 溯源单位名
+ traceDateEnd: string // 测试、校准或检定日期结束
+ traceDateStart: string // 测试、校准或检定日期开始
+ validDateEnd: string // 检定有效期结束
+ validDateStart: string // 检定有效期开始
limit: number
offset: number
}
@@ -22,16 +28,24 @@
}
export interface IForm {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
+ certificateName?: string // 证书名称
+ certificateNo?: string // 证书编号
equipmentId: string // 设备id
equipmentName: string // 设备名称
equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
+ model: string // 规格型号
+ manufacturer: string // 生产厂家
+ manufactureNo: string // 出厂编号
+ labCodeName: string // 实验室
+ labCode: string // 实验室
+ groupCode: string // 部门
+ groupCodeName: string // 部门名称
+ directorId: string // 负责人id
+ directorName: string // 负责人
+ validDate: string // 检定有效期
traceDate: string // 检定日期
- validDate: string // 证书有效期
- meterIdentify: string // 计量标识(字典code)
- meterIdentifyName: string // 计量标识(字典value)
+ certificateValid: string // 证书有效期
+ meterIdentify: string // 计量标识(字典code)
+ meterIdentifyName: string // 计量标识(字典value)
remark: string // 备注
- certificateFile: string // 证书报告附件
}
diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue
index f0aea4e..84d679e 100644
--- a/src/views/equipement/source/cert/detail.vue
+++ b/src/views/equipement/source/cert/detail.vue
@@ -34,7 +34,7 @@
equipmentId: '', // 设备id
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
manufactureNo: '', // 出厂编号
labCodeName: '', // 实验室
@@ -43,24 +43,22 @@
groupCodeName: '', // 部门名称
directorId: '', // 负责人id
directorName: '', // 负责人
- measureValidDate: '', // 检定有效期
+ validDate: '', // 检定有效期
traceDate: '', // 检定日期
- validDate: '', // 证书有效期
- // traceCompany: '', // 溯源单位名
- meterIdentify: '', // 计量标识(字典code)
+ certificateValid: '', // 证书有效期
+ meterIdentify: '1', // 计量标识(字典code)
meterIdentifyName: '', // 计量标识(字典value)
remark: '', // 备注
- // certificateFile: '', // 证书报告附件
})
// 校验规则
const formRules = ref({
- certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
- certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+ // certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+ // certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['blur', 'change'] }],
- validDate: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
+ certificateValid: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
meterIdentify: [{ required: true, message: '计量标识不能为空', trigger: ['blur', 'change'] }],
})
@@ -72,7 +70,7 @@
// 获取字典值
async function getDict() {
// 计量标识
- getDictByCode('bizMeterIdentify').then((response) => {
+ getDictByCode('equipmentSourceMeterIdentify').then((response) => {
meterIdentifyDict.value = response.data
})
// 实验室
@@ -108,7 +106,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentName = res.data.equipmentInfoApproval.equipmentName // 设备名称
form.value.equipmentNo = res.data.equipmentInfoApproval.equipmentNo // 统一编号
- form.value.model = res.data.equipmentInfoApproval.model // 型号规格
+ form.value.model = res.data.equipmentInfoApproval.model // 规格型号
form.value.manufacturer = res.data.equipmentInfoApproval.manufacturer // 生产厂家
form.value.manufactureNo = res.data.equipmentInfoApproval.manufactureNo // 出厂编号
form.value.labCodeName = res.data.equipmentInfoApproval.labCodeName // 实验室
@@ -117,7 +115,7 @@
form.value.groupCodeName = res.data.equipmentInfoApproval.groupCodeName // 部门名称
form.value.directorId = res.data.equipmentInfoApproval.directorId // 负责人id
form.value.directorName = res.data.equipmentInfoApproval.directorName // 负责人
- form.value.measureValidDate = res.data.equipmentInfoApproval.measureValidDate // 检定有效期
+ form.value.validDate = res.data.equipmentInfoApproval.validDate // 检定有效期
})
}
}
@@ -130,13 +128,13 @@
certificateType: '', // 证书类型
certificateNo: '', // 证书编号
traceCompany: '', // 溯源单位
- jdzs: '', // 检定证书
+ certificateFile: '', // 检定证书
}
const columns = [ // 表头
{ text: '证书类型', value: 'certificateType', required: true },
{ text: '证书编号', value: 'certificateNo', required: true },
{ text: '溯源单位', value: 'traceCompany', required: true },
- { text: '检定证书', value: 'jdzs', required: true },
+ { text: '检定证书', value: 'certificateFile', required: true },
]
/**
@@ -160,18 +158,6 @@
const handleSelectionChange = (e: any) => {
checkoutList.value = e
}
-// --------------------------------------------选择溯源机构---------------------------------------
-const selectSourceDialogRef = ref() // 选择溯源机构组件ref
-// 点击选择溯源机构
-const selectsupplier = () => {
- selectSourceDialogRef.value.initDialog()
-}
-
-// 确定选择溯源机构
-const confirmSelectedSource = (val: any) => {
- form.value.traceCompany = val[0].supplierName // 溯源机构名称
-}
-
// -------------------------------------------文件上传--------------------------------------
const fileRef = ref() // 文件上传input
const uploadIndex = ref(0) // 要上传文件到第几行
@@ -190,7 +176,7 @@
})
UploadFile(fd).then((res) => {
if (res.code === 200) {
- list.value[uploadIndex.value].jdzs = res.data[0]
+ list.value[uploadIndex.value].certificateFile = res.data[0]
// 重置当前验证
ElMessage.success('文件上传成功')
loading.close()
@@ -214,15 +200,30 @@
// 保存
const save = () => {
+ if (!list.value.length) {
+ ElMessage.warning('表格不能为空')
+ return false
+ }
+ if (!useCheckList(list.value, columns, '表格')) { return false }
ruleFormRef.value!.validate((valid: boolean) => {
if (valid) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
+ const params = {
+ ...form.value,
+ id: infoId.value,
+ certificateDetailList: list.value.map((item: Object) => {
+ return {
+ ...item,
+ certificateId: infoId.value, // 证书主表id
+ }
+ }),
+ }
// 新建
if (pageType.value === 'add') { // 新建
- addSourceCertList(form.value).then((res) => {
+ addSourceCertList(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -232,7 +233,7 @@
}
// 保存
else if (pageType.value === 'edit') { // 编辑
- updateSourceCert({ ...form.value, id: infoId.value }).then((res) => {
+ updateSourceCert(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -251,26 +252,15 @@
getDict().then(() => {
if (pageType.value !== 'add') {
form.value = $route.query as any
- form.value.certificateName = $route.query.certificateName as string // 证书名称
- form.value.certificateNo = $route.query.certificateNo as string // 证书编号
- form.value.equipmentId = $route.query.equipmentId as string // 设备id
- form.value.equipmentName = $route.query.equipmentName as string // 设备名称
- form.value.equipmentNo = $route.query.equipmentNo as string // 设备编号
- form.value.traceCompany = $route.query.traceCompany as string // 溯源单位名
- form.value.traceDate = $route.query.traceDate as string // 检定日期
- form.value.validDate = $route.query.validDate as string // 证书有效期
- form.value.meterIdentify = $route.query.meterIdentify as string // 计量标识(字典code)
- form.value.meterIdentifyName = $route.query.meterIdentifyName as string// 计量标识(字典value)
- form.value.remark = $route.query.remark as string // 备注
- form.value.certificateFile = $route.query.certificateFile as string // 证书报告附件
- infoId.value = $route.query.id as string// id
+ infoId.value = $route.query.id as string // id
+ list.value = JSON.parse($route.query.certificateDetailList as any)
}
})
})
-
+
@@ -377,9 +367,9 @@
-
+
-
+
-
-
@@ -503,30 +462,30 @@
*{{ item.text }}
-
-
+
+
测试
-
+
校准
-
+
检定
-
+
- {{ scope.row.jdzs === '' ? '上传' : '更换附件' }}
+ {{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
+ {{ scope.row[item.value] }}
@@ -539,9 +498,9 @@
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/api/business/measure/item.ts b/src/api/business/measure/item.ts
index 225323b..34d588c 100644
--- a/src/api/business/measure/item.ts
+++ b/src/api/business/measure/item.ts
@@ -1,6 +1,6 @@
/**
* 检定项管理
-*/
+ */
import request from '../../index'
import type { IListQuery } from '@/views/business/measure/item/item-interface'
const prefix = '/business/device/measureItemInfo'
@@ -59,7 +59,7 @@
})
}
-// 列表-不分页,获取设备型号规格和辅助字段
+// 列表-不分页,获取设备规格型号和辅助字段
export function getModelAllList(params: any) {
return request({
url: `${prefix}/eqpt/model/list`,
@@ -93,4 +93,3 @@
data,
})
}
-
diff --git a/src/components/QRcodeDeviceDialog/index.vue b/src/components/QRcodeDeviceDialog/index.vue
index 132e54d..e6349f8 100644
--- a/src/components/QRcodeDeviceDialog/index.vue
+++ b/src/components/QRcodeDeviceDialog/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 9e5c4fd..affff0f 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -154,7 +154,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue
index 6a62b97..1dbe151 100644
--- a/src/components/scanEquipmentDialog/index.vue
+++ b/src/components/scanEquipmentDialog/index.vue
@@ -165,7 +165,7 @@
-
+
diff --git a/src/components/scanEquipmentDialog/scan-interface.ts b/src/components/scanEquipmentDialog/scan-interface.ts
index e6b8128..9991a0f 100644
--- a/src/components/scanEquipmentDialog/scan-interface.ts
+++ b/src/components/scanEquipmentDialog/scan-interface.ts
@@ -2,7 +2,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 8e3cdfd..ba39ea6 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -67,7 +67,7 @@
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 检定审批管理
CERTIFICATE_PRINT_APPROVAL = 'jljdywzsgl', // 证书管理
CERTIFICATE_CHANGE_APPROVAL = 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbgbcj', // 对编号为XXX的证书/报告的补充件
+ CERTIFICATE_SUPPLEMENT_APPROVAL = 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
SUBPACKAGE_DIRECTORIES_APPROVAL = 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
SUBPACKAGE_AUDIT_LIST_APPROVAL = 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
SUBPACKAGE_AGREEMENT_APPROVAL = 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
@@ -142,7 +142,7 @@
[SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理
[SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理
[SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单
- [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsgbcj', // 对编号为XXX的证书/报告的补充件
+ [SCHEDULE.CERTIFICATE_SUPPLEMENT_APPROVAL]: 'jljdywzsbcj', // 对编号为XXX的证书/报告的补充件
[SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录
[SCHEDULE.SUBPACKAGE_AUDIT_LIST_APPROVAL]: 'jljdywcsjzfbpsb', // 测试、校准或检定工作分包评审表
[SCHEDULE.SUBPACKAGE_AGREEMENT_APPROVAL]: 'jljdywcsjzfbxys', // 测试、校准或检定工作分包协议书
diff --git a/src/views/business/fieldTest/approve/components/basic.vue b/src/views/business/fieldTest/approve/components/basic.vue
index 9bb83dc..0e3a66d 100644
--- a/src/views/business/fieldTest/approve/components/basic.vue
+++ b/src/views/business/fieldTest/approve/components/basic.vue
@@ -130,7 +130,7 @@
const equipmentColumns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' },
{ text: '所属部门', value: 'deptName', align: 'center' },
]
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 44f805c..9412759 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -39,7 +39,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -54,7 +54,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -125,7 +125,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -197,7 +197,7 @@
-
+
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 332c233..a2e25e1 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -167,7 +167,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true, width: '220' },
- { text: '型号规格', value: 'model', align: 'center', required: false },
+ { text: '规格型号', value: 'model', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '计量标识', value: 'meterIdentifyName', align: 'center', required: false },
@@ -215,7 +215,7 @@
id: '', // 主键
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
specialRequire: '', // 特殊要求
@@ -237,7 +237,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
@@ -269,7 +269,7 @@
sampleId: getValue.sampleId,
equipmentNo: getValue.sampleNo, // 统一编号
equipmentName: getValue.sampleName, // 设备名称
- model: getValue.sampleModel, // 型号规格
+ model: getValue.sampleModel, // 规格型号
manufactureNo: getValue.manufactureNo, // 出厂编号
manufacturer: getValue.manufacturer, // 生产厂家
meterIdentify: getValue.meterIdentify, // 计量标识
@@ -410,7 +410,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
appendixDescn: item.appendixDescn, // 附件
appearanceInspect: item.appearanceInspect, // 外观和功能检查
specialRequire: item.specialRequire, // 特殊要求
@@ -494,7 +494,7 @@
...item,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
certificateValid: item.certificateValid ? dayjs(item.certificateValid).format('YYYY-MM-DD') : item.certificateValid,
editable: pageType.value !== 'detail',
meterIdentifyName: meterIdentifyDict.value[item.meterIdentify], // 计量标识
@@ -624,7 +624,7 @@
sampleId: item.sampleId,
equipmentNo: item.sampleNo, // 统一编号
equipmentName: item.sampleName, // 设备名称
- model: item.sampleModel, // 型号规格
+ model: item.sampleModel, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
meterIdentify: item.meterIdentify, // 计量标识
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index c8b6440..de91157 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -37,7 +37,7 @@
const total = ref(0) // 数组总数
const columns = ref([
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index b8af931..1027fcd 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -137,7 +137,7 @@
const columnsEdit = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -150,7 +150,7 @@
const detailColumns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '240', disabled: true, required: true },
{ text: '设备名称', value: 'sampleName', align: 'center', required: false },
- { text: '型号规格', value: 'sampleModel', align: 'center', required: false },
+ { text: '规格型号', value: 'sampleModel', align: 'center', required: false },
{ text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
{ text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
{ text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
@@ -200,7 +200,7 @@
sampleId: '', // 设备id
sampleNo: '', // 统一编号\设备编号
sampleName: '', // 设备名称
- sampleModel: '', // 型号规格
+ sampleModel: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
appendixDescn: '', // 附件
@@ -227,7 +227,7 @@
sampleId: item.id!, // 设备id
sampleNo: item.equipmentNo!, // 统一编号\设备编号
sampleName: item.equipmentName!, // 设备名称
- sampleModel: item.model!, // 型号规格
+ sampleModel: item.model!, // 规格型号
manufactureNo: item.manufactureNo, // 出厂编号
manufacturer: item.manufacturer, // 生产厂家
appendixDescn: '', // 附件
@@ -253,7 +253,7 @@
sampleId: getValue.id!, // 设备id
sampleNo: getValue.equipmentNo!, // 统一编号\设备编号
sampleName: getValue.equipmentName!, // 设备名称
- sampleModel: getValue.model!, // 型号规格
+ sampleModel: getValue.model!, // 规格型号
appendixDescn: '', // 附件
appearanceInspect: '', // 外观和功能检查
manufactureNo: getValue.manufactureNo, // 出厂编号
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index 7169582..35521d2 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -33,7 +33,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/manager/order/order-interface.ts b/src/views/business/manager/order/order-interface.ts
index 9583889..240cdff 100644
--- a/src/views/business/manager/order/order-interface.ts
+++ b/src/views/business/manager/order/order-interface.ts
@@ -77,7 +77,7 @@
sampleId?: string // 设备id
sampleNo?: string // 统一编号\设备编号
sampleName?: string // 设备名称
- sampleModel?: string // 型号规格
+ sampleModel?: string // 规格型号
manufactureNo?: string // 出厂编号
manufacturer?: string // 生产厂家
appendixDescn: string // 附件
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index 2cd7d12..d9fc336 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -36,7 +36,7 @@
productDate: '', // 生产日期
unitPrice: '', // 单价(万元)
purchaseDate: '', // 购进日期
- model: '', // 型号规格
+ model: '', // 规格型号
category: '', // 设备分类
qualityCondition: '', // 质量状况
deptId: '', // 使用部门id
@@ -223,7 +223,7 @@
-
+
-
-
+
+
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index 865ba05..539b04f 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -20,7 +20,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -34,7 +34,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -115,7 +115,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -186,7 +186,7 @@
-
+
diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts
index ab683b9..e52bba1 100644
--- a/src/views/business/measure/item/item-interface.ts
+++ b/src/views/business/measure/item/item-interface.ts
@@ -6,7 +6,7 @@
deviceType?: string // 设备分类(字典code)
helpInstruction?: string // 辅助字段
itemCategoryId?: string // 设备检定项分类表id(查询引用模板时该字段必传)
- model?: string // 型号规格
+ model?: string // 规格型号
noConfigFlag?: number | string // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd?: string // 自动检定系统最新同步时间结束
syncTimeStart?: string // 自动检定系统最新同步时间开始
@@ -17,7 +17,7 @@
export interface IList {
id: string
deviceName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
helpInstruction: string // 辅助字段
helpFieldInstruction: string // 辅助字段说明
deviceType: string // 设备分类（检校分类）
@@ -35,4 +35,3 @@
configType?: string // 检定项配置类型--新增
detailList?: any // 检定项详情表格
}
-
diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue
index 79db3d9..2435396 100644
--- a/src/views/business/measure/item/list.vue
+++ b/src/views/business/measure/item/list.vue
@@ -30,7 +30,7 @@
helpFieldInstruction: '', // 辅助字段说明
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -41,7 +41,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
@@ -202,7 +202,7 @@
deviceType: '', // 设备分类(字典code)
helpInstruction: '', // 辅助字段
itemCategoryId: '', // 设备检定项分类表id(查询引用模板时该字段必传)
- model: '', // 型号规格
+ model: '', // 规格型号
noConfigFlag: '', // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
@@ -266,7 +266,7 @@
deviceType: listQuery.value.deviceType, // 设备分类(字典code)
helpInstruction: listQuery.value.helpInstruction, // 辅助字段
itemCategoryId: listQuery.value.itemCategoryId, // 设备检定项分类表id(查询引用模板时该字段必传)
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
noConfigFlag: listQuery.value.noConfigFlag, // 未配置检定项（1查询未配置，不传为查询所有）
syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束
syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始
@@ -308,7 +308,7 @@
list.value.splice(index + 1, 0, {
id: '',
deviceName: checkoutList.value[0].deviceName, // 设备名称
- model: checkoutList.value[0].model, // 型号规格
+ model: checkoutList.value[0].model, // 规格型号
helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段
helpFieldInstruction: checkoutList.value[0].helpFieldInstruction, // 辅助字段说明
deviceType: checkoutList.value[0].deviceType, // 设备分类（检校分类）
@@ -332,7 +332,7 @@
// 监听设备名称下拉框，修改规格型号和辅助字段
watch(() => listQuery.value.deviceName, (newVal) => {
listQuery.value.helpInstruction = '' // 辅助字段清空
- listQuery.value.model = '' // 型号规格清空
+ listQuery.value.model = '' // 规格型号清空
// 修改规格型号和辅助字段列表
const data = allList.value.filter(item => item.equipmentName === newVal)
modelList.value = Array.from(new Set(data.filter(item => item.model).map(item => item.model)))
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/business/subpackage/agreement/components/basic.vue b/src/views/business/subpackage/agreement/components/basic.vue
index 0ad9038..1845f87 100644
--- a/src/views/business/subpackage/agreement/components/basic.vue
+++ b/src/views/business/subpackage/agreement/components/basic.vue
@@ -5,7 +5,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import type { Ref } from 'vue'
import type { IForm } from '../agreement-interface'
-import SelectOutsourcerNoDialog from '@/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue'
+import SelectOutsourcerReviewDialog from '@/views/business/subpackage/inform/dialog/selectReviewDialog.vue'
import {
addAgreement,
failUpdateAgreement,
@@ -14,6 +14,7 @@
updateAgreement,
} from '@/api/business/subpackage/agreement'
import { getInfo as getDirectoriesDetail } from '@/api/business/subpackage/directories'
+import { getInfo as getReviewDetail } from '@/api/business/subpackage/Review'
import { getDictByCode } from '@/api/system/dict'
import type { dictType } from '@/global'
import useUserStore from '@/store/modules/user'
@@ -61,6 +62,9 @@
item: '', // 分包项目
requires: '', // 分包要求
remark: '', // 其他
+ fbfpsbid: '', // 分包放评审表id
+ fbfpsbbh: '', // 分包放评审表编号
+
})
const fullAddress = ref([]) // 公司地址
const ruleFormRef = ref() // 表单ref
@@ -89,7 +93,7 @@
const groupCodeList = ref([]) // 组别代码
function getDict() {
// 实验室代码
- getDictByCode('bizLabCode').then((response) => {
+ getDictByCode('bizGroupCodeEquipment').then((response) => {
labCodeList.value = response.data
})
// 组别代码
@@ -97,27 +101,46 @@
groupCodeList.value = response.data
})
}
-// ----------------------------------------选择分包方编号--------------------------------------
-const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
+// ----------------------------------------分包项目--------------------------------------
+const list = ref([]) // 分包项目
+const columns = [
+ { text: '受检设备名称', value: 'equipmentName', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '计量标识', value: 'manufacturer', align: 'center' },
+ { text: '检定有效期', value: 'validDate', align: 'center' },
+]
+// ----------------------------------------选择分包方评审表--------------------------------------
+const selectOutsourcerReviewDialogRef = ref() // 选择分包方组件ref
// 点击选择
-const selectOutsourcerNo = () => {
- selectOutsourcerNoDialogRef.value.initDialog()
+const selectOutsourcerReview = () => {
+ selectOutsourcerReviewDialogRef.value.initDialog()
+}
+
+// 获取分包评审表详情
+function fetchgetReviewDetail(id: string) {
+ getReviewDetail({ id }).then((response) => {
+ form.value.outsourcerName = response.data.outsourcerName // 分包方名称
+ form.value.fbfpsbid = response.data.id // 分包方评审表id
+ form.value.fbfpsbbh = response.data.projectNo // 分包方评审表编号
+ form.value.contacts = response.data.contacts // 联系人
+ form.value.mobile = response.data.mobile // 联系电话
+ form.value.fullAddress = response.data.fullAddress // 地址
+ // form.value.fullAddress = response.data.addressCountryName + response.data.addressProvinceName + response.data.addressCityName + response.data.addressAreaName + response.data.fullAddress
+ list.value = response.data.equipmentList.map((item: { validDate: string }) => {
+ return {
+ ...item,
+ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, // 检定有效期
+ }
+ })
+ })
}
// 确定选择分包方
-const confirmSelectOutsourcerNo = (val: any) => {
- console.log(val)
- form.value.outsourcerId = val[0].id // 分包方id
- form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
- form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
- form.value.director = val[0].director // 机构负责人
- fullAddress.value = [
- val[0].addressCountryName,
- val[0].addressProvinceName,
- val[0].addressCityName,
- val[0].addressAreaName,
- val[0].fullAddress,
- ]
+const confirmSelectOutsourcerReview = (val: any) => {
+ if (val && val.length) {
+ fetchgetReviewDetail(val[0].id) // 获取分包评审表详情
+ }
}
// -----------------------------------------其他方法------------------------------------------
@@ -244,6 +267,8 @@
fetchInfo() // 获取详情信息
}
if (props.pageType === 'add') {
+ form.value.labCode = user.bizLabCode
+ form.value.groupCode = user.groupNo
form.value.projectName = '测试、校准或检定工作分包协议书' // 评审表名称
}
})
@@ -262,10 +287,10 @@
>
-
+
@@ -279,10 +304,10 @@
-
+
@@ -296,7 +321,7 @@
-
+
-
+
-
+
-
+
选择
@@ -339,7 +364,7 @@
/>
-
+
@@ -364,7 +389,18 @@
v-model="form.mobile"
:placeholder="pageType === 'detail' ? ' ' : '请输入电话'"
:class="{ 'detail-input': pageType === 'detail' }"
- :disabled="pageType === 'detail'"
+ disabled
+ />
+
+
+
+
+
@@ -383,7 +419,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
@@ -432,9 +462,9 @@
@@ -442,6 +472,6 @@
-
-
+
+
diff --git a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
index 5f4e47c..39c0ea5 100644
--- a/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
+++ b/src/views/business/subpackage/agreement/dialog/uploadFileDialog.vue
@@ -1,10 +1,11 @@
@@ -54,13 +86,13 @@
-
+
无
@@ -81,7 +113,7 @@
- 提交
+ 确定
取消
diff --git a/src/views/business/subpackage/agreement/edit.vue b/src/views/business/subpackage/agreement/edit.vue
index dd86327..a18ac5b 100644
--- a/src/views/business/subpackage/agreement/edit.vue
+++ b/src/views/business/subpackage/agreement/edit.vue
@@ -1,9 +1,12 @@
@@ -183,6 +208,9 @@
删除
+
+ 打印
+
关闭
@@ -208,6 +236,9 @@
@add-success="addSuccess"
@submit-success="submitSuccess"
/>
+
+
+
diff --git a/src/views/business/subpackage/agreement/list.vue b/src/views/business/subpackage/agreement/list.vue
index b1f9e09..40a3479 100644
--- a/src/views/business/subpackage/agreement/list.vue
+++ b/src/views/business/subpackage/agreement/list.vue
@@ -6,6 +6,7 @@
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import dayjs from 'dayjs'
import type { IList, IListQuery } from './agreement-interface'
+import UploadFileDialog from './dialog/uploadFileDialog.vue'
// import delReasonDialog from './dialog/delReasonDialog.vue'
import {
approvalDelete,
@@ -225,27 +226,27 @@
// ----------------------------------------------操作---------------------------------------------------
const handleEdit = (row: IList, type: string) => {
if (type === 'edit' || type === 'detail') {
- // 编辑、详情
- if (active.value === '0' && type === 'detail') {
- $router.push({
- path: `/agreementDoc/${type}/${row.id}`,
- query: {
- approvalStatusName: '全部', // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
- else {
- $router.push({
- path: `/agreement/${type}/${row.id}`,
- query: {
- approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
- processId: row.processId, // 流程实例id
- taskId: row.taskId, // 任务id
- },
- })
- }
+ // // 编辑、详情
+ // if (active.value === '0' && type === 'detail') {
+ // $router.push({
+ // path: `/agreementDoc/${type}/${row.id}`,
+ // query: {
+ // approvalStatusName: '全部', // 审批状态名称
+ // processId: row.processId, // 流程实例id
+ // taskId: row.taskId, // 任务id
+ // },
+ // })
+ // }
+ // else {
+ $router.push({
+ path: `/agreement/${type}/${row.id}`,
+ query: {
+ approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+ processId: row.processId, // 流程实例id
+ taskId: row.taskId, // 任务id
+ },
+ })
+ // }
}
else if (type === '同意') {
approvalDialog.value.initDialog('agree', row.taskId)
@@ -314,6 +315,12 @@
fetchData(true)
})
}
+
+const uploadFileDialogRef = ref() // 上传分包方签字版组件ref
+// 点击上传分包方签字版
+const handleUpload = () => {
+ uploadFileDialogRef.value.initDialog()
+}
// ----------------------------------------------钩子\其他事件------------------------------------------------------
// 点击分包评审表编号
const handleClickFollowLink = (row: any) => {
@@ -573,6 +580,8 @@
/>
+
+
diff --git a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
index 34593d5..3ba6545 100644
--- a/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
+++ b/src/views/business/subpackage/certificate/dialog/selectSampleDialog.vue
@@ -16,7 +16,7 @@
const columns = ref([
{ text: '统一编号', value: 'sampleNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'sampleName', align: 'center' },
- { text: '型号规格', value: 'sampleModel', align: 'center' },
+ { text: '规格型号', value: 'sampleModel', align: 'center' },
{ text: '附件', value: 'appendixDescn', align: 'center' },
{ text: '外观和功能检查', value: 'appearanceInspect', align: 'center' },
{ text: '特殊要求', value: 'specialRequire', align: 'center' },
diff --git a/src/views/business/subpackage/directories/components/basic.vue b/src/views/business/subpackage/directories/components/basic.vue
index 0e47f45..843fcc3 100644
--- a/src/views/business/subpackage/directories/components/basic.vue
+++ b/src/views/business/subpackage/directories/components/basic.vue
@@ -63,14 +63,15 @@
getInfo({ id: infoId.value }).then((res) => {
loading.value = false
form.value = res.data
- if (props.pageType == 'detail') {
- fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
- }
- else {
- fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
- invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
- }
+ form.value.fullAddress = res.data.addressCountryName + res.data.addressProvinceName + res.data.addressCityName + res.data.addressAreaName + res.data.fullAddress
+ // if (props.pageType == 'detail') {
+ // fullAddress.value = [form.value.addressCountryName, form.value.addressProvinceName, form.value.addressCityName, form.value.addressAreaName, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountryName, form.value.invoiceProvinceName, form.value.invoiceCityName, form.value.invoiceAreaName, form.value.invoiceFullAddress]
+ // }
+ // else {
+ // fullAddress.value = [form.value.addressCountry, form.value.addressProvince, form.value.addressCity, form.value.addressArea, form.value.fullAddress]
+ // invoiceFullAddress.value = [form.value.invoiceCountry, form.value.invoiceProvince, form.value.invoiceCity, form.value.invoiceArea, form.value.invoiceFullAddress]
+ // }
})
}
@@ -141,13 +142,24 @@
/>
-
+
+
+
+
+
+
([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '负责人', value: 'directorName', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index f359b15..ba2eff3 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -69,7 +69,7 @@
const equipmentColumns = ref([ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index b0fd438..0385317 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -540,7 +540,7 @@
-
+
diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
index 31b8c3a..a4c1e4a 100644
--- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
+++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue
@@ -21,7 +21,7 @@
const total = ref(0)
const columns = ref([
{ text: '设备名称', value: 'deviceName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '辅助字段', value: 'helpInstruction', align: 'center' },
{ text: '辅助字段说明', value: 'helpInstruction', align: 'center' },
{ text: '设备分类', value: 'deviceTypeName', align: 'center' },
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index cf75304..fb49f43 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -292,7 +292,7 @@
deviceName: '', // 设备名称
deviceType: '', // 设备分类
helpInstruction: '', // 辅助字段
- model: '', // 型号规格
+ model: '', // 规格型号
syncTimeEnd: '', // 自动检定系统最新同步时间结束
syncTimeStart: '', // 自动检定系统最新同步时间开始
limit: 20,
@@ -306,7 +306,7 @@
fetchItemIdListQuery.value.offset = 1
}
fetchItemIdListQuery.value.deviceName = deviceName// 设备名称
- fetchItemIdListQuery.value.model = model// 型号规格
+ fetchItemIdListQuery.value.model = model// 规格型号
fetchItemIdListQuery.value.helpInstruction = helpInstruction // 辅助字段
const response = await getItemList(fetchItemIdListQuery.value)
fetchItemList.value = response.data.rows
diff --git a/src/views/equipement/info/book/book-interface.ts b/src/views/equipement/info/book/book-interface.ts
index 4028f79..5c124fd 100644
--- a/src/views/equipement/info/book/book-interface.ts
+++ b/src/views/equipement/info/book/book-interface.ts
@@ -14,7 +14,7 @@
measureValidDateStart: string // 检定有效期开始
measureValidDateEnd: string // 检定有效期结束
meterStandardName: string // 所属标准装置名称
- model: string // 型号规格
+ model: string // 规格型号
manufacturer: string // 生产厂家
partType?: number // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: string // 标准类型(字典code)
@@ -29,7 +29,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
@@ -60,7 +60,7 @@
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
usedYears: number // 使用年限
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
@@ -183,7 +183,7 @@
manufactureNo: string // 出厂编号
produceDate: string // 生产日期
unitPrice: number // 设备单价（万元）
- model: string // 型号规格
+ model: string // 规格型号
qualityStatus: string // 质量状况
usageStatus: string // 使用状态
level: string // 重要等级
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 25efb7e..3c5c071 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -66,7 +66,7 @@
produceDate: '', // 生产日期
unitPrice: 0, // 设备单价（万元）
usedYears: 10, // 使用年限
- model: '', // 型号规格
+ model: '', // 规格型号
qualityStatus: '', // 质量状况
usageStatus: '', // 使用状态
level: '', // 重要等级
@@ -106,7 +106,7 @@
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
produceDate: [{ required: true, message: '生产日期不能为空', trigger: ['blur', 'change'] }],
unitPrice: [{ required: true, message: '设备单价不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
qualityStatus: [{ required: true, message: '质量状况不能为空', trigger: ['blur', 'change'] }],
usageStatus: [{ required: true, message: '使用状态不能为空', trigger: ['blur', 'change'] }],
level: [{ required: true, message: '重要等级不能为空', trigger: ['blur', 'change'] }],
@@ -948,10 +948,10 @@
-
+
diff --git a/src/views/equipement/info/book/components/useRecord.vue b/src/views/equipement/info/book/components/useRecord.vue
index dcf7617..84e3d03 100644
--- a/src/views/equipement/info/book/components/useRecord.vue
+++ b/src/views/equipement/info/book/components/useRecord.vue
@@ -80,7 +80,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
@@ -213,7 +213,7 @@
createUserName: '', // 核查员
equipmentId: '', // 设备id(必传，不能为空)
manufactureNo: '', // 核查设备出厂编号
- model: '', // 核查设备型号规格
+ model: '', // 核查设备规格型号
recordName: '', // 核查记录名称
recordNo: '', // 核查记录编号
offset: 1,
diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue
index 4dddfb5..e53e608 100644
--- a/src/views/equipement/info/book/list.vue
+++ b/src/views/equipement/info/book/list.vue
@@ -44,7 +44,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -58,7 +58,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -155,7 +155,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
// partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -262,7 +262,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
// partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -431,7 +431,7 @@
-
+
diff --git a/src/views/equipement/info/remind/list.vue b/src/views/equipement/info/remind/list.vue
index 6c16953..bd84000 100644
--- a/src/views/equipement/info/remind/list.vue
+++ b/src/views/equipement/info/remind/list.vue
@@ -38,7 +38,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '设备单价（万元）', value: 'unitPrice', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
diff --git a/src/views/equipement/info/table/list.vue b/src/views/equipement/info/table/list.vue
index cf42c48..c05f52b 100644
--- a/src/views/equipement/info/table/list.vue
+++ b/src/views/equipement/info/table/list.vue
@@ -30,7 +30,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表必传，固定值1
standardType: '', // 标准类型(字典code)
@@ -43,7 +43,7 @@
// 表头
const columns = ref([
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '实验室', value: 'labCodeName', align: 'center' },
@@ -120,7 +120,7 @@
measureValidDateStart: '', // 检定有效期开始
measureValidDateEnd: '', // 检定有效期结束
meterStandardName: '', // 所属标准装置名称
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
partType: '1', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: '', // 标准类型(字典code)
@@ -175,7 +175,7 @@
measureValidDateStart: listQuery.value.measureValidDateStart, // 检定有效期开始
measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束
meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufacturer: listQuery.value.manufacturer, // 生产厂家
partType: listQuery.value.partType, // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数
standardType: listQuery.value.standardType, // 标准类型(字典code)
@@ -222,7 +222,7 @@
-
+
diff --git a/src/views/equipement/info/table/table-interface.ts b/src/views/equipement/info/table/table-interface.ts
index 6924f7b..69a1c21 100644
--- a/src/views/equipement/info/table/table-interface.ts
+++ b/src/views/equipement/info/table/table-interface.ts
@@ -20,7 +20,7 @@
id: string // 主键
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
unitPrice: string // 设备单价（万元）
manufacturer: string // 生产厂家
manufactureNo: string // 出厂编号
diff --git a/src/views/equipement/monitor/device/detail.vue b/src/views/equipement/monitor/device/detail.vue
index 431856e..936374e 100644
--- a/src/views/equipement/monitor/device/detail.vue
+++ b/src/views/equipement/monitor/device/detail.vue
@@ -27,7 +27,7 @@
const form = ref({
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
productCountry: '', // 生产国家
manufacturer: '', // 生产厂家
@@ -51,7 +51,7 @@
// 校验规则
const formRules = ref({
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
checkCycle: [{ required: true, message: '检定周期不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['blur', 'change'] }],
@@ -207,10 +207,10 @@
-
+
diff --git a/src/views/equipement/monitor/device/device-interface.ts b/src/views/equipement/monitor/device/device-interface.ts
index d67e5b0..16e77b4 100644
--- a/src/views/equipement/monitor/device/device-interface.ts
+++ b/src/views/equipement/monitor/device/device-interface.ts
@@ -16,7 +16,7 @@
id: string
equipmentName: string // 设备名称
equipmentNo: string // 统一编号
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
createDept: string // 所属部门
createUserName: string // 负责人
@@ -31,7 +31,7 @@
export interface IForm {
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
productCountry: string // 生产国家
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/monitor/device/list.vue b/src/views/equipement/monitor/device/list.vue
index 8bc5354..7c9b8e0 100644
--- a/src/views/equipement/monitor/device/list.vue
+++ b/src/views/equipement/monitor/device/list.vue
@@ -31,7 +31,7 @@
const columns = ref([
{ text: '统一编号', value: 'equipmentNo', align: 'center', width: '160' },
{ text: '设备名称', value: 'equipmentName', align: 'center' },
- { text: '型号规格', value: 'model', align: 'center' },
+ { text: '规格型号', value: 'model', align: 'center' },
{ text: '出厂编号', value: 'manufactureNo', align: 'center' },
{ text: '所属部门', value: 'createDept', align: 'center' },
{ text: '负责人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index ac7cca4..b693cc2 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -28,7 +28,7 @@
// groupCode: '', // 组别代码(字典code)
equipmentNo: '', // 统一编号
equipmentName: '', // 设备名称
- model: '', // 型号规格
+ model: '', // 规格型号
checkCycle: 0, // 检定周期
transmitFrequencyBand: '', // 发射频段
transmitPower: '', // 发射功率
@@ -228,10 +228,10 @@
-
+
diff --git a/src/views/equipement/monitor/radio/radio-interface.ts b/src/views/equipement/monitor/radio/radio-interface.ts
index 9456a53..689141d 100644
--- a/src/views/equipement/monitor/radio/radio-interface.ts
+++ b/src/views/equipement/monitor/radio/radio-interface.ts
@@ -25,7 +25,7 @@
// groupCode: string // 组别代码(字典code)
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
checkCycle: number // 检定周期
transmitFrequencyBand: string // 发射频段
transmitPower: string // 发射功率
diff --git a/src/views/equipement/resume/borrow/borrow-interface.ts b/src/views/equipement/resume/borrow/borrow-interface.ts
index 5b1772d..d0e53e1 100644
--- a/src/views/equipement/resume/borrow/borrow-interface.ts
+++ b/src/views/equipement/resume/borrow/borrow-interface.ts
@@ -1,13 +1,13 @@
export interface IListQuery {
approvalStatus: string // 审批状态类型code
- equipmentCompany: string// 设备所属单位
- equipmentName: string// 设备名称
- formId: string// formId
- registerNo: string// 登记表编号
+ equipmentCompany: string // 设备所属单位
+ equipmentName: string // 设备名称
+ formId: string // formId
+ registerNo: string // 登记表编号
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
@@ -55,8 +55,7 @@
export interface IAttachmentList {
id: string
name: string // 名称
- information: string// 信息
- location: string// 位置
+ information: string // 信息
+ location: string // 位置
logId: string // 开箱验收id
}
-
diff --git a/src/views/equipement/resume/borrow/components/basic.vue b/src/views/equipement/resume/borrow/components/basic.vue
index 1d914d2..f3889de 100644
--- a/src/views/equipement/resume/borrow/components/basic.vue
+++ b/src/views/equipement/resume/borrow/components/basic.vue
@@ -74,7 +74,7 @@
labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
- model: [{ required: true, message: '型号规格不能为空', trigger: ['blur', 'change'] }],
+ model: [{ required: true, message: '规格型号不能为空', trigger: ['blur', 'change'] }],
manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
manufactureNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
borrowCompany: [{ required: true, message: '借用单位不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/equipement/resume/borrow/list.vue b/src/views/equipement/resume/borrow/list.vue
index 8d8269e..b576d26 100644
--- a/src/views/equipement/resume/borrow/list.vue
+++ b/src/views/equipement/resume/borrow/list.vue
@@ -39,7 +39,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -128,7 +128,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -177,7 +177,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index 31b6a65..b447362 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -82,7 +82,7 @@
const columns = [ // 表头
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '设备名称', value: 'equipmentName', align: 'center', required: true },
- { text: '型号规格', value: 'model', align: 'center', required: true },
+ { text: '规格型号', value: 'model', align: 'center', required: true },
{ text: '数量', value: 'quantity', align: 'center', required: true },
]
const addObj = {
@@ -153,7 +153,7 @@
equipmentId: '', // 设备id(外部设备该字段为空)
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号(编号、名称、型号、数量都要传)
- model: '', // 型号规格
+ model: '', // 规格型号
quantity: '', // 数量
editable: true,
})
@@ -198,7 +198,7 @@
equipmentId: item.id, // 设备id
equipmentNo: item.equipmentNo, // 统一编号
equipmentName: item.equipmentName, // 设备名称
- model: item.model, // 型号规格
+ model: item.model, // 规格型号
quantity: '', // 数量
editable: true,
})
diff --git a/src/views/equipement/resume/encasement/encasement-interface.ts b/src/views/equipement/resume/encasement/encasement-interface.ts
index 08dac54..571d0be 100644
--- a/src/views/equipement/resume/encasement/encasement-interface.ts
+++ b/src/views/equipement/resume/encasement/encasement-interface.ts
@@ -52,7 +52,7 @@
equipmentId: string // 设备id(外部设备该字段为空)
equipmentName: string // 设备名称
equipmentNo: string // 设备编号(编号、名称、型号、数量都要传)
- model: string // 型号规格
+ model: string // 规格型号
quantity: string // 数量
editable?: boolean // 是否可编辑
}
diff --git a/src/views/equipement/resume/error/components/basic.vue b/src/views/equipement/resume/error/components/basic.vue
index 08fa3ee..774d0b7 100644
--- a/src/views/equipement/resume/error/components/basic.vue
+++ b/src/views/equipement/resume/error/components/basic.vue
@@ -109,7 +109,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
form.value.labCode = val[0].labCode // 实验室
form.value.groupCode = val[0].groupCode // 部门
@@ -332,10 +332,10 @@
-
+
diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts
index 3632c4c..f0135c9 100644
--- a/src/views/equipement/resume/error/error-interface.ts
+++ b/src/views/equipement/resume/error/error-interface.ts
@@ -25,7 +25,7 @@
reportName: string // 报告单名称
equipmentNo: string // 统一编号
equipmentName: string // 设备名称
- model: string // 型号规格
+ model: string // 规格型号
exceptionTime: string // 故障时间
processId?: string
taskId?: string
diff --git a/src/views/equipement/resume/lend/components/basic.vue b/src/views/equipement/resume/lend/components/basic.vue
index bf90091..088a014 100644
--- a/src/views/equipement/resume/lend/components/basic.vue
+++ b/src/views/equipement/resume/lend/components/basic.vue
@@ -212,7 +212,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentNo = val[0].equipmentNo // 统一编号
form.value.equipmentName = val[0].equipmentName // 设备名称
- form.value.model = val[0].model // 型号规格
+ form.value.model = val[0].model // 规格型号
form.value.manufacturer = val[0].manufacturer // 生产厂家
}
}
diff --git a/src/views/equipement/resume/lend/lend-interface.ts b/src/views/equipement/resume/lend/lend-interface.ts
index ec7febd..878cde7 100644
--- a/src/views/equipement/resume/lend/lend-interface.ts
+++ b/src/views/equipement/resume/lend/lend-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
diff --git a/src/views/equipement/resume/lend/list.vue b/src/views/equipement/resume/lend/list.vue
index e9f9eba..ee27378 100644
--- a/src/views/equipement/resume/lend/list.vue
+++ b/src/views/equipement/resume/lend/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue
index d8b4a66..226089a 100644
--- a/src/views/equipement/resume/unpack/list.vue
+++ b/src/views/equipement/resume/unpack/list.vue
@@ -41,7 +41,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -132,7 +132,7 @@
labCode: '', // 实验室代码
groupCode: '', // 组别代码、部门
- model: '', // 型号规格
+ model: '', // 规格型号
manufactureNo: '', // 出厂编号
manufacturer: '', // 生产厂家
limit: 20,
@@ -183,7 +183,7 @@
labCode: listQuery.value.labCode, // 实验室代码
groupCode: listQuery.value.groupCode, // 组别代码、部门
- model: listQuery.value.model, // 型号规格
+ model: listQuery.value.model, // 规格型号
manufactureNo: listQuery.value.manufactureNo, // 出厂编号
manufacturer: listQuery.value.manufacturer, // 生产厂家
offset: 1,
diff --git a/src/views/equipement/resume/unpack/unpack-interface.ts b/src/views/equipement/resume/unpack/unpack-interface.ts
index 023f97d..d3045e1 100644
--- a/src/views/equipement/resume/unpack/unpack-interface.ts
+++ b/src/views/equipement/resume/unpack/unpack-interface.ts
@@ -9,7 +9,7 @@
labCode: string // 实验室代码
groupCode: string // 组别代码、部门
- model: string // 型号规格
+ model: string // 规格型号
manufactureNo: string // 出厂编号
manufacturer: string // 生产厂家
limit: number
diff --git a/src/views/equipement/source/cert/cert-interface.ts b/src/views/equipement/source/cert/cert-interface.ts
index 0d35d04..3e1dc63 100644
--- a/src/views/equipement/source/cert/cert-interface.ts
+++ b/src/views/equipement/source/cert/cert-interface.ts
@@ -1,11 +1,17 @@
export interface IListQuery {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
- equipmentName: string // 设备名称
- equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
- validDateEnd: string // 检定有效期结束
- validDateStart: string // 检定有效期开始
+ certificateName: string // 证书名称
+ certificateNo: string // 证书编号
+ equipmentName: string // 设备名称
+ equipmentNo: string // 设备编号
+ manufactureNo: string // 出厂编号
+ manufacturer: string // 生产厂家
+ meterIdentify: string // 计量标识(字典code)
+ model: string // 规格型号
+ traceCompany: string // 溯源单位名
+ traceDateEnd: string // 测试、校准或检定日期结束
+ traceDateStart: string // 测试、校准或检定日期开始
+ validDateEnd: string // 检定有效期结束
+ validDateStart: string // 检定有效期开始
limit: number
offset: number
}
@@ -22,16 +28,24 @@
}
export interface IForm {
- certificateName: string // 证书名称
- certificateNo: string // 证书编号
+ certificateName?: string // 证书名称
+ certificateNo?: string // 证书编号
equipmentId: string // 设备id
equipmentName: string // 设备名称
equipmentNo: string // 设备编号
- traceCompany: string // 溯源单位名
+ model: string // 规格型号
+ manufacturer: string // 生产厂家
+ manufactureNo: string // 出厂编号
+ labCodeName: string // 实验室
+ labCode: string // 实验室
+ groupCode: string // 部门
+ groupCodeName: string // 部门名称
+ directorId: string // 负责人id
+ directorName: string // 负责人
+ validDate: string // 检定有效期
traceDate: string // 检定日期
- validDate: string // 证书有效期
- meterIdentify: string // 计量标识(字典code)
- meterIdentifyName: string // 计量标识(字典value)
+ certificateValid: string // 证书有效期
+ meterIdentify: string // 计量标识(字典code)
+ meterIdentifyName: string // 计量标识(字典value)
remark: string // 备注
- certificateFile: string // 证书报告附件
}
diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue
index f0aea4e..84d679e 100644
--- a/src/views/equipement/source/cert/detail.vue
+++ b/src/views/equipement/source/cert/detail.vue
@@ -34,7 +34,7 @@
equipmentId: '', // 设备id
equipmentName: '', // 设备名称
equipmentNo: '', // 设备编号
- model: '', // 型号规格
+ model: '', // 规格型号
manufacturer: '', // 生产厂家
manufactureNo: '', // 出厂编号
labCodeName: '', // 实验室
@@ -43,24 +43,22 @@
groupCodeName: '', // 部门名称
directorId: '', // 负责人id
directorName: '', // 负责人
- measureValidDate: '', // 检定有效期
+ validDate: '', // 检定有效期
traceDate: '', // 检定日期
- validDate: '', // 证书有效期
- // traceCompany: '', // 溯源单位名
- meterIdentify: '', // 计量标识(字典code)
+ certificateValid: '', // 证书有效期
+ meterIdentify: '1', // 计量标识(字典code)
meterIdentifyName: '', // 计量标识(字典value)
remark: '', // 备注
- // certificateFile: '', // 证书报告附件
})
// 校验规则
const formRules = ref({
- certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
- certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+ // certificateNo: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+ // certificateName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
equipmentNo: [{ required: true, message: '统一编号不能为空', trigger: ['blur', 'change'] }],
equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
traceCompany: [{ required: true, message: '溯源单位不能为空', trigger: ['blur', 'change'] }],
traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['blur', 'change'] }],
- validDate: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
+ certificateValid: [{ required: true, message: '证书有效期不能为空', trigger: ['blur', 'change'] }],
meterIdentify: [{ required: true, message: '计量标识不能为空', trigger: ['blur', 'change'] }],
})
@@ -72,7 +70,7 @@
// 获取字典值
async function getDict() {
// 计量标识
- getDictByCode('bizMeterIdentify').then((response) => {
+ getDictByCode('equipmentSourceMeterIdentify').then((response) => {
meterIdentifyDict.value = response.data
})
// 实验室
@@ -108,7 +106,7 @@
form.value.equipmentId = val[0].id // 设备id
form.value.equipmentName = res.data.equipmentInfoApproval.equipmentName // 设备名称
form.value.equipmentNo = res.data.equipmentInfoApproval.equipmentNo // 统一编号
- form.value.model = res.data.equipmentInfoApproval.model // 型号规格
+ form.value.model = res.data.equipmentInfoApproval.model // 规格型号
form.value.manufacturer = res.data.equipmentInfoApproval.manufacturer // 生产厂家
form.value.manufactureNo = res.data.equipmentInfoApproval.manufactureNo // 出厂编号
form.value.labCodeName = res.data.equipmentInfoApproval.labCodeName // 实验室
@@ -117,7 +115,7 @@
form.value.groupCodeName = res.data.equipmentInfoApproval.groupCodeName // 部门名称
form.value.directorId = res.data.equipmentInfoApproval.directorId // 负责人id
form.value.directorName = res.data.equipmentInfoApproval.directorName // 负责人
- form.value.measureValidDate = res.data.equipmentInfoApproval.measureValidDate // 检定有效期
+ form.value.validDate = res.data.equipmentInfoApproval.validDate // 检定有效期
})
}
}
@@ -130,13 +128,13 @@
certificateType: '', // 证书类型
certificateNo: '', // 证书编号
traceCompany: '', // 溯源单位
- jdzs: '', // 检定证书
+ certificateFile: '', // 检定证书
}
const columns = [ // 表头
{ text: '证书类型', value: 'certificateType', required: true },
{ text: '证书编号', value: 'certificateNo', required: true },
{ text: '溯源单位', value: 'traceCompany', required: true },
- { text: '检定证书', value: 'jdzs', required: true },
+ { text: '检定证书', value: 'certificateFile', required: true },
]
/**
@@ -160,18 +158,6 @@
const handleSelectionChange = (e: any) => {
checkoutList.value = e
}
-// --------------------------------------------选择溯源机构---------------------------------------
-const selectSourceDialogRef = ref() // 选择溯源机构组件ref
-// 点击选择溯源机构
-const selectsupplier = () => {
- selectSourceDialogRef.value.initDialog()
-}
-
-// 确定选择溯源机构
-const confirmSelectedSource = (val: any) => {
- form.value.traceCompany = val[0].supplierName // 溯源机构名称
-}
-
// -------------------------------------------文件上传--------------------------------------
const fileRef = ref() // 文件上传input
const uploadIndex = ref(0) // 要上传文件到第几行
@@ -190,7 +176,7 @@
})
UploadFile(fd).then((res) => {
if (res.code === 200) {
- list.value[uploadIndex.value].jdzs = res.data[0]
+ list.value[uploadIndex.value].certificateFile = res.data[0]
// 重置当前验证
ElMessage.success('文件上传成功')
loading.close()
@@ -214,15 +200,30 @@
// 保存
const save = () => {
+ if (!list.value.length) {
+ ElMessage.warning('表格不能为空')
+ return false
+ }
+ if (!useCheckList(list.value, columns, '表格')) { return false }
ruleFormRef.value!.validate((valid: boolean) => {
if (valid) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
+ const params = {
+ ...form.value,
+ id: infoId.value,
+ certificateDetailList: list.value.map((item: Object) => {
+ return {
+ ...item,
+ certificateId: infoId.value, // 证书主表id
+ }
+ }),
+ }
// 新建
if (pageType.value === 'add') { // 新建
- addSourceCertList(form.value).then((res) => {
+ addSourceCertList(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -232,7 +233,7 @@
}
// 保存
else if (pageType.value === 'edit') { // 编辑
- updateSourceCert({ ...form.value, id: infoId.value }).then((res) => {
+ updateSourceCert(params).then((res) => {
ElMessage.success('保存成功')
pageType.value = 'detail'
loading.close()
@@ -251,26 +252,15 @@
getDict().then(() => {
if (pageType.value !== 'add') {
form.value = $route.query as any
- form.value.certificateName = $route.query.certificateName as string // 证书名称
- form.value.certificateNo = $route.query.certificateNo as string // 证书编号
- form.value.equipmentId = $route.query.equipmentId as string // 设备id
- form.value.equipmentName = $route.query.equipmentName as string // 设备名称
- form.value.equipmentNo = $route.query.equipmentNo as string // 设备编号
- form.value.traceCompany = $route.query.traceCompany as string // 溯源单位名
- form.value.traceDate = $route.query.traceDate as string // 检定日期
- form.value.validDate = $route.query.validDate as string // 证书有效期
- form.value.meterIdentify = $route.query.meterIdentify as string // 计量标识(字典code)
- form.value.meterIdentifyName = $route.query.meterIdentifyName as string// 计量标识(字典value)
- form.value.remark = $route.query.remark as string // 备注
- form.value.certificateFile = $route.query.certificateFile as string // 证书报告附件
- infoId.value = $route.query.id as string// id
+ infoId.value = $route.query.id as string // id
+ list.value = JSON.parse($route.query.certificateDetailList as any)
}
})
})
-
+
@@ -377,9 +367,9 @@
-
+
-
+
-
-
@@ -503,30 +462,30 @@
*{{ item.text }}
-
-
+
+
测试
-
+
校准
-
+
检定
-
+
- {{ scope.row.jdzs === '' ? '上传' : '更换附件' }}
+ {{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
+ {{ scope.row[item.value] }}
@@ -539,9 +498,9 @@
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+
diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue
index 56a0f59..d1a3996 100644
--- a/src/views/equipement/source/cert/list.vue
+++ b/src/views/equipement/source/cert/list.vue
@@ -17,13 +17,19 @@
const loadingTable = ref(false)
// 查询条件
const listQuery: Ref = ref({
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
})
@@ -48,15 +54,17 @@
const checkoutList = ref([])
// -----------------------------------------字典--------------------------------------------------------------
-const meterIdentifyDict = ref([]) // 计量标识
+const meterIdentifyList = ref([]) // 计量标识
+const meterIdentifyDict = ref([]) as any // 计量标识
// 查询字典
const getDict = async () => {
// 计量标识
- getDictByCode('eqptMeterIdentify').then((response) => {
- meterIdentifyDict.value = response.data
+ const response = await getDictByCode('equipmentSourceMeterIdentify')
+ meterIdentifyList.value = response.data
+ response.data.forEach((item: { value: string; name: string }) => {
+ meterIdentifyDict.value[`${item.value}`] = item.name
})
}
-getDict()
// -------------------------------------------------------------------------------------------------------
// 多选发生改变时
function handleSelectionChange(e: any) {
@@ -71,11 +79,12 @@
listQuery.value.offset = 1
}
getSourceCertList(listQuery.value).then((response) => {
- list.value = response.data.rows.map((item: { traceDate: string; validDate: string }) => {
+ list.value = response.data.rows.map((item: { traceDate: string; validDate: string; meterIdentify: string }) => {
return {
...item,
traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate,
validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+ meterIdentifyName: `${item.meterIdentify}` ? meterIdentifyDict.value[item.meterIdentify] : item.meterIdentify, // 计量标识
}
})
total.value = parseInt(response.data.total)
@@ -85,13 +94,19 @@
// 清除条件
const clearList = () => {
listQuery.value = {
- certificateName: '', // 证书名称
- certificateNo: '', // 证书编号
- equipmentName: '', // 设备名称
- equipmentNo: '', // 设备编号
- traceCompany: '', // 溯源单位名
- validDateEnd: '', // 检定有效期结束
- validDateStart: '', // 检定有效期开始
+ certificateName: '', // 证书名称
+ certificateNo: '', // 证书编号
+ equipmentName: '', // 设备名称
+ equipmentNo: '', // 设备编号
+ manufactureNo: '', // 出厂编号
+ manufacturer: '', // 生产厂家
+ meterIdentify: '', // 计量标识(字典code)
+ model: '', // 规格型号
+ traceCompany: '', // 溯源单位名
+ traceDateEnd: '', // 测试、校准或检定日期结束
+ traceDateStart: '', // 测试、校准或检定日期开始
+ validDateEnd: '', // 检定有效期结束
+ validDateStart: '', // 检定有效期开始
limit: 20,
offset: 1,
}
@@ -123,7 +138,7 @@
}
// 操作
-const handleEdit = (row: IList, val: string) => {
+const handleEdit = (row: any, val: string) => {
switch (val) {
case 'delete':
ElMessageBox.confirm(
@@ -150,6 +165,7 @@
path: `cert/detail/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -158,6 +174,7 @@
path: `cert/${val}/${row.id}`,
query: {
...row,
+ certificateDetailList: JSON.stringify(row.certificateDetailList),
},
})
break
@@ -173,13 +190,19 @@
})
if (list.value.length > 0) {
const params = {
- approvalStatus: listQuery.value.approvalStatus, // 审批状态
- createTimeEnd: listQuery.value.createTimeEnd, // 申请时间结束
- createTimeStart: listQuery.value.createTimeStart, // 申请时间开始
- createUserName: listQuery.value.createUserName, // 申请人
- formId: listQuery.value.formId, // formid
- formName: listQuery.value.formName, // 情况表名字
- formNo: listQuery.value.formNo, // 情况表编号
+ certificateName: listQuery.value.certificateName, // 证书名称
+ certificateNo: listQuery.value.certificateNo, // 证书编号
+ equipmentName: listQuery.value.equipmentName, // 设备名称
+ equipmentNo: listQuery.value.equipmentNo, // 设备编号
+ manufactureNo: listQuery.value.manufactureNo, // 出厂编号
+ manufacturer: listQuery.value.manufacturer, // 生产厂家
+ meterIdentify: listQuery.value.meterIdentify, // 计量标识(字典code)
+ model: listQuery.value.model, // 规格型号
+ traceCompany: listQuery.value.traceCompany, // 溯源单位名
+ traceDateEnd: listQuery.value.traceDateEnd, // 测试、校准或检定日期结束
+ traceDateStart: listQuery.value.traceDateStart, // 测试、校准或检定日期开始
+ validDateEnd: listQuery.value.validDateEnd, // 检定有效期结束
+ validDateStart: listQuery.value.validDateStart, // 检定有效期开始
offset: 1,
limit: 20,
ids: checkoutList.value,
@@ -219,7 +242,9 @@
}
})
onMounted(async () => {
- fetchData(false)
+ getDict().then(() => {
+ fetchData(false)
+ })
})
@@ -278,7 +303,7 @@
placeholder="计量标识"
clearable
>
-
+
diff --git a/src/views/equipement/source/change/change-interface.ts b/src/views/equipement/source/change/change-interface.ts
index cd76ecb..3ce477d 100644
--- a/src/views/equipement/source/change/change-interface.ts
+++ b/src/views/equipement/source/change/change-interface.ts
@@ -46,9 +46,9 @@
changeTraceIllustrate: string // 拟变更溯源单位说明
changeReason: string // 变更原因
- standardQuantityPdfFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: string // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: string // 量值溯源与传递等级word(minio文件名)
+ relationFile: string // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: string // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: string // 量值溯源与传递等级word(minio文件名)
labCode: string // 实验室
labCodeName: string // 实验室名称
groupCode: string // 部门
diff --git a/src/views/equipement/source/change/components/basic.vue b/src/views/equipement/source/change/components/basic.vue
index b82a4f3..fdd104f 100644
--- a/src/views/equipement/source/change/components/basic.vue
+++ b/src/views/equipement/source/change/components/basic.vue
@@ -15,7 +15,7 @@
import { toTreeList } from '@/utils/structure'
import { getStaffList } from '@/api/resource/register'
import selectStandardDialog from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
-import { getGradeForm } from '@/api/equipment/standard/book'
+import { getGradeForm, updateHistory } from '@/api/equipment/standard/book'
import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
import { addChangeList, failUpdateChangeList, getInfo, submit, updateChangeList } from '@/api/equipment/source/change'
const props = defineProps({
@@ -60,9 +60,9 @@
changeTraceIllustrate: '', // 拟变更溯源单位说明
changeReason: '', // 变更原因
- standardQuantityPdfFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
- quantityPdfFile: '', // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: '', // 量值溯源与传递等级word(minio文件名)
+ relationFile: '', // 标准装置带来的量值溯源与传递等级关系图（pdf版本）
+ levelRelationFilePdf: '', // 量值溯源与传递等级pdf(minio文件名)
+ levelRelationFileWord: '', // 量值溯源与传递等级word(minio文件名)
labCode: '', // 实验室
labCodeName: '', // 实验室名称
groupCode: '', // 部门
@@ -144,13 +144,24 @@
getGradeForm({ id: form.value.standardId }).then((res) => {
if (res.data) {
- form.value.standardQuantityPdfFile = res.data.quantityPdfFile
+ form.value.relationFile = res.data.quantityPdfFile
}
})
}
}
// -----------------------------------------------保存----------------------------------------------
+// 更新标准装置-量值与溯源等级文件
+const updateQuantityFile = () => {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.levelRelationFilePdf, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.levelRelationFileWord, // 量值溯源与传递等级word(minio文件名)
+ standardId: form.value.standardId, // 标准装置id
+ }
+
+ updateHistory(params)
+}
+
/**
* 点击保存
* @param formEl 基本信息表单ref
@@ -235,15 +246,6 @@
loading.close()
})
}
-// -----------------------------------------获取详情------------------------------------------
-// 获取详情
-function fetchInfo() {
- loading.value = true
- getInfo({ id: infoId.value }).then((res) => {
- loading.value = false
- form.value = res.data
- })
-}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -257,7 +259,7 @@
ElMessage.warning('请上传doc、docx文件格式')
return
}
- UploadFileFn(event, 'quantityWordFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFileWord', '文件上传成功')
}
// pdf上传文件，在 Input 值改变时触发
const onQuantityPdfFileChange = (event: any) => {
@@ -265,7 +267,7 @@
ElMessage.warning('请上传pdf格式')
return
}
- UploadFileFn(event, 'quantityPdfFile', '文件上传成功')
+ UploadFileFn(event, 'levelRelationFilePdf', '文件上传成功')
}
// 上传文件操作
function UploadFileFn(event: any, prop: string, message: string) {
@@ -280,7 +282,7 @@
UploadFile(fd).then((res) => {
if (res.code === 200) {
form.value[prop] = res.data[0]
- if (prop === 'quantityPdfFile') {
+ if (prop === 'levelRelationFilePdf') {
getPhotoUrl(res.data[0]).then((res: any) => {
previewPdfUrl.value = res.data
})
@@ -301,7 +303,20 @@
const upload = (fileRef: any) => {
fileRef.click()
}
-
+// -----------------------------------------获取详情------------------------------------------
+// 获取详情
+function fetchInfo() {
+ loading.value = true
+ getInfo({ id: infoId.value }).then((res) => {
+ loading.value = false
+ form.value = res.data
+ if (form.value.levelRelationFilePdf) {
+ getPhotoUrl(form.value.levelRelationFilePdf).then((res: any) => {
+ previewPdfUrl.value = res.data
+ })
+ }
+ })
+}
// ---------------------------------------------钩子----------------------------------------------
watch(() => props.id, (newValue) => {
infoId.value = newValue!
@@ -397,7 +412,7 @@
-
-
-
-
+
无
@@ -497,6 +481,7 @@
@@ -509,6 +494,7 @@
@@ -521,6 +507,7 @@
@@ -533,24 +520,24 @@
-
- 无
+
+ 无
-
- {{ form.quantityWordFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFileWord === '' ? '上传' : '更换附件' }}
-
-
- 无
+
+
+ 无
-
- {{ form.quantityPdfFile === '' ? '上传' : '更换附件' }}
+
+ {{ form.levelRelationFilePdf === '' ? '上传' : '更换附件' }}
@@ -560,7 +547,7 @@
-
+