seimin 2 年之前
父節點
當前提交
18122e3590
共有 3 個文件被更改,包括 6 次插入4 次删除
  1. 3 2
      src/custom/seiminModel.vue
  2. 1 1
      src/main.js
  3. 2 1
      src/views/newIncident.vue

+ 3 - 2
src/custom/seiminModel.vue

@@ -17,10 +17,11 @@
17
           >
17
           >
18
           </cube-select>
18
           </cube-select>
19
         </div>
19
         </div>
20
-        <div
20
+        <!-- <div
21
           class="seiminModel_item"
21
           class="seiminModel_item"
22
           v-if="(type === 'handler' && complexity != complexitySource) || type == 'now'"
22
           v-if="(type === 'handler' && complexity != complexitySource) || type == 'now'"
23
-        >
23
+        > -->
24
+        <div class="seiminModel_item" v-if="complexity !== complexitySource">
24
           <label>升级原因<span class="red">*</span>:</label>
25
           <label>升级原因<span class="red">*</span>:</label>
25
           <cube-textarea
26
           <cube-textarea
26
             v-model="updateReason"
27
             v-model="updateReason"

+ 1 - 1
src/main.js

@@ -9,7 +9,7 @@ import Store from "./store/store";
9
 // import http from "../src/request/http";
9
 // import http from "../src/request/http";
10
 import "lib-flexible";
10
 import "lib-flexible";
11
 import "./filters";
11
 import "./filters";
12
-console.info('v1.0.1');
12
+console.info('v1.0.2');
13
 Vue.use(Cube);
13
 Vue.use(Cube);
14
 // 设置默认请求接口(删掉地址栏中的后缀)
14
 // 设置默认请求接口(删掉地址栏中的后缀)
15
 let domainName = document.domain; //域名
15
 let domainName = document.domain; //域名

+ 2 - 1
src/views/newIncident.vue

@@ -1231,7 +1231,7 @@ export default {
1231
                   }).show();
1231
                   }).show();
1232
                   return;
1232
                   return;
1233
                 }
1233
                 }
1234
-                if (!this.$refs.seiminModel.updateReason.trim()) {
1234
+                if (this.$refs.seiminModel.complexitySource != this.$refs.seiminModel.complexity && !this.$refs.seiminModel.updateReason.trim()) {
1235
                   this.$createDialog({
1235
                   this.$createDialog({
1236
                     type: "alert",
1236
                     type: "alert",
1237
                     title: "操作失败",
1237
                     title: "操作失败",
@@ -1605,6 +1605,7 @@ export default {
1605
           });
1605
           });
1606
           // ----------------------start--------------------
1606
           // ----------------------start--------------------
1607
           if (
1607
           if (
1608
+            this.$route.params.data &&
1608
             this.$route.params.data.category &&
1609
             this.$route.params.data.category &&
1609
             this.$route.params.data.place
1610
             this.$route.params.data.place
1610
           ) {
1611
           ) {