Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/doneTickets/repair/index.vue

@@ -48,8 +48,8 @@
                 >
                   <el-option
                     v-for="item in workorderStatus"
-                    :key="item.id"
-                    :value="item.id"
+                    :key="item.value"
+                    :value="item.value"
                     :label="item.label"
                   ></el-option>
                 </el-select>
@@ -488,7 +488,7 @@
       console.log(workorderStatus);
 
       this.workorderStatus = workorderStatus.filter((item) => {
-        return [0, 2, 3].includes(item.id);
+        return [0, 2, 3].includes(item.value);
       });
       console.log(this.workorderStatus);
     }

src/views/bpm/tickets/repair/index.vue

@@ -300,9 +300,7 @@
             label: '状态',
             value: 'status',
             type: 'select',
-            planList: workorderStatus.map((item) => {
-              return { label: item.label, value: item.id };
-            }),
+            planList: workorderStatus,
             placeholder: ' '
           },