diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 153d4cc..f722fa0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -312,10 +312,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 153d4cc..f722fa0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -312,10 +312,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index bb932dd..bb9a92e 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -236,11 +236,11 @@
}
// 同意
const agree = (row: ITableRow) => {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
// 驳回
const reject = (row: ITableRow) => {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
// 拒绝
const refuse = (row: ITableRow) => {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 153d4cc..f722fa0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -312,10 +312,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index bb932dd..bb9a92e 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -236,11 +236,11 @@
}
// 同意
const agree = (row: ITableRow) => {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
// 驳回
const reject = (row: ITableRow) => {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
// 拒绝
const refuse = (row: ITableRow) => {
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 60436a6..980c557 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -269,10 +269,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 153d4cc..f722fa0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -312,10 +312,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index bb932dd..bb9a92e 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -236,11 +236,11 @@
}
// 同意
const agree = (row: ITableRow) => {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
// 驳回
const reject = (row: ITableRow) => {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
// 拒绝
const refuse = (row: ITableRow) => {
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 60436a6..980c557 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -269,10 +269,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 1198b22..9284df6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -261,10 +261,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 153d4cc..f722fa0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -312,10 +312,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index bb932dd..bb9a92e 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -236,11 +236,11 @@
}
// 同意
const agree = (row: ITableRow) => {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
// 驳回
const reject = (row: ITableRow) => {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
// 拒绝
const refuse = (row: ITableRow) => {
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 60436a6..980c557 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -269,10 +269,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 1198b22..9284df6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -261,10 +261,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2d52594..970561c 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -293,10 +293,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 153d4cc..f722fa0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -312,10 +312,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index bb932dd..bb9a92e 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -236,11 +236,11 @@
}
// 同意
const agree = (row: ITableRow) => {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
// 驳回
const reject = (row: ITableRow) => {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
// 拒绝
const refuse = (row: ITableRow) => {
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 60436a6..980c557 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -269,10 +269,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 1198b22..9284df6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -261,10 +261,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2d52594..970561c 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -293,10 +293,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git "a/\345\206\205\347\275\221.zip" "b/\345\206\205\347\275\221.zip"
deleted file mode 100644
index 8d2cc6a..0000000
--- "a/\345\206\205\347\275\221.zip"
+++ /dev/null
Binary files differ
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 086cc14..6b6b4b8 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -38,6 +38,7 @@
// agree同意 refuse拒绝 reject驳回 revoke取消
const userInfo = useUserStore()
+const decisionItem = ref('')
// ---------------表单提交--------------------------------
// 表单对象
@@ -51,7 +52,8 @@
* @param type 审批类型
* @param taskId 任务id
*/
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, decisionItemParam = '1') {
+ decisionItem.value = `${decisionItemParam}`
formData.type = type
formData.taskId = taskId
formData.user = userInfo.name
@@ -124,10 +126,10 @@
同意
-
+
驳回
-
+
拒绝
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9c4581f..b58d1d8 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -188,6 +188,7 @@
stripe
:size="size"
style="width: 100%;"
+ :row-key="(row) => { return row.id }"
@selection-change="handleSelectionChange"
@select="selectClick"
@row-click="rowClick"
@@ -199,7 +200,7 @@
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 76e76dc..448823e 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -192,10 +192,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 9f2b522..7afc7c4 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -270,14 +270,15 @@
// return
// }
// }
- if (formInline.value.fileList.length) {
- // 检查表格是否存在增加行信息没有完善的情况
- const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
- if (result !== 'pass') {
- ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
- return
- }
- }
+
+ // if (formInline.value.fileList.length) {
+ // // 检查表格是否存在增加行信息没有完善的情况
+ // const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+ // if (result !== 'pass') {
+ // ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+ // return
+ // }
+ // }
if (!formEl) { return }
await formEl.validate((valid) => {
if (valid) {
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 22a3eb2..82d57f9 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -250,10 +250,10 @@
goDetail(row, 'edit')
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
index dc73f9f..f3e4a87 100644
--- a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -122,9 +122,9 @@
同意
-
+
拒绝
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index e834ed3..2633a89 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -221,10 +221,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index b7f0071..650fcb6 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -241,10 +241,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/business/subpackage/certificate/edit.vue b/src/views/business/subpackage/certificate/edit.vue
index 53dfb36..2ef6256 100644
--- a/src/views/business/subpackage/certificate/edit.vue
+++ b/src/views/business/subpackage/certificate/edit.vue
@@ -123,6 +123,10 @@
const onFileChangeCertificateFile = (event: any) => {
// 原生上传
if (event.target.files?.length !== 0) {
+ if (event.target.files[0].type !== 'application/pdf') {
+ ElMessage.warning('请上传pdf格式文件')
+ return false
+ }
// 创建formdata对象
const fd = new FormData()
fd.append('multipartFile', event.target.files[0])
@@ -348,7 +352,7 @@
-
+
无
@@ -360,7 +364,7 @@
-
+
无
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 119d852..721a49c 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -231,16 +231,6 @@
-
-
-
-
-
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index 239bc1d..30bec71 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -197,7 +197,7 @@
// 提交
const handleSubmit = () => {
console.log(detailForm.value.id)
- if (detailForm.value.id) {
+ if (submitId.value) {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index f3d3091..20e3113 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -218,7 +218,7 @@
},
)
.then(() => {
- submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkProcessId }).then((res: any) => {
+ submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_CHECK, processId: row.checkApprovalStatusName === '已取消' ? row.checkProcessId : '' }).then((res: any) => {
ElMessage({
type: 'success',
message: '已提交',
@@ -228,13 +228,13 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
- approvalDialog.value.initDialog('refuse', row.taskId)
+ approvalDialog.value.initDialog('refuse', row.taskId, row.decisionItem)
}
else if (val === 'detail' || val === 'edit') { // 详情和编辑
$router.push({
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 09ccf9e..9697cdb 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -358,10 +358,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 622c199..4386d5f 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -288,10 +288,10 @@
// $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index ba6cc7d..8980548 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -316,10 +316,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 46249b0..d0df822 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -268,10 +268,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 153d4cc..f722fa0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -312,10 +312,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index bb932dd..bb9a92e 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -236,11 +236,11 @@
}
// 同意
const agree = (row: ITableRow) => {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
// 驳回
const reject = (row: ITableRow) => {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
// 拒绝
const refuse = (row: ITableRow) => {
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 60436a6..980c557 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -269,10 +269,10 @@
})
}
else if (val === '同意') {
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
}
else if (val === '驳回') {
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
}
else if (val === '拒绝') {
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 1198b22..9284df6 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -261,10 +261,10 @@
}
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2d52594..970561c 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -293,10 +293,10 @@
})
break
case '同意':
- approvalDialog.value.initDialog('agree', row.taskId)
+ approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
break
case '驳回':
- approvalDialog.value.initDialog('reject', row.taskId)
+ approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
break
case '拒绝':
approvalDialog.value.initDialog('refuse', row.taskId)
diff --git "a/\345\206\205\347\275\221.zip" "b/\345\206\205\347\275\221.zip"
deleted file mode 100644
index 8d2cc6a..0000000
--- "a/\345\206\205\347\275\221.zip"
+++ /dev/null
Binary files differ
diff --git "a/\345\244\226\347\275\221.zip" "b/\345\244\226\347\275\221.zip"
deleted file mode 100644
index 30ded25..0000000
--- "a/\345\244\226\347\275\221.zip"
+++ /dev/null
Binary files differ