- 申请管理 我的申请页面

- 申请管理 我的代办页面
- 申请管理 已办任务页面
- 装置审计问卷审批流程

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TQuestionnaireController.java

@@ -73,58 +73,39 @@ public class TQuestionnaireController extends BaseController
     public AjaxResult handle(@RequestBody DevTask devTask) {
         TProgress progress = devTask.getProgress();
         TQuestionnaire questionnaire = tQuestionnaireService.selectTQuestionnaireById(progress.getQuestionnaireId());
-        String taskId = progress.getTaskId();
-        String taskName = progress.getTaskName();
+        String taskId = devTask.getTaskId();
+        String taskName = devTask.getTaskName();
         String condition = devTask.getCondition();
         Map<String, Object> param = new HashMap<>();
         param.put("condition", condition);
-//
-//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-//        TaskService taskService = processEngine.getTaskService();
-//        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-////        String processInstancesId = task.getProcessInstanceId();
-//        processEngine.getTaskService().claim(taskId, getUserId().toString());
-//        taskService.complete(taskId, param);
-//
-//        if (taskName.equals("审核")) {
-//            if ("1".equals(condition)) {
-//                // 进度审批状态修改为4-已通过
-//                progress.setApplyStatus("4");
-//                // 问卷完成情况修改为1-完成
-//                questionnaire.setCompletionStatus("1");
-//            } else {
-//                // 进度审批状态修改为3-未通过
-//                progress.setApplyStatus("3");
-//            }
-//        }
-//
-//        tProgressService.updateTProgress(progress);
-//        String year = questionnaire.getYear();
-//        if (StringUtils.isNotEmpty(year) && !"".equals(year) && year.length() > 4) {
-//            questionnaire.setYear(year.substring(0, year.indexOf("-")));
-//        }
-//        tQuestionnaireService.updateTQuestionnaire(questionnaire);
-//
-//        return AjaxResult.success();
-
-        // 使用任务id,获取任务对象，获取流程实例id
-//        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-
-        if ("1".equals(condition)) {
-            // 进度审批状态修改为4-已通过
-            progress.setApplyStatus("4");
-            // 问卷完成情况修改为1-完成
-            questionnaire.setCompletionStatus("1");
-        } else {
-            // 进度审批状态修改为3-未通过
-            progress.setApplyStatus("3");
+        String comment = "";
+        if (taskName.equals("提交申请")) {
+            // 进度审批状态修改为2-待审核
+            progress.setApplyStatus("2");
+            comment = "重新提交";
+        } else if (taskName.equals("审核")) {
+            if ("1".equals(condition)) {
+                // 进度审批状态修改为4-已通过
+                progress.setApplyStatus("4");
+                // 问卷完成情况修改为1-完成
+                questionnaire.setCompletionStatus("1");
+                comment = "通过";
+            } else {
+                // 进度审批状态修改为3-未通过
+                progress.setApplyStatus("3");
+                comment = "驳回";
+            }
         }
+        // 使用任务id,获取任务对象，获取流程实例id
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        //利用任务对象，获取流程实例id
+        String processInstancesId = task.getProcessInstanceId();
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         TaskService taskService = processEngine.getTaskService();
         //认领任务
         processEngine.getTaskService()
                 .claim(taskId, getUserId().toString());
-//        taskService.addComment(taskId, processInstancesId, devTask.getComment());
+        taskService.addComment(taskId, processInstancesId, comment);
         taskService.complete(taskId, param);
         // 标记taskId、TaskName
         List<Task> list = processEngine.getTaskService()//获取任务service
@@ -169,23 +150,25 @@ public class TQuestionnaireController extends BaseController
         TaskService taskService = processEngine.getTaskService();
         List<Task> list = taskService.createTaskQuery().taskCandidateOrAssigned(userId).list();
         String taskId = null;
+        String processInstanceId = null;
         for (Task task : list) {
-            if (task.getProcessInstanceId().equals(pi.getProcessInstanceId())) {
+            processInstanceId = task.getProcessInstanceId();
+            if (processInstanceId.equals(pi.getProcessInstanceId())) {
                 taskId = task.getId();
-                System.out.println(taskId);
             }
         }
         processEngine.getTaskService().claim(taskId, getUserId().toString());
+        taskService.addComment(taskId, processInstanceId, "无");
         taskService.complete(taskId, param);
 
-        Task nextTask = taskService.createTaskQuery().singleResult();
-        tProgress.setTaskId(nextTask.getId());
-        tProgress.setTaskName(nextTask.getName());
-        System.out.println(nextTask.getId());
+//        Task nextTask = taskService.createTaskQuery().singleResult();
+//        tProgress.setTaskId(nextTask.getId());
+//        tProgress.setTaskName(nextTask.getName());
 
         tProgress.setProcessId(pi.getProcessInstanceId());
         tProgress.setApNo(DateUtils.dateTimeNow() + userId);
-        tProgress.setApplyStatus("2");//进度审批状态修改为2-待审核
+        // 进度审批状态修改为2-待审核
+        tProgress.setApplyStatus("2");
 
         tProgressService.updateTProgress(tProgress);
 

rc-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/rcaudit??zeroDateTimeBehavior=convertToNull
+                url: jdbc:mysql://localhost:3306/rcaudit?zeroDateTimeBehavior=convertToNull
                 username: root
                 password: root
             # 从库数据源

ruoyi-ui/src/views/rc/approve/detail/questionnaire-detail.vue

@@ -1,7 +1,44 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="visible" :append-to-body="true" width="600px">
 
-    <span>{{progress}}</span>
+    <el-descriptions title="详细信息" :column="2" border>
+      <el-descriptions-item :span="2" label="章节">{{progress.chapName}}</el-descriptions-item>
+      <el-descriptions-item :span="2" label="细分章节">{{progress.subChapName}}</el-descriptions-item>
+      <el-descriptions-item :span="2" label="二级细分章节">{{progress.secSubChapName}}</el-descriptions-item>
+      <el-descriptions-item :span="2" label="内容">{{progress.content}}</el-descriptions-item>
+      <el-descriptions-item :span="1" label="负责人">
+        <span
+          v-for="dict in userOptions"
+          v-if="progress.personInCharge==dict.dictValue"
+          v-text="dict.dictLabel"
+        ></span>
+      </el-descriptions-item>
+      <el-descriptions-item :span="1" label="支持人">
+        <span
+          v-for="dict in userOptions"
+          v-if="progress.supporter==dict.dictValue"
+          v-text="dict.dictLabel"
+        ></span>
+      </el-descriptions-item>
+      <el-descriptions-item :span="1" label="开始日期">{{progress.startDate}}</el-descriptions-item>
+      <el-descriptions-item :span="1" label="目标日期">{{progress.targetDate}}</el-descriptions-item>
+      <el-descriptions-item :span="1" label="实际完成日期">{{progress.finishDate}}</el-descriptions-item>
+      <el-descriptions-item :span="1" label="准备情况">
+        <span
+          v-for="dict in dict.type.t_progress_preparation"
+          v-if="progress.preparation==dict.value"
+          v-text="dict.label"
+        ></span>
+      </el-descriptions-item>
+      <el-descriptions-item :span="2" label="进度描述">
+        <span
+          v-for="dict in dict.type.t_progress_description"
+          v-if="progress.progress==dict.value"
+          v-text="dict.label"
+        ></span>
+      </el-descriptions-item>
+      <el-descriptions-item :span="2" label="备注">{{progress.remarks}}</el-descriptions-item>
+    </el-descriptions>
 
     <el-table :data="historyList" border v-loading="historyLoading" style="width: 100%;">
       <el-table-column width="100" prop="taskName" header-align="center" align="center" label="流程进度"></el-table-column>
@@ -12,8 +49,8 @@
     </el-table>
 
     <div slot="footer" class="dialog-footer">
-      <el-button type="success" @click="dataFormSubmit(1)">通 过</el-button>
-      <el-button type="info" @click="dataFormSubmit(0)">驳 回</el-button>
+      <el-button v-if="type == 2" type="success" @click="dataFormSubmit(1)">通 过</el-button>
+      <el-button v-if="type == 2" type="info" @click="dataFormSubmit(0)">驳 回</el-button>
       <el-button @click="visible = false">返回</el-button>
     </div>
   </el-dialog>
@@ -21,15 +58,14 @@
 
 <script>
   import { getToken } from "@/utils/auth";
-  import { treeselect, listDept } from "@/api/system/dept";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import {getHistorylist} from "@/api/rc/approvedanger";
   import { handleQuestionnaire } from "@/api/rc/questionnaire";
+  import { listAllUser } from "@/api/system/user";
 
 export default {
   name: "questionnaire-detail",
-  components: { Treeselect },
+  components: {  },
+  dicts: ['t_progress_preparation', 't_progress_description' ],
   data() {
     return {
       rules: {
@@ -43,20 +79,40 @@ export default {
       // rejectList: [],
       historyLoading: true,
       dialogType: 0,
-      progress: 0,
+      progress: null,
+      type: 0,
+      // 用户列表
+      userOptions: [],
     }
   },
   methods: {
-    init(progress, taskId, processId, taskName, dialogType) {
+    init(progress, taskId, processId, taskName, type) {
+      this.getUserList();
       this.progress = progress;
+      this.type = type;
       this.taskForm.progress = progress;
+      this.taskForm.taskId = taskId;
+      this.taskForm.processId = processId;
+      this.taskForm.taskName = taskName;
       // 流转列表
       getHistorylist({ "processId": processId }).then(response => {
         this.historyList = response.rows;
         this.historyLoading = false
       });
       this.visible = true;
-      this.getTreeselect();
+    },
+    /** 查询用户列表 */
+    getUserList() {
+      listAllUser().then(response => {
+        let data = response.data;
+        for (let i = 0; i < data.length; i++) {
+          // 非顶级节点
+          if (data[i].parentId !== 0) {
+            // 插入装置列表
+            this.userOptions.push({"dictLabel": data[i].nickName, "dictValue": data[i].userId});
+          }
+        }
+      });
     },
     reset() {
       this.taskForm =  {
@@ -71,12 +127,6 @@ export default {
         this.$emit('refreshDataList');
       });
     },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      treeselect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
   }
 }
 </script>

ruoyi-ui/src/views/rc/approve/myapprove/index.vue

@@ -32,7 +32,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -47,16 +46,12 @@
 
 <script>
   import {getMyApprovelist} from "@/api/rc/approvedanger";
-  import {treeselect} from "@/api/system/dept";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import ProcessImg from '../processImg'
   import QuestionnaireDetail from "@/views/rc/approve/detail/questionnaire-detail";
 
   export default {
     name: "Myapprove",
     components: {
-      Treeselect,
       ProcessImg,
       QuestionnaireDetail
     },
@@ -120,7 +115,6 @@
         this.clientHeight = document.body.clientHeight -200
       })
       this.getList();
-      this.getTreeselect();
     },
     methods: {
       /** 查询隐患申请列表 */
@@ -138,16 +132,10 @@
           this.title = '处理问卷审批流程';
           this.questionnaireVisible = true
           this.$nextTick(() => {
-            this.$refs.questionnaireDetail.init(row.progress, row.taskId, row.processId, row.taskName)
+            this.$refs.questionnaireDetail.init(row.progress, row.taskId, row.processId, row.taskName, 1)
           })
         }
       },
-      /** 查询部门下拉树结构 */
-      getTreeselect() {
-        treeselect().then(response => {
-          this.deptOptions = response.data;
-        });
-      },
       // 装置名称字典翻译
       plantCodeFormat(row, column) {
         return this.selectDictLabel(this.plantCodeOptions, row.plantCode);

ruoyi-ui/src/views/rc/approve/pending/index.vue

@@ -1,15 +1,5 @@
 <template >
   <div class="app-container">
-    <!-- 顶部工具栏 -->
-    <!--<el-row :gutter="10">-->
-      <!--<div class="top-right-btn">-->
-        <!--<el-row>-->
-          <!--<el-tooltip  effect="dark" :content="tagsView.refresh" placement="top">-->
-            <!--<el-button size="mini" circle icon="el-icon-refresh" @click="getList()" />-->
-          <!--</el-tooltip>-->
-        <!--</el-row>-->
-      <!--</div>-->
-    <!--</el-row>-->
     <el-table v-loading="loading" :data="approvedangerList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="流程ID" align="center" prop="processId" :show-overflow-tooltip="true"/>
@@ -34,7 +24,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -42,139 +31,30 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!--&lt;!&ndash; 弹窗, 新增 / 修改 &ndash;&gt;-->
-    <!--<div v-if="addOrUpdateVisible">-->
-      <!--<el-dialog  :close-on-click-modal="false" v-dialogDrag :visible.sync="addOrUpdateVisible" :destroy-on-close="true">-->
-        <!--<add-or-update v-if="this.infoprocessName === ($t('重大隐患')+' '+ $t('审批流程') )|| this.infoprocessName === ($t('普通隐患')+' ' + $t('审批流程') )" :info="approveInfo"></add-or-update>-->
-        <!--<accident v-if="this.infoprocessName === ($t('事件')+ $t('审批流程'))" :info="approveInfo" @recordInfo="approveChange($event)"></accident>-->
-        <!--<el-form>-->
-          <!--<el-form-item :label="$t('上传措施前照片')" prop="before" v-if="this.infoTaskName === '执行人'">-->
-            <!--<el-upload-->
-              <!--ref="uploadbefore"-->
-              <!--:limit="1"-->
-              <!--:headers="uploadbefore.headers"-->
-              <!--:action="uploadbefore.url"-->
-              <!--:disabled="uploadbefore.isUploading"-->
-              <!--:on-progress="handleFileUploadProgressBefore"-->
-              <!--:on-success="handleFileSuccessBefore"-->
-              <!--:auto-upload="true"-->
-              <!--drag-->
-            <!--&gt;-->
-              <!--<i class="el-icon-upload"></i>-->
-              <!--<div class="el-upload__text">-->
-                <!--{{ $t('将文件拖到此处，或') }}-->
-                <!--<em>{{ $t('点击上传') }}</em>-->
-              <!--</div>-->
-            <!--</el-upload>-->
-          <!--</el-form-item>-->
-          <!--<el-form-item :label="$t('上传措施后照片')" prop="after" v-if="this.infoTaskName === $t('执行人')">-->
-            <!--<el-upload-->
-              <!--ref="uploadafter"-->
-              <!--:limit="1"-->
-              <!--:headers="uploadafter.headers"-->
-              <!--:action="uploadafter.url"-->
-              <!--:disabled="uploadafter.isUploading"-->
-              <!--:on-progress="handleFileUploadProgressAfter"-->
-              <!--:on-success="handleFileSuccessAfter"-->
-              <!--drag-->
-            <!--&gt;-->
-              <!--<i class="el-icon-upload"></i>-->
-              <!--<div class="el-upload__text">-->
-                <!--{{ $t('将文件拖到此处，或') }}-->
-                <!--<em>{{ $t('点击上传') }}</em>-->
-              <!--</div>-->
-            <!--</el-upload>-->
-          <!--</el-form-item>-->
-          <!--<el-form-item :label="$t('审批意见')" prop="comment">-->
-            <!--<el-input v-model="comment" :placeholder="$t('请输入') + $t('审批意见')" maxlength="100" show-word-limit></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-form>-->
-        <!--<span v-if="this.infoprocessName ===  ($t('重大隐患')+' ' + $t('审批流程') ) || this.infoprocessName === ($t('普通隐患')+' '  + $t('审批流程') )" slot="footer">-->
-          <!--<span v-if="this.infoTaskName === $t('执行人')" class="dialog-footer">-->
-            <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('已完成') }}</el-button>-->
-            <!--<el-button type="danger" @click="dataFormSubmit(0)">{{ $t('无法执行') }}</el-button>-->
-          <!--</span>-->
-          <!--<span v-if="this.infoTaskName === $t('验证人')" class="dialog-footer">-->
-            <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('通过') }}</el-button>-->
-            <!--<el-button type="danger" @click="dataFormSubmit(0)">{{ $t('无效') }}</el-button>-->
-            <!--<el-button type="warning" @click="dataFormSubmit(2)">{{ $t('未达标') }}</el-button>-->
-          <!--</span>-->
-          <!--<span v-if="this.infoTaskName === $t('记录人')" class="dialog-footer">-->
-            <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('重新提交') }}</el-button>-->
-          <!--</span>-->
-          <!--<span v-if="this.infoTaskName === $t('确认')" class="dialog-footer">-->
-            <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('确认') }}</el-button>-->
-            <!--<el-button type="danger" @click="dataFormSubmit(0)">{{ $t('确认')+' ' + $t('不通过') }}</el-button>-->
-          <!--</span>-->
-        <!--</span>-->
-        <!--<span v-if="this.infoprocessName === ($t('事件') + $t('审批流程'))" slot="footer">-->
-          <!--<span v-if="this.infoTaskName === $t('记录人')" class="dialog-footer">-->
-            <!--<el-button type="primary" @click="dataFormSubmit(1)">{{ $t('提交') }}</el-button>-->
-          <!--</span>-->
-        <!--</span>-->
-      <!--</el-dialog>-->
-    <!--</div>-->
-
-    <!--<add-or-update v-if="specDealVisible" ref="specDeal" @refreshDataList="getList"></add-or-update>-->
-    <!--<spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>-->
-    <!--<spec-training-plan v-if="specTrainingPlanDealVisible" ref="specTrainingPlanDeal" @refreshDataList="getList"></spec-training-plan>-->
     <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
-    <!--<intact-resolve v-if="intactResolveVisible" ref="intactResolveDeal" @refreshDataList="getList"></intact-resolve>-->
-    <!--<kekao-resolve v-if="kekaoResolveVisible" ref="kekaoResolveDeal" @refreshDataList="getList"></kekao-resolve>-->
-    <!--<spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>-->
-    <!--<invoice-detail v-if="invoiceDetailVisible" ref="invoiceDetail" @refreshDataList="getList"></invoice-detail>-->
-    <!--<offlinevalve-detail v-if="offlinevalveDetailVisible" ref="offlinevalveDetail" @refreshDataList="getList"></offlinevalve-detail>-->
-    <!--<safetychange-detail v-if="safetychangeDetailVisible" ref="safetychangeDetail" @refreshDataList="getList"></safetychange-detail>-->
-    <common-detail v-if="commonVisible" ref="commonDetail" @refreshDataList="getList"/>
+    <questionnaire-detail v-if="questionnaireVisible" ref="questionnaireDetail" @refreshDataList="getList"/>
   </div>
 </template>
 
 <script>
   import {getPendinglist, handleApprovedanger} from "@/api/rc/approvedanger";
   import ProcessImg from '../processImg/index';
-  import {treeselect} from "@/api/system/dept";
-  import {getToken} from "@/utils/auth";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import CommonDetail from "@/views/rc/approve/detail/common-detail";
-  // import SpecMaintenance from "@/views/approve/pending/specMaintenance-deal";
-  // import KekaoResolve from '../approveDetail/kekao-resolve';
-  // import InvoiceDetail from "@/views/approve/approveDetail/invoice-detail";
-  // import OfflinevalveDetail from "@/views/approve/approveDetail/offlinevalve-detail";
-  // import SafetychangeDetail from "@/views/approve/approveDetail/safetychange-detail";
-  // import SaiApplyDetail from "@/views/approve/approveDetail/sai-apply-detail";
-  // import AddOrUpdate from './spec-detail';
-  // import SpecModify from './specModify-deal';
-  // import SpecTrainingPlan from './specTrainingPlan-deal';
-  // import IntactResolve from '../approveDetail/intact-resolve';
-  // import Accident from '../approveaccidentDetail/index';
+  import {getToken} from "@/utils/auth"
+  import QuestionnaireDetail from "@/views/rc/approve/detail/questionnaire-detail";
 
   export default {
     name: "Pending",
     components: {
-      CommonDetail,
-      Treeselect,
       ProcessImg,
+      QuestionnaireDetail
     },
     data() {
       return {
         // 遮罩层
         loading: true,
         //弹窗界面是否开启
-        addOrUpdateVisible: false,
+        questionnaireVisible: false,
         processImgVisible: false,
-        specDealVisible: false,
-        specModifyDealVisible: false,
-        specTrainingPlanDealVisible: false,
-        intactResolveVisible:false,
-        kekaoResolveVisible:false,
-        specMaintenanceVisible: false,
-        invoiceDetailVisible:false,
-        offlinevalveDetailVisible:false,
-        safetychangeDetailVisible:false,
-        saiApplyVisible:false,
-        commonVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -273,7 +153,6 @@
         this.clientHeight = document.body.clientHeight -200
       })
       this.getList();
-      this.getTreeselect();
       this.getDicts("PLANT_DIVIDE").then(response => {
         this.plantCodeOptions = response.data;
       });
@@ -288,12 +167,6 @@
           this.loading = false;
         });
       },
-      /** 查询部门下拉树结构 */
-      getTreeselect() {
-        treeselect().then(response => {
-          this.deptOptions = response.data;
-        });
-      },
       // 装置名称字典翻译
       plantCodeFormat(row, column) {
         return this.selectDictLabel(this.plantCodeOptions, row.plantCode);
@@ -334,10 +207,11 @@
       },
       //操作审批流程
       addOrUpdateHandle (row) {
-        if (row.processName == "通用审批流程") {
-          this.commonVisible = true
+        if (row.processName == "问卷审批流程") {
+          this.title = '处理问卷审批流程';
+          this.questionnaireVisible = true
           this.$nextTick(() => {
-            this.$refs.commonDetail.init(row.obj.memberId, row.taskId, row.processId, row.taskName, 1)
+            this.$refs.questionnaireDetail.init(row.progress, row.taskId, row.processId, row.taskName, 2)
           })
         }
       },

ruoyi-ui/src/views/rc/approve/taskdone/index.vue

@@ -6,7 +6,6 @@
       <el-table-column label="流程名称" align="center" prop="processName" :show-overflow-tooltip="true"/>
       <el-table-column label="流程创建时间" align="center" prop="processCreateTime" :show-overflow-tooltip="true"/>
       <el-table-column label="申请人姓名" align="center" prop="apName" :show-overflow-tooltip="true"/>
-<!--      <el-table-column :label="$t('隐患级别')" align="center" prop="tApprove.hiddendangerLevel" :show-overflow-tooltip="true"/>-->
       <el-table-column label="申请编号" align="center" prop="apNo" :show-overflow-tooltip="true"/>
       <el-table-column
         prop="isEnd"
@@ -35,7 +34,6 @@
         </template>
       </el-table-column>
       </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -43,76 +41,28 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 弹窗, 查看 -->
-<!--    <div v-if="addOrUpdateVisible">-->
-<!--      <el-dialog  :close-on-click-modal="false" v-dialogDrag :visible.sync="addOrUpdateVisible" :destroy-on-close="true">-->
-<!--        <add-or-update :info="approveInfo"></add-or-update>-->
-<!--      </el-dialog>-->
-<!--    </div>-->
     <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
-    <!--<add-or-update v-if="specDealVisible" ref="specDeal" @refreshDataList="getList"></add-or-update>-->
-    <!--<spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>-->
-    <!--<spec-training-plan v-if="specTrainingPlanVisible" ref="specTrainingPlan" @refreshDataList="getList"></spec-training-plan>-->
-    <!--<spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>-->
-    <!--<intact-detail v-if="intactDetailVisible" ref="intactDetail" @refreshDataList="getList"></intact-detail>-->
-    <!--<kekao-detail v-if="kekaoDetailVisible" ref="kekaoDetail" @refreshDataList="getList"></kekao-detail>-->
-    <!--<invoice-detail v-if="invoiceDetailVisible" ref="invoiceDetail" @refreshDataList="getList"></invoice-detail>-->
-    <!--<offlinevalve-detail v-if="offlinevalveDetailVisible" ref="offlinevalveDetail" @refreshDataList="getList"></offlinevalve-detail>-->
-    <!--<safetychange-detail v-if="safetychangeDetailVisible" ref="safetychangeDetail" @refreshDataList="getList"></safetychange-detail>-->
-    <!--<sai-apply-detail v-if="saiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></sai-apply-detail>-->
-    <common-detail v-if="commonVisible" ref="commonDetail" @refreshDataList="getList"/>
+    <questionnaire-detail v-if="questionnaireVisible" ref="questionnaireDetail" @refreshDataList="getList"/>
   </div>
 </template>
 
 <script>
   import { getTaskdonelist } from "@/api/rc/approvedanger";
-  // import AddOrUpdate from '../approveDetail/spec-detail';
-  import { treeselect } from "@/api/system/dept";
-  // import { getToken } from "@/utils/auth";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import QuestionnaireDetail from "@/views/rc/approve/detail/questionnaire-detail";
   import ProcessImg from "../processImg/index";
 
-  import CommonDetail from "@/views/rc/approve/detail/common-detail";
-  // import SpecModify from '../approveDetail/specModify-detail';
-  // import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
-  // import SpecMaintenance from "@/views/approve/approveDetail/specMaintenance-detail";
-  // import IntactDetail from "@/views/approve/approveDetail/intact-detail";
-  // import KekaoDetail from "@/views/approve/approveDetail/kekao-detail";
-  // import InvoiceDetail from "@/views/approve/approveDetail/invoice-detail";
-  // import OfflinevalveDetail from "@/views/approve/approveDetail/offlinevalve-detail";
-  // import SafetychangeDetail from "@/views/approve/approveDetail/safetychange-detail";
-  // import SaiApplyDetail from "@/views/approve/approveDetail/sai-apply-detail";
-
   export default {
     name: "Taskdone",
     components: {
-    //   SaiApplyDetail,
-    //   SafetychangeDetail,
-    //   OfflinevalveDetail,
-      Treeselect,
-      CommonDetail,
-    // AddOrUpdate,
       ProcessImg,
-      // SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail,KekaoDetail,InvoiceDetail
+      QuestionnaireDetail
     },
     data() {
       return {
         // 遮罩层
         loading: true,
         processImgVisible: false,
-        specDealVisible: false,
-        specModifyDealVisible: false,
-        specTrainingPlanVisible: false,
-        specMaintenanceVisible: false,
-        intactDetailVisible:false,
-        kekaoDetailVisible:false,
-        invoiceDetailVisible:false,
-        offlinevalveDetailVisible:false,
-        safetychangeDetailVisible:false,
-        saiApplyVisible:false,
-        commonVisible: false,
+        questionnaireVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -171,10 +121,6 @@
         this.clientHeight = document.body.clientHeight -200
       })
       this.getList();
-      this.getTreeselect();
-      this.getDicts("PLANT_DIVIDE").then(response => {
-        this.plantCodeOptions = response.data;
-      });
     },
     methods: {
       /** 查询隐患申请列表 */
@@ -186,18 +132,13 @@
           this.loading = false;
         });
       },
-      /** 查询部门下拉树结构 */
-      getTreeselect() {
-        treeselect().then(response => {
-          this.deptOptions = response.data;
-        });
-      },
       /** 查看操作 */
       handleView (row) {
-        if (row.processName == "通用审批流程") {
-          this.commonVisible = true
+        if (row.processName == "问卷审批流程") {
+          this.title = '处理问卷审批流程';
+          this.questionnaireVisible = true
           this.$nextTick(() => {
-            this.$refs.commonDetail.init(row.obj.memberId, row.taskId, row.processId, row.taskName, 2)
+            this.$refs.questionnaireDetail.init(row.progress, row.taskId, row.processId, row.taskName, 3)
           })
         }
       },

ruoyi-ui/src/views/rc/questionnaire/index.vue

@@ -221,7 +221,7 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="MinimumStandard" prop="minimumStandard">
+        <el-form-item label="Minimum Standard" prop="minimumStandard">
           <el-input v-model="form.minimumStandard" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="Good Practices" prop="goodPractices">