Bladeren bron

禅道bug修改

jingshuyong 11 maanden geleden
bovenliggende
commit
d4a17d38ec

+ 1 - 1
src/views/maintenance/equipment/plan/components/plan-search.vue

@@ -19,7 +19,7 @@
             class="w100"
           >
             <el-option label="自动" :value="1"></el-option>
-            <el-option label="手动" :value="2"></el-option>
+            <el-option label="手动" :value="0"></el-option>
           </el-select>
         </el-form-item>
       </el-col>

+ 13 - 5
src/views/maintenance/equipment/workOrder/index.vue

@@ -36,7 +36,10 @@
           >
             预览打印
           </el-link> -->
-          <jimureportBrowse  :businessId="row.id" businessCode="qmsprint"></jimureportBrowse>
+          <jimureportBrowse
+            :businessId="row.id"
+            businessCode="qmsprint"
+          ></jimureportBrowse>
 
           <el-link
             v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
@@ -106,7 +109,8 @@
       redeployOther,
       signingUpWork,
       edit,
-      printWorkOrder,jimureportBrowse
+      printWorkOrder,
+      jimureportBrowse
     },
     data() {
       return {
@@ -220,8 +224,13 @@
             label: '执行结果',
             align: 'center',
             showOverflowTooltip: true,
+            // formatter(row) {
+            //   return { 0: '缺陷', 1: '正常' }[row.isAbnormal];
+            // }
             formatter(row) {
-              return { 0: '缺陷', 1: '正常' }[row.isAbnormal];
+              return { 0: '异常', 1: '正常', 2: '异常', 3: '待检' }[
+                row.isAbnormal
+              ];
             }
           },
           {
@@ -290,8 +299,7 @@
       },
       handlePrint(row, val) {
         this.$refs.printRef11.open(row.id, val);
-      },
-
+      }
     }
   };
 </script>

+ 6 - 1
src/views/maintenance/patrol/workOrder/index.vue

@@ -197,8 +197,13 @@
             label: '执行结果',
             align: 'center',
             showOverflowTooltip: true,
+            // formatter(row) {
+            //   return { 0: '缺陷', 1: '正常' }[row.isAbnormal];
+            // }
             formatter(row) {
-              return { 0: '缺陷', 1: '正常' }[row.isAbnormal];
+              return { 0: '异常', 1: '正常', 2: '异常', 3: '待检' }[
+                row.isAbnormal
+              ];
             }
           },
           {