PSSR:

-添加检修项目创建流程

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -223,15 +223,6 @@ public class TPssrApproveController extends BaseController {
     // 检修项目审批流程发起申请
     public void do01Approve(TPssrSubcontent sub) {
         String userId = getUserId().toString();
-        //新增审批数据
-        TPssrApprove approve = new TPssrApprove();
-        approve.setSubId(sub.getId());
-        approve.setApNo(DateUtils.dateTimeNow() + userId);
-        approve.setApproveStatus("1");
-        approve.setSubCharge(sub.getConfirm());
-        approve.setCreaterCode(userId);
-        approve.setCreatedate(new Date());
-        tPssrApproveService.insertTPssrApprove(approve);
         //修改所有表的审批状态
         TPssrOverhaulExchanger exchanger = new TPssrOverhaulExchanger();
         exchanger.setSubId(sub.getId());
@@ -276,6 +267,17 @@ public class TPssrApproveController extends BaseController {
         TPssrOverhaulExchanger tPssrOverhaulExchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(exchanger);
         String confirmers = tPssrOverhaulExchanger.getConfirmedPerson();
         logger.info("=======================confirmers:{}", confirmers);
+
+        //新增审批数据
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(sub.getId());
+        approve.setApNo(DateUtils.dateTimeNow() + userId);
+        approve.setApproveStatus("1");
+        approve.setSubCharge(sub.getConfirm());
+        approve.setCreaterCode(userId);
+        approve.setCreatedate(new Date());
+        tPssrApproveService.insertTPssrApprove(approve);
+
         // 开始申请流程
         long businessKey = approve.getApproveId();
         //开始工作流、监听

master/src/main/resources/mybatis/pssr/TPssrContentModelMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by serial_number
     </select>
     
     <select id="selectTPssrContentModelById" parameterType="Long" resultMap="TPssrContentModelResult">

ui/src/components/DictTag/index.vue

@@ -15,7 +15,7 @@
           :class="item.raw.cssClass"
           :disable-transitions="true"
           :index="index"
-          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
+          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass||showType"
         >
           {{ item.label + " " }}
         </el-tag>
@@ -35,6 +35,10 @@ export default {
       type: Array,
       default: null,
     },
+    showType: {
+      type: String,
+      default: 'primary',
+    },
     value: [Number, String, Array],
     // 当未找到匹配的数据时，显示value
     showValue: {

ui/src/views/pssr/aboveall/index.vue

@@ -276,6 +276,7 @@ import {listUserNoPage} from "@/api/system/user";
 import {listSubcontent} from "@/api/pssr/subcontent";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Aboveall",
   components: {Treeselect},
   data() {

ui/src/views/pssr/airtight/index.vue

@@ -403,6 +403,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Airtight",
   components: { Treeselect },
   props: {

ui/src/views/pssr/alarm/index.vue

@@ -291,6 +291,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Alarm",
   components: { Treeselect },
   props: {

ui/src/views/pssr/analyzer/index.vue

@@ -364,6 +364,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Analyzer",
   components: { Treeselect },
   props: {

ui/src/views/pssr/approve/index.vue

@@ -315,6 +315,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Approve",
   components: { Treeselect },
   data() {

ui/src/views/pssr/blind/index.vue

@@ -591,6 +591,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Blind",
   components: { Treeselect },
   props: {

ui/src/views/pssr/circuit/index.vue

@@ -436,6 +436,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Circuit",
   components: { Treeselect },
   props: {

ui/src/views/pssr/cleaning/index.vue

@@ -369,6 +369,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Cleaning",
   components: { Treeselect },
   // components: { Editor },

ui/src/views/pssr/frame/index.vue

@@ -427,6 +427,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Frame",
   components: { Treeselect },
   props: {

ui/src/views/pssr/franklinism/index.vue

@@ -343,6 +343,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Franklinism",
   components: { Treeselect },
   // components: { Editor },

ui/src/views/pssr/gasdetector/index.vue

@@ -364,6 +364,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Gasdetector",
   components: { Treeselect },
   props: {

ui/src/views/pssr/hygiene/index.vue

@@ -317,6 +317,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Hygiene",
   components: { Treeselect },
   // components: { Editor },

ui/src/views/pssr/instrumentCalibration/index.vue

@@ -377,6 +377,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "InstrumentCalibration",
   components: { Treeselect },
   props: {

ui/src/views/pssr/instrumentTest/index.vue

@@ -291,6 +291,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "InstrumentTest",
   components: { Treeselect },
   props: {

ui/src/views/pssr/lighting/index.vue

@@ -343,6 +343,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Lighting",
   components: { Treeselect },
   // components: { Editor },

ui/src/views/pssr/lock/index.vue

@@ -482,6 +482,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Lock",
   components: { Treeselect },
   props: {

ui/src/views/pssr/material/index.vue

@@ -351,6 +351,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Material",
   components: { Treeselect },
   props: {

ui/src/views/pssr/motor/index.vue

@@ -364,6 +364,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Motor",
   components: { Treeselect },
   props: {

ui/src/views/pssr/nitrogen/index.vue

@@ -377,6 +377,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Nitrogen",
   components: { Treeselect },
   props: {

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -139,7 +139,11 @@
     <el-table v-loading="loading" :data="overhaulExchangerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
@@ -279,6 +283,7 @@ import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "OverhaulExchanger",
   components: {Treeselect},
   props: {
@@ -391,6 +396,15 @@ export default {
     })
   },
   methods: {
+    getTagType(val){
+      if (val==0){
+        return ''
+      }else if (val==1){
+        return 'warning'
+      }else if (val==2){
+        return 'success'
+      }
+    },
     checkSelectable(row) {
       console.log(this.isApprove)
       return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0

ui/src/views/pssr/overhaulFilter/index.vue

@@ -123,7 +123,11 @@
     <el-table v-loading="loading" :data="overhaulFilterList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="装置" align="center" prop="plant" :show-overflow-tooltip="true"/>
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="过滤网位置" align="center" prop="strainerLocation" :show-overflow-tooltip="true"/>
@@ -289,6 +293,7 @@ import {doApprove} from "@/api/pssr/approve";
 
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "OverhaulFilter",
   components: {Treeselect},
   props: {
@@ -423,6 +428,15 @@ export default {
     })
   },
   methods: {
+    getTagType(val){
+      if (val==0){
+        return ''
+      }else if (val==1){
+        return 'warning'
+      }else if (val==2){
+        return 'success'
+      }
+    },
     checkSelectable(row) {
       console.log(this.isApprove)
       return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0

ui/src/views/pssr/overhaulPipe/index.vue

@@ -114,7 +114,11 @@
     <el-table v-loading="loading" :data="overhaulPipeList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="管线号" align="center" prop="pipelineNo" :show-overflow-tooltip="true"/>
       <el-table-column label="更换原因" align="center" prop="changeReason" :show-overflow-tooltip="true"/>
       <el-table-column label="P&ID图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
@@ -251,6 +255,7 @@ import {getSubcontent} from "@/api/pssr/subcontent";
 
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "OverhaulPipe",
   components: {Treeselect},
   props: {
@@ -362,6 +367,15 @@ export default {
     })
   },
   methods: {
+    getTagType(val){
+      if (val==0){
+        return ''
+      }else if (val==1){
+        return 'warning'
+      }else if (val==2){
+        return 'success'
+      }
+    },
     checkSelectable(row) {
       console.log(this.isApprove)
       return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0

ui/src/views/pssr/overhaulPump/index.vue

@@ -123,7 +123,11 @@
     <el-table v-loading="loading" :data="overhaulPumpList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
@@ -264,6 +268,7 @@ import {getSubcontent} from "@/api/pssr/subcontent";
 
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "OverhaulPump",
   components: {Treeselect},
   props: {
@@ -376,6 +381,15 @@ export default {
     })
   },
   methods: {
+    getTagType(val){
+      if (val==0){
+        return ''
+      }else if (val==1){
+        return 'warning'
+      }else if (val==2){
+        return 'success'
+      }
+    },
     checkSelectable(row) {
       console.log(this.isApprove)
       return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0

ui/src/views/pssr/overhaulTower/index.vue

@@ -125,7 +125,11 @@
     <el-table v-loading="loading" :data="overhaulTowerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
@@ -266,6 +270,7 @@ import {getSubcontent} from "@/api/pssr/subcontent";
 
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "OverhaulTower",
   components: {Treeselect},
   props: {
@@ -378,6 +383,15 @@ export default {
     })
   },
   methods: {
+    getTagType(val){
+      if (val==0){
+        return ''
+      }else if (val==1){
+        return 'warning'
+      }else if (val==2){
+        return 'success'
+      }
+    },
     checkSelectable(row) {
       console.log(this.isApprove)
       return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0

ui/src/views/pssr/overhaulValve/index.vue

@@ -122,7 +122,11 @@
     <el-table v-loading="loading" :data="overhaulValveList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable"/>
-      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="升级改型更换/更换/维修" align="center" prop="changeType" :show-overflow-tooltip="true"
                        width="180"/>
       <el-table-column label="连接形式" align="center" prop="connectionForm" :show-overflow-tooltip="true" width="180"/>
@@ -317,6 +321,7 @@ import {getSubcontent} from "@/api/pssr/subcontent";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "OverhaulValve",
   components: {Treeselect},
   props: {
@@ -440,6 +445,15 @@ export default {
     })
   },
   methods: {
+    getTagType(val){
+      if (val==0){
+        return ''
+      }else if (val==1){
+        return 'warning'
+      }else if (val==2){
+        return 'success'
+      }
+    },
     checkSelectable(row) {
       console.log(this.isApprove)
       return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0

ui/src/views/pssr/patrol/index.vue

@@ -334,6 +334,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Patrol",
   components: { Treeselect },
   props: {

ui/src/views/pssr/pipe/index.vue

@@ -390,6 +390,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Pipe",
   components: { Treeselect },
   props: {

ui/src/views/pssr/programme/index.vue

@@ -304,6 +304,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Programme",
   components: { Treeselect },
   props: {

ui/src/views/pssr/protection/index.vue

@@ -330,6 +330,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Protection",
   components: { Treeselect },
   // components: { Editor },

ui/src/views/pssr/pssrModel/index.vue

@@ -205,6 +205,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "PssrModel",
   components: {Treeselect},
   // components: { Editor },

ui/src/views/pssr/public/index.vue

@@ -317,6 +317,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Public",
   components: { Treeselect },
   // components: { Editor },

ui/src/views/pssr/pumpCleaning/index.vue

@@ -390,6 +390,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "PumpCleaning",
   components: { Treeselect },
   props: {

ui/src/views/pssr/pumpFill/index.vue

@@ -390,6 +390,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "PumpFill",
   components: { Treeselect },
   props: {

ui/src/views/pssr/pumpOverhaul/index.vue

@@ -364,6 +364,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "PumpOverhaul",
   components: { Treeselect },
   props: {

ui/src/views/pssr/region/index.vue

@@ -219,6 +219,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Region",
   components: {Treeselect},
   data() {

ui/src/views/pssr/safetyBleed/index.vue

@@ -421,6 +421,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "SafetyBleed",
   components: { Treeselect },
   props: {

ui/src/views/pssr/safetyBreath/index.vue

@@ -421,6 +421,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "SafetyBreath",
   components: { Treeselect },
   props: {

ui/src/views/pssr/safetyBrust/index.vue

@@ -421,6 +421,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "SafetyBrust",
   components: { Treeselect },
   props: {

ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -369,6 +369,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "SafetyFlamearrester",
   components: { Treeselect },
   props: {

ui/src/views/pssr/safetyValve/index.vue

@@ -434,6 +434,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "SafetyValve",
   components: { Treeselect },
   props: {

ui/src/views/pssr/subcontent/index.vue

@@ -96,6 +96,11 @@
       <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="项目" align="center" prop="item" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="开车条件检查内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="确认人" align="center" prop="confirmName" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="180">
         <template slot-scope="scope">
@@ -217,6 +222,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Subcontent",
   components: {Treeselect},
   // components: { Editor },
@@ -316,6 +322,15 @@ export default {
     });
   },
   methods: {
+    getTagType(val){
+      if (val==0){
+        return ''
+      }else if (val==1){
+        return 'warning'
+      }else if (val==2){
+        return 'success'
+      }
+    },
     gotoSubIndex(row){
       console.log(row)
       this.$router.push({ name: 'Subitem', params: { subId: row.id,serialNumber:row.serialNumber } });

ui/src/views/pssr/subitem/index.vue

@@ -171,6 +171,7 @@ import PumpOverhaul from "@/views/pssr/pumpOverhaul/index.vue";
 import PumpFill from "@/views/pssr/pumpFill/index.vue";
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Subitem",
   components: {
     PumpFill,

ui/src/views/pssr/torchvoc/index.vue

@@ -326,6 +326,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
+  dicts:['pssr_approve_status'],
   name: "Torchvoc",
   components: { Treeselect },
   // components: { Editor },