Merge branch 'test' into dev

src/views/maintenance/equipment/plan/index.vue

@@ -44,7 +44,9 @@
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
-            v-if="row.cycleType == 0 || row.planStatus == 4"
+            v-if="
+              row.planStatus == 4 || row.planStatus == 0 || row.planStatus == 5
+            "
             type="primary"
             :underline="false"
             icon="el-icon-edit"
@@ -53,16 +55,17 @@
             编辑
           </el-link>
           <el-link
-            v-if="row.cycleType == 0 || row.planStatus == 4"
+            v-if="
+              row.planStatus == 4 || row.planStatus == 0 || row.planStatus == 5
+            "
             type="primary"
             :underline="false"
-            icon="el-icon-edit"
             @click="openAdd('派单', row)"
           >
             派单
           </el-link>
           <el-link
-            v-if="row.planStatus != 2 && row.planStatus != 3 && row.planStatus != 4"
+            v-if="row.planStatus == 1 || row.planStatus == 2"
             type="primary"
             :underline="false"
             icon="el-icon-edit"
@@ -146,14 +149,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          // {
+          //   prop: 'cycleType',
+          //   label: '计划性质',
+          //   align: 'center',
+          //   showOverflowTooltip: true,
+          //   minWidth: 110,
+          //   formatter(item) {
+          //     return { 1: '自动', 0: '手动' }[item.cycleType];
+          //   }
+          // },
           {
-            prop: 'cycleType',
-            label: '计划性质',
+            prop: 'autoOrder',
+            label: '自动派单',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110,
             formatter(item) {
-              return { 1: '自动', 0: '手动' }[item.cycleType];
+              return { 1: '自动', 0: '手动' }[item.autoOrder];
             }
           },
           {

vue.config.js

@@ -36,7 +36,8 @@ module.exports = {
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐
         // target: 'http://192.168.1.125:18086', //本
-        target: 'http://192.168.1.116:18086', // 赵沙金
+        // target: 'http://192.168.1.116:18086', // 赵沙金
+        target: 'http://192.168.1.251:18186', // 测试环境
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''