diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43171f4..5a4393d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -182,6 +182,18 @@
},
},
{
+ path: 'measureData/batchEdit',
+ name: 'MeasureDataBatchEdit',
+ component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'),
+ meta: {
+ title: '检定数据管理',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/taskMeasure/measureDataList',
+ },
+ },
+ {
path: 'certificateList',
name: 'CertificateList',
component: () => import('@/views/business/taskMeasure/certificate/list.vue'),
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43171f4..5a4393d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -182,6 +182,18 @@
},
},
{
+ path: 'measureData/batchEdit',
+ name: 'MeasureDataBatchEdit',
+ component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'),
+ meta: {
+ title: '检定数据管理',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/taskMeasure/measureDataList',
+ },
+ },
+ {
path: 'certificateList',
name: 'CertificateList',
component: () => import('@/views/business/taskMeasure/certificate/list.vue'),
diff --git a/src/utils/String.ts b/src/utils/String.ts
index 3421359..4505c82 100644
--- a/src/utils/String.ts
+++ b/src/utils/String.ts
@@ -4,7 +4,7 @@
export const clearSymbol = (str: any) => {
let string = ''
// 替换字符串中的所有特殊字符(包含空格)
- const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
+ const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '')
return string
}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43171f4..5a4393d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -182,6 +182,18 @@
},
},
{
+ path: 'measureData/batchEdit',
+ name: 'MeasureDataBatchEdit',
+ component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'),
+ meta: {
+ title: '检定数据管理',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/taskMeasure/measureDataList',
+ },
+ },
+ {
path: 'certificateList',
name: 'CertificateList',
component: () => import('@/views/business/taskMeasure/certificate/list.vue'),
diff --git a/src/utils/String.ts b/src/utils/String.ts
index 3421359..4505c82 100644
--- a/src/utils/String.ts
+++ b/src/utils/String.ts
@@ -4,7 +4,7 @@
export const clearSymbol = (str: any) => {
let string = ''
// 替换字符串中的所有特殊字符(包含空格)
- const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
+ const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '')
return string
}
diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue
new file mode 100644
index 0000000..8dc7ee0
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/batchEdit.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+ 保存
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43171f4..5a4393d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -182,6 +182,18 @@
},
},
{
+ path: 'measureData/batchEdit',
+ name: 'MeasureDataBatchEdit',
+ component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'),
+ meta: {
+ title: '检定数据管理',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/taskMeasure/measureDataList',
+ },
+ },
+ {
path: 'certificateList',
name: 'CertificateList',
component: () => import('@/views/business/taskMeasure/certificate/list.vue'),
diff --git a/src/utils/String.ts b/src/utils/String.ts
index 3421359..4505c82 100644
--- a/src/utils/String.ts
+++ b/src/utils/String.ts
@@ -4,7 +4,7 @@
export const clearSymbol = (str: any) => {
let string = ''
// 替换字符串中的所有特殊字符(包含空格)
- const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
+ const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '')
return string
}
diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue
new file mode 100644
index 0000000..8dc7ee0
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/batchEdit.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+ 保存
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4797f2b..afff6a9 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1,5 +1,4 @@
-
+
+
+
+
+
+
+ 保存
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4797f2b..afff6a9 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1,5 +1,4 @@
-
+
+
+
+
+
+
+ 保存
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4797f2b..afff6a9 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1,5 +1,4 @@
-
@@ -809,7 +841,7 @@
:height="200"
:print-form="printForm"
/>
-
+
生成原始记录和检定证书
@@ -828,6 +860,7 @@
+
@@ -835,10 +868,7 @@
-
-
-
-
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43171f4..5a4393d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -182,6 +182,18 @@
},
},
{
+ path: 'measureData/batchEdit',
+ name: 'MeasureDataBatchEdit',
+ component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'),
+ meta: {
+ title: '检定数据管理',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/taskMeasure/measureDataList',
+ },
+ },
+ {
path: 'certificateList',
name: 'CertificateList',
component: () => import('@/views/business/taskMeasure/certificate/list.vue'),
diff --git a/src/utils/String.ts b/src/utils/String.ts
index 3421359..4505c82 100644
--- a/src/utils/String.ts
+++ b/src/utils/String.ts
@@ -4,7 +4,7 @@
export const clearSymbol = (str: any) => {
let string = ''
// 替换字符串中的所有特殊字符(包含空格)
- const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
+ const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '')
return string
}
diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue
new file mode 100644
index 0000000..8dc7ee0
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/batchEdit.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+ 保存
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4797f2b..afff6a9 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1,5 +1,4 @@
-
@@ -809,7 +841,7 @@
:height="200"
:print-form="printForm"
/>
-
+
生成原始记录和检定证书
@@ -828,6 +860,7 @@
+
@@ -835,10 +868,7 @@
-
-
-
-
+
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index 3e51a71..8f24390 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -379,6 +379,10 @@
// --------------------------------------点击批量编辑------------------------------------------------
const batchEdit = () => {
+ if (!checkoutListAllContent.value.length) {
+ ElMessage.warning('请先选择需要编辑的数据')
+ return false
+ }
if (checkoutListAllContent.value.length > 4) {
ElMessage.warning('最多可编辑4个')
return false
@@ -387,11 +391,25 @@
ElMessage.warning('只允许配置同一个检定项的数据')
return false
}
+ if (!checkoutListAllContent.value.every((item: any) => item.belongStandardEquipment === '4')) {
+ ElMessage.warning('仅0.02级活塞式压力计支持批量编辑')
+ return false
+ }
+ // if (!checkoutListAllContent.value.every((item: any) => item.belongStandardEquipment === checkoutListAllContent.value[0].belongStandardEquipment)) {
+ // ElMessage.warning('只允许配置同一套标准装置')
+ // return false
+ // }
+ const notCompliantIndex = checkoutListAllContent.value.findIndex((item: any) => (item.certificateId || item.dataSource === '自动检定系统'))
+ if (notCompliantIndex !== -1) {
+ ElMessage.warning(`第${notCompliantIndex + 1}项不满足编辑条件`)
+ return false
+ }
$router.push({
- path: 'measureData/edit',
+ path: 'measureData/batchEdit',
query: {
batchEdit: 'true',
batchEditRow: JSON.stringify(checkoutListAllContent.value),
+ belongStandardEquipment: checkoutListAllContent.value[0].belongStandardEquipment,
},
})
}
@@ -570,7 +588,7 @@
-
+
import('@/views/business/taskMeasure/measureData/batchEdit.vue'),
+ meta: {
+ title: '检定数据管理',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/taskMeasure/measureDataList',
+ },
+ },
+ {
path: 'certificateList',
name: 'CertificateList',
component: () => import('@/views/business/taskMeasure/certificate/list.vue'),
diff --git a/src/utils/String.ts b/src/utils/String.ts
index 3421359..4505c82 100644
--- a/src/utils/String.ts
+++ b/src/utils/String.ts
@@ -4,7 +4,7 @@
export const clearSymbol = (str: any) => {
let string = ''
// 替换字符串中的所有特殊字符(包含空格)
- const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
+ const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g
string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '')
return string
}
diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue
new file mode 100644
index 0000000..8dc7ee0
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/batchEdit.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+ 保存
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4797f2b..afff6a9 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1,5 +1,4 @@
-
@@ -809,7 +841,7 @@
:height="200"
:print-form="printForm"
/>
-
+
生成原始记录和检定证书
@@ -828,6 +860,7 @@
+
@@ -835,10 +868,7 @@
-
-
-
-
+
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index 3e51a71..8f24390 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -379,6 +379,10 @@
// --------------------------------------点击批量编辑------------------------------------------------
const batchEdit = () => {
+ if (!checkoutListAllContent.value.length) {
+ ElMessage.warning('请先选择需要编辑的数据')
+ return false
+ }
if (checkoutListAllContent.value.length > 4) {
ElMessage.warning('最多可编辑4个')
return false
@@ -387,11 +391,25 @@
ElMessage.warning('只允许配置同一个检定项的数据')
return false
}
+ if (!checkoutListAllContent.value.every((item: any) => item.belongStandardEquipment === '4')) {
+ ElMessage.warning('仅0.02级活塞式压力计支持批量编辑')
+ return false
+ }
+ // if (!checkoutListAllContent.value.every((item: any) => item.belongStandardEquipment === checkoutListAllContent.value[0].belongStandardEquipment)) {
+ // ElMessage.warning('只允许配置同一套标准装置')
+ // return false
+ // }
+ const notCompliantIndex = checkoutListAllContent.value.findIndex((item: any) => (item.certificateId || item.dataSource === '自动检定系统'))
+ if (notCompliantIndex !== -1) {
+ ElMessage.warning(`第${notCompliantIndex + 1}项不满足编辑条件`)
+ return false
+ }
$router.push({
- path: 'measureData/edit',
+ path: 'measureData/batchEdit',
query: {
batchEdit: 'true',
batchEditRow: JSON.stringify(checkoutListAllContent.value),
+ belongStandardEquipment: checkoutListAllContent.value[0].belongStandardEquipment,
},
})
}
@@ -570,7 +588,7 @@
-
+
Number(dayjs().format('YYYY')) - 5; i--) {
name2.push(i)
}
- showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0].xAxisData = name2.reverse
+ showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0].xAxisData = name2.map(item => String(item)).reverse()
showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0].data = name1.map(item => ({
name: item,
data: name2.map(item => Math.floor(Math.random() * 100) + 1),