Prechádzať zdrojové kódy

fix:内审进度查询调整,审批意见默认值:同意

zhangjingyuan 3 rokov pred
rodič
commit
b17e4b8000

+ 1 - 1
src/business/platform/bpmn/components/approval-opinion/index.vue

@@ -182,7 +182,7 @@ export default {
   computed: {
   computed: {
     data: {
     data: {
       get() {
       get() {
-        return this.value
+        return this.value? this.value : '同意'
       },
       },
       set(val) {
       set(val) {
         this.$emit('input', val)
         this.$emit('input', val)

+ 28 - 20
src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -27,7 +27,7 @@
                   class="step"
                   class="step"
                   v-for="(i, index) in stepList"
                   v-for="(i, index) in stepList"
                   :key="index"
                   :key="index"
-                  :class="activeIndex == i.stepIndex || i.stepIndex <= activeIndex? 'step-active': ''"
+                  :class="(i.stepIndex < activeIndex || activeIndex == 100? 'step-active': (i.stepIndex == activeIndex ? 'current-active':''))"
                 >
                 >
                   <span class="step-num">
                   <span class="step-num">
                     <i class="el-icon-caret-right icon" v-if="index != 0"></i>
                     <i class="el-icon-caret-right icon" v-if="index != 0"></i>
@@ -220,7 +220,7 @@ export default {
         },
         },
         {
         {
           stepIndex: 22,
           stepIndex: 22,
-          title: "内审实施计划编制",
+          title: "实施计划编制",
           post:'内审组长'
           post:'内审组长'
         },
         },
         {
         {
@@ -244,12 +244,12 @@ export default {
           post:'内审组长'
           post:'内审组长'
         },
         },
         {
         {
-          stepIndex: 77,
+          stepIndex: 78,
           title: "不符合项整改",
           title: "不符合项整改",
           post:'内审员/部门负责人'
           post:'内审员/部门负责人'
         },
         },
         {
         {
-          stepIndex: 88,
+          stepIndex: 90,
           title: "内审报告",
           title: "内审报告",
           post:'内审组长'
           post:'内审组长'
         },
         },
@@ -629,13 +629,11 @@ export default {
       } else if (value.includes("6")) {
       } else if (value.includes("6")) {
         return 66;
         return 66;
       } else if (value.includes("7")) {
       } else if (value.includes("7")) {
-        return 77;
+        return 78;
       } else if (value.includes("8")) {
       } else if (value.includes("8")) {
-        return 100;
+        return 90;
       }else if (value.includes("9")) {
       }else if (value.includes("9")) {
         return 100;
         return 100;
-      }else {
-        return 0;
       }
       }
     },
     },
     //不符合项条款统计数据
     //不符合项条款统计数据
@@ -689,7 +687,6 @@ export default {
         arr.forEach((item, index) => {
         arr.forEach((item, index) => {
           str =""
           str =""
           arr1.forEach((it) => {
           arr1.forEach((it) => {
-            debugger
             if (item.ze_ren_shi_ == it.ID_ && !item.ze_ren_shi_.includes(",")) {
             if (item.ze_ren_shi_ == it.ID_ && !item.ze_ren_shi_.includes(",")) {
               arr[index].ze_ren_shi_ = it.NAME_;
               arr[index].ze_ren_shi_ = it.NAME_;
             }
             }
@@ -727,12 +724,16 @@ export default {
     },
     },
     getInit() {
     getInit() {
       let data = this.obj[0];
       let data = this.obj[0];
+      console.log(data)
       let jieduanvalue;
       let jieduanvalue;
       if (data.shi_fou_guo_shen_ == "已编制" && data.jie_dian_ren_wu_ == "") {
       if (data.shi_fou_guo_shen_ == "已编制" && data.jie_dian_ren_wu_ == "") {
         jieduanvalue = "2";
         jieduanvalue = "2";
       } else if (data.shi_fou_guo_shen_ == "1" && data.jie_dian_ren_wu_ == "") {
       } else if (data.shi_fou_guo_shen_ == "1" && data.jie_dian_ren_wu_ == "") {
         jieduanvalue = "3";
         jieduanvalue = "3";
-      } else {
+      }else if(!data.shi_fou_guo_shen_){
+        jieduanvalue = "2";
+      }
+       else {
         jieduanvalue = data.jie_dian_ren_wu_;
         jieduanvalue = data.jie_dian_ren_wu_;
       }
       }
       this.activeIndex = this.jieduan(jieduanvalue);
       this.activeIndex = this.jieduan(jieduanvalue);
@@ -811,7 +812,7 @@ export default {
       position: absolute;
       position: absolute;
       top: 27px;
       top: 27px;
       left: 5%;
       left: 5%;
-      background: #8ab4f3;
+      background: #67c23a;
       width: 95%;
       width: 95%;
       height: 2px;
       height: 2px;
       overflow: hidden;
       overflow: hidden;
@@ -821,7 +822,7 @@ export default {
         left: 0;
         left: 0;
         height: 2px;
         height: 2px;
         transition: 0.5s;
         transition: 0.5s;
-        background: #8ab4f3;
+        background: #37a2da;
       }
       }
     }
     }
     .Article-steps {
     .Article-steps {
@@ -853,10 +854,11 @@ export default {
           align-items: center;
           align-items: center;
           .icon {
           .icon {
             position: absolute;
             position: absolute;
-            left: -11px;
-            color: #8ab4f3;
+            left: -12px;
+            color: #8ab;
             font-size: 16px;
             font-size: 16px;
             font-weight: bold;
             font-weight: bold;
+            top: 35%;
           }
           }
           p {
           p {
             line-height: 20px;
             line-height: 20px;
@@ -885,14 +887,20 @@ export default {
       }
       }
     }
     }
 
 
-    //当前所在位置样式
-    .step-active {
+    // //当前所在位置样式
+    .current-active 
+    {
       .step-num {
       .step-num {
         background: #2d7df5 !important;
         background: #2d7df5 !important;
-        //   transform: rotate(90deg);
-        //   .num {
-        //     // transform: rotate(-90deg);
-        //   }
+      }
+      .title {
+        color: #2d7df5 !important;
+      }
+    }
+    .step-active 
+    {
+      .step-num {
+        background: #00CC00 !important;
       }
       }
       .title {
       .title {
         color: #2d7df5 !important;
         color: #2d7df5 !important;