diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6b79004..5413923 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -174,18 +174,7 @@
...businessRoute,
],
},
- {
- meta: {
- title: '财务产值',
- icon: '',
- auth: '/finance',
- },
- children: [
- ...financialRoute,
- // MultilevelMenuExample,
- // BreadcrumbExample,
- ],
- },
+
{
meta: {
title: '测量设备',
@@ -219,6 +208,16 @@
},
{
meta: {
+ title: '市场财务',
+ icon: '',
+ auth: '/finance',
+ },
+ children: [
+ ...financialRoute,
+ ],
+ },
+ {
+ meta: {
title: '客户资源',
icon: '',
auth: '/customer',
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6b79004..5413923 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -174,18 +174,7 @@
...businessRoute,
],
},
- {
- meta: {
- title: '财务产值',
- icon: '',
- auth: '/finance',
- },
- children: [
- ...financialRoute,
- // MultilevelMenuExample,
- // BreadcrumbExample,
- ],
- },
+
{
meta: {
title: '测量设备',
@@ -219,6 +208,16 @@
},
{
meta: {
+ title: '市场财务',
+ icon: '',
+ auth: '/finance',
+ },
+ children: [
+ ...financialRoute,
+ ],
+ },
+ {
+ meta: {
title: '客户资源',
icon: '',
auth: '/customer',
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index a1a2364..5c011b8 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -165,13 +165,13 @@
},
)
.then(() => {
- cancelApproval(params).then((res) => {
- ElMessage({
- type: 'success',
- message: '取消成功',
- })
- fetchData(true)
- })
+ // cancelApproval(params).then((res) => {
+ // ElMessage({
+ // type: 'success',
+ // message: '取消成功',
+ // })
+ // fetchData(true)
+ // })
})
}
else if (val === '删除') {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6b79004..5413923 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -174,18 +174,7 @@
...businessRoute,
],
},
- {
- meta: {
- title: '财务产值',
- icon: '',
- auth: '/finance',
- },
- children: [
- ...financialRoute,
- // MultilevelMenuExample,
- // BreadcrumbExample,
- ],
- },
+
{
meta: {
title: '测量设备',
@@ -219,6 +208,16 @@
},
{
meta: {
+ title: '市场财务',
+ icon: '',
+ auth: '/finance',
+ },
+ children: [
+ ...financialRoute,
+ ],
+ },
+ {
+ meta: {
title: '客户资源',
icon: '',
auth: '/customer',
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index a1a2364..5c011b8 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -165,13 +165,13 @@
},
)
.then(() => {
- cancelApproval(params).then((res) => {
- ElMessage({
- type: 'success',
- message: '取消成功',
- })
- fetchData(true)
- })
+ // cancelApproval(params).then((res) => {
+ // ElMessage({
+ // type: 'success',
+ // message: '取消成功',
+ // })
+ // fetchData(true)
+ // })
})
}
else if (val === '删除') {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index b28f422..13ee3ab 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -288,6 +288,7 @@
).then(() => {
const params = {
...dataForm.value, // 表单
+ id: infoId.value,
customerSampleList: sampleList.value, // 表格
recieverSignTime: dayjs().format('YYYY-MM-DD'),
}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6b79004..5413923 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -174,18 +174,7 @@
...businessRoute,
],
},
- {
- meta: {
- title: '财务产值',
- icon: '',
- auth: '/finance',
- },
- children: [
- ...financialRoute,
- // MultilevelMenuExample,
- // BreadcrumbExample,
- ],
- },
+
{
meta: {
title: '测量设备',
@@ -219,6 +208,16 @@
},
{
meta: {
+ title: '市场财务',
+ icon: '',
+ auth: '/finance',
+ },
+ children: [
+ ...financialRoute,
+ ],
+ },
+ {
+ meta: {
title: '客户资源',
icon: '',
auth: '/customer',
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index a1a2364..5c011b8 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -165,13 +165,13 @@
},
)
.then(() => {
- cancelApproval(params).then((res) => {
- ElMessage({
- type: 'success',
- message: '取消成功',
- })
- fetchData(true)
- })
+ // cancelApproval(params).then((res) => {
+ // ElMessage({
+ // type: 'success',
+ // message: '取消成功',
+ // })
+ // fetchData(true)
+ // })
})
}
else if (val === '删除') {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index b28f422..13ee3ab 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -288,6 +288,7 @@
).then(() => {
const params = {
...dataForm.value, // 表单
+ id: infoId.value,
customerSampleList: sampleList.value, // 表格
recieverSignTime: dayjs().format('YYYY-MM-DD'),
}
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
new file mode 100644
index 0000000..db18a81
--- /dev/null
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6b79004..5413923 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -174,18 +174,7 @@
...businessRoute,
],
},
- {
- meta: {
- title: '财务产值',
- icon: '',
- auth: '/finance',
- },
- children: [
- ...financialRoute,
- // MultilevelMenuExample,
- // BreadcrumbExample,
- ],
- },
+
{
meta: {
title: '测量设备',
@@ -219,6 +208,16 @@
},
{
meta: {
+ title: '市场财务',
+ icon: '',
+ auth: '/finance',
+ },
+ children: [
+ ...financialRoute,
+ ],
+ },
+ {
+ meta: {
title: '客户资源',
icon: '',
auth: '/customer',
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index a1a2364..5c011b8 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -165,13 +165,13 @@
},
)
.then(() => {
- cancelApproval(params).then((res) => {
- ElMessage({
- type: 'success',
- message: '取消成功',
- })
- fetchData(true)
- })
+ // cancelApproval(params).then((res) => {
+ // ElMessage({
+ // type: 'success',
+ // message: '取消成功',
+ // })
+ // fetchData(true)
+ // })
})
}
else if (val === '删除') {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index b28f422..13ee3ab 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -288,6 +288,7 @@
).then(() => {
const params = {
...dataForm.value, // 表单
+ id: infoId.value,
customerSampleList: sampleList.value, // 表格
recieverSignTime: dayjs().format('YYYY-MM-DD'),
}
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
new file mode 100644
index 0000000..db18a81
--- /dev/null
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
new file mode 100644
index 0000000..8192416
--- /dev/null
+++ b/src/views/system/tool/certTempate/list.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 编辑
+
+
+ 详情
+
+
+ 下载
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6b79004..5413923 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -174,18 +174,7 @@
...businessRoute,
],
},
- {
- meta: {
- title: '财务产值',
- icon: '',
- auth: '/finance',
- },
- children: [
- ...financialRoute,
- // MultilevelMenuExample,
- // BreadcrumbExample,
- ],
- },
+
{
meta: {
title: '测量设备',
@@ -219,6 +208,16 @@
},
{
meta: {
+ title: '市场财务',
+ icon: '',
+ auth: '/finance',
+ },
+ children: [
+ ...financialRoute,
+ ],
+ },
+ {
+ meta: {
title: '客户资源',
icon: '',
auth: '/customer',
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index a1a2364..5c011b8 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -165,13 +165,13 @@
},
)
.then(() => {
- cancelApproval(params).then((res) => {
- ElMessage({
- type: 'success',
- message: '取消成功',
- })
- fetchData(true)
- })
+ // cancelApproval(params).then((res) => {
+ // ElMessage({
+ // type: 'success',
+ // message: '取消成功',
+ // })
+ // fetchData(true)
+ // })
})
}
else if (val === '删除') {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index b28f422..13ee3ab 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -288,6 +288,7 @@
).then(() => {
const params = {
...dataForm.value, // 表单
+ id: infoId.value,
customerSampleList: sampleList.value, // 表格
recieverSignTime: dayjs().format('YYYY-MM-DD'),
}
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
new file mode 100644
index 0000000..db18a81
--- /dev/null
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
new file mode 100644
index 0000000..8192416
--- /dev/null
+++ b/src/views/system/tool/certTempate/list.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 编辑
+
+
+ 详情
+
+
+ 下载
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2ef7f49..1a5a06c 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -1,4 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
new file mode 100644
index 0000000..8192416
--- /dev/null
+++ b/src/views/system/tool/certTempate/list.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 编辑
+
+
+ 详情
+
+
+ 下载
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2ef7f49..1a5a06c 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -1,4 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index b9694a0..ade4a4c 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -347,24 +347,44 @@
auth: '/sys/tool/autograph',
},
},
+ // {
+ // path: 'document',
+ // name: 'logDocument',
+ // component: () => import('@/views/system/tool/document/document.vue'),
+ // meta: {
+ // title: '原始记录模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/document',
+ // },
+ // },
+ // {
+ // path: 'certificate',
+ // name: 'logCertificate',
+ // component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ // meta: {
+ // title: '证书报告模板',
+ // icon: 'ep:key',
+ // auth: '/sys/tool/certificate',
+ // },
+ // },
{
- path: 'document',
- name: 'logDocument',
- component: () => import('@/views/system/tool/document/document.vue'),
+ path: 'certTemplate',
+ name: 'SystemToolCertTemplate',
+ component: () => import('@/views/system/tool/certTempate/list.vue'),
meta: {
- title: '原始记录模板',
+ title: '证书模板管理',
icon: 'ep:key',
- auth: '/sys/tool/document',
+ auth: '/sys/tool/certTemplate',
},
},
{
- path: 'certificate',
- name: 'logCertificate',
- component: () => import('@/views/system/tool/certificate/certificate.vue'),
+ path: 'fileTemplate',
+ name: 'SystemToolFileTemplate',
+ component: () => import('@/views/system/tool/fileTemplate/list.vue'),
meta: {
- title: '证书报告模板',
+ title: '文件模板管理',
icon: 'ep:key',
- auth: '/sys/tool/certificate',
+ auth: '/sys/tool/fileTemplate',
},
},
{
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6b79004..5413923 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -174,18 +174,7 @@
...businessRoute,
],
},
- {
- meta: {
- title: '财务产值',
- icon: '',
- auth: '/finance',
- },
- children: [
- ...financialRoute,
- // MultilevelMenuExample,
- // BreadcrumbExample,
- ],
- },
+
{
meta: {
title: '测量设备',
@@ -219,6 +208,16 @@
},
{
meta: {
+ title: '市场财务',
+ icon: '',
+ auth: '/finance',
+ },
+ children: [
+ ...financialRoute,
+ ],
+ },
+ {
+ meta: {
title: '客户资源',
icon: '',
auth: '/customer',
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index a1a2364..5c011b8 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -165,13 +165,13 @@
},
)
.then(() => {
- cancelApproval(params).then((res) => {
- ElMessage({
- type: 'success',
- message: '取消成功',
- })
- fetchData(true)
- })
+ // cancelApproval(params).then((res) => {
+ // ElMessage({
+ // type: 'success',
+ // message: '取消成功',
+ // })
+ // fetchData(true)
+ // })
})
}
else if (val === '删除') {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index b28f422..13ee3ab 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -288,6 +288,7 @@
).then(() => {
const params = {
...dataForm.value, // 表单
+ id: infoId.value,
customerSampleList: sampleList.value, // 表格
recieverSignTime: dayjs().format('YYYY-MM-DD'),
}
diff --git a/src/views/system/tool/certTempate/addDDialog.vue b/src/views/system/tool/certTempate/addDDialog.vue
new file mode 100644
index 0000000..db18a81
--- /dev/null
+++ b/src/views/system/tool/certTempate/addDDialog.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
new file mode 100644
index 0000000..8192416
--- /dev/null
+++ b/src/views/system/tool/certTempate/list.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 编辑
+
+
+ 详情
+
+
+ 下载
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2ef7f49..1a5a06c 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -1,4 +1,3 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/tool/fileTemplate/list.vue b/src/views/system/tool/fileTemplate/list.vue
new file mode 100644
index 0000000..c5ee694
--- /dev/null
+++ b/src/views/system/tool/fileTemplate/list.vue
@@ -0,0 +1,281 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 编辑
+
+
+ 详情
+
+
+ 下载
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+