联调 技术监督 草稿功能

This commit is contained in:
GGJ
2024-06-20 16:54:19 +08:00
parent ac1335985f
commit 3a49fbf6a8
15 changed files with 256 additions and 98 deletions

View File

@@ -77,6 +77,7 @@ const tableStore = new TableStore({
}
},
{ field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
{ field: 'reformAdvice', title: '整改意见', minWidth: '150' },
{ field: 'leafletName', title: '单据名称', minWidth: '150' },
{ field: 'issueDetail', title: '告警内容', minWidth: '150' },
{
@@ -139,7 +140,14 @@ const tableStore = new TableStore({
return row.status !== 5
},
click: row => {
feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail, row.problemPath)
feedbackPopup.value.open(
'填报反馈单',
row.id,
row.status,
row.issueDetail,
row.problemPath,
row.reformAdvice
)
}
},
@@ -150,7 +158,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
disabled: row => {
return row.status == 5
return !row.processInstanceId
},
click: row => {
handleAudit(row.processInstanceId, row.historyInstanceId)
@@ -172,6 +180,8 @@ const tableStore = new TableStore({
row.status,
row.issueDetail,
row.problemPath,
row.reformAdvice ,
row.takeStep,
row.reportPath
)
@@ -194,8 +204,10 @@ const tableStore = new TableStore({
row.status,
row.issueDetail,
row.problemPath,
row.reformAdvice ,
row.takeStep,
row.reportPath
row.reportPath,
row.reformAdvice
)
}
},

View File

@@ -61,6 +61,7 @@ const tableStore = new TableStore({
}
},
{ field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
{ field: 'reformAdvice', title: '整改意见', minWidth: '150' },
{ field: 'leafletName', title: '单据名称', minWidth: '150' },
{
field: 'status',
@@ -68,6 +69,7 @@ const tableStore = new TableStore({
minWidth: '150',
render: 'tag',
custom: {
0: 'warning',
1: 'primary',
2: 'success',
3: 'danger',
@@ -75,6 +77,7 @@ const tableStore = new TableStore({
5: 'primary'
},
replaceValue: {
0: '待提交审批',
1: '审批中',
2: '审批通过',
3: '审批不通过',
@@ -120,7 +123,14 @@ const tableStore = new TableStore({
return row.status !== 5
},
click: row => {
feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail, row.problemPath)
feedbackPopup.value.open(
'填报反馈单',
row.id,
row.status,
row.issueDetail,
row.problemPath,
row.reformAdvice
)
}
},
{
@@ -130,12 +140,35 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
disabled: row => {
return row.status == 5
return !row.processInstanceId
},
click: row => {
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
{
name: 'edit',
title: '编辑',
type: 'primary',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || !(row.status == 0)
},
click: row => {
feedbackPopup.value.open(
'编辑',
row.id,
row.status,
row.issueDetail,
row.problemPath,
row.reformAdvice,
row.takeStep,
row.reportPath
)
}
},
{
name: 'edit',
title: '重新发起',
@@ -153,6 +186,7 @@ const tableStore = new TableStore({
row.status,
row.issueDetail,
row.problemPath,
row.reformAdvice,
row.takeStep,
row.reportPath
)

View File

@@ -11,6 +11,15 @@
readonly
/>
</el-form-item>
<el-form-item label="整改意见:">
<el-input
v-model="form.reformAdvice"
autocomplete="off"
type="textarea"
:autosize="{ minRows: 2, maxRows: 6 }"
readonly
/>
</el-form-item>
<el-form-item label="问题附件:" v-if="showFile">
<el-icon class="elView" v-if="problemDetail?.problemName">
@@ -82,6 +91,7 @@ const form = ref({
id: '',
status: '',
issueDetail: '',
reformAdvice: '',
takeStep: '',
reportPath: []
})
@@ -113,6 +123,7 @@ const open = async (
status: any,
issueDetail: string,
problemPath?: string,
reformAdvice?: string,
takeStep?: string,
reportPath?: string
) => {
@@ -134,6 +145,7 @@ const open = async (
form.value.id = id
form.value.status = status
form.value.issueDetail = issueDetail
form.value.reformAdvice = reformAdvice
reportFilePath.value = reportPath
//判断附件是否存在,如果存在则回显出让用户可以点击下载
if (problemPath) {
@@ -159,6 +171,7 @@ const close = () => {
id: '',
status: '',
issueDetail: '',
reformAdvice: '',
takeStep: '',
reportPath: []
}
@@ -172,7 +185,7 @@ const submit = (flag: boolean) => {
let subForm = JSON.parse(JSON.stringify(form.value))
subForm = {
...subForm,
reportPath: reportFilePath.value
reportPath: form.value.reportPath.length > 0 ? reportFilePath.value : null
}
subForm.saveOrCheckflag = '1'
//此时该告警单处于待反馈状态
@@ -188,7 +201,7 @@ const submit = (flag: boolean) => {
let subForm = JSON.parse(JSON.stringify(form.value))
subForm = {
...subForm,
reportPath: reportFilePath.value
reportPath: form.value.reportPath.length > 0 ? reportFilePath.value : null
}
if (!reportFilePath.value) {
return ElMessage({