|
|
@@ -102,7 +102,7 @@
|
|
|
style="width: 240px"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in dict.type.syx_record_stage"
|
|
|
+ v-for="dict in dict.type.sys_record_stage"
|
|
|
:key="dict.value"
|
|
|
:label="dict.label"
|
|
|
:value="dict.value"
|
|
|
@@ -120,6 +120,21 @@
|
|
|
end-placeholder="结束日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="审核状态" prop="processStatus">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.processStatus"
|
|
|
+ placeholder="审核状态"
|
|
|
+ clearable
|
|
|
+ style="width: 240px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_process_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -272,7 +287,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag
|
|
|
- :options="dict.type.syx_record_stage"
|
|
|
+ :options="dict.type.sys_record_stage"
|
|
|
:value="scope.row.projectStatus"
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -287,11 +302,25 @@
|
|
|
/>
|
|
|
<!-- :show-overflow-tooltip="true" -->
|
|
|
<el-table-column
|
|
|
+ label="审核状态"
|
|
|
+ align="center"
|
|
|
+ key="processStatus"
|
|
|
+ prop="processStatus"
|
|
|
+ v-if="columns[11].visible"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag
|
|
|
+ :options="dict.type.sys_process_status"
|
|
|
+ :value="scope.row.processStatus"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
label="审核人员"
|
|
|
align="center"
|
|
|
key="examineName"
|
|
|
prop="examineName"
|
|
|
- v-if="columns[11].visible"
|
|
|
+ v-if="columns[12].visible"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
label="审核时间"
|
|
|
@@ -299,7 +328,7 @@
|
|
|
align="center"
|
|
|
key="examineTime"
|
|
|
prop="examineTime"
|
|
|
- v-if="columns[12].visible"
|
|
|
+ v-if="columns[13].visible"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
label="附件"
|
|
|
@@ -401,7 +430,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
|
export default {
|
|
|
name: "Record",
|
|
|
- dicts: ["sys_user_fulljob", "syx_record_stage"],
|
|
|
+ dicts: ["sys_user_fulljob", "sys_record_stage", "sys_process_status"],
|
|
|
components: { Treeselect },
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -492,8 +521,9 @@ export default {
|
|
|
{ key: 8, label: `项目名称`, visible: true },
|
|
|
{ key: 9, label: `创建任务`, visible: true },
|
|
|
{ key: 10, label: `日报内容`, visible: true },
|
|
|
- { key: 11, label: `研发人员`, visible: true },
|
|
|
- { key: 12, label: `研发时间`, visible: true },
|
|
|
+ { key: 11, label: `审核状态`, visible: true },
|
|
|
+ { key: 12, label: `审核人员`, visible: true },
|
|
|
+ { key: 13, label: `审核时间`, visible: true },
|
|
|
],
|
|
|
// 表单校验
|
|
|
rules: {
|
dev01