修改申请状态

ui/src/views/intact/approve/tapprove-maintenance-his.vue

@@ -165,8 +165,6 @@ export default {
       // this.queryParams.devType = row.devType
       this.queryParams.devType = type
       hisApprovelist(this.queryParams).then(response => {
-        console.log("aaa")
-        console.log(response.data)
         this.approveList = response.data;
         this.total = response.total;
         this.loading = false;

ui/src/views/intact/gyl/intactRecord.vue

@@ -38,7 +38,7 @@
         <el-table-column label="设备id" align="center" prop="id"  v-if="false" :show-overflow-tooltip="true"/>
         <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
         <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
-        <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+        <el-table-column label="状态" align="center" prop="intactStatus" :formatter="intactStatusFormat" />
         <el-table-column label="原始资料档案查看" align="center" prop="archives" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
 
@@ -112,7 +112,7 @@
        <el-table-column label="设备id" align="center" prop="id"  v-if="false" :show-overflow-tooltip="true"/>
         <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
         <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
-        <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+        <el-table-column label="状态" align="center" prop="intactStatus" :formatter="intactStatusFormat" />
   <el-table-column label="安装资料档案查看" align="center" prop="archives" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
 
@@ -331,6 +331,7 @@ export default {
       // 审批类型字典
       approveTypeOptions: [{dictValue:1,dictLabel:'维修'}],
       statusOptions: [],
+      intactStatusOptions:[],
       list: [],
       yuanshilist:[],
       anzhuanglist:[],
@@ -451,17 +452,20 @@ export default {
     this.getDicts("PLANT_DIVIDE").then(response => {
       this.plantCodeOptions = response.data;
     });
-    this.getDicts("INTACT_STATUS").then(response => {
+    this.getDicts("spec_approve_res").then(response => {
       this.statusOptions = response.data;
     });
+    this.getDicts("INTACT_STATUS").then(response => {
+      this.intactStatusOptions = response.data;
+    });
   },
   methods: {
     init(row) {
       this.row=row
       this.visible = true
-    
+
       //给原始、安装资料的list数据赋值
-      
+
       getGyl(row.id).then(response => {
         const didi=[]
         didi.push(response.data)
@@ -469,9 +473,9 @@ export default {
        this.anzhuanglist=didi
         this.total = response.total;
         this.loading = false;
-       
+
       });
-    
+
       var data = {
         devno:row.devno,
         region:row.position
@@ -480,7 +484,7 @@ export default {
         this.recordList = response.rows;
         this.total = response.total;
         this.loading = false;
-        
+
       });
 
       var data2={
@@ -491,7 +495,7 @@ export default {
         this.approveList = response.data;
         this.total = response.total;
         this.loading = false;
-      
+
       });
        var data3={
         devId : row.id,
@@ -501,7 +505,7 @@ export default {
         this.changelist = response.data;
         this.total = response.total;
         this.loading = false;
-      
+
       });
     },
     staffPlanQuery1(row,year){
@@ -534,6 +538,9 @@ export default {
     statusFormat(row) {
       return this.selectDictLabel(this.statusOptions, row.status);
     },
+    intactStatusFormat(row){
+      return this.selectDictLabel(this.intactStatusOptions, row.status);
+    },
     /** 获取当前年份 */
     getNowTime() {
       var now = new Date();
@@ -586,7 +593,7 @@ export default {
     //安装资料档案操作
     handleDoc11(row) {
 
- 
+
       this.doc11.id = row.id;
       this.doc11.title = row.filename;
       this.doc11.open = true;