Merge branch 'master' of http://47.101.207.123:3000/sharedExchange/gxjh-ywtb

src/components/remind-handle-sta/RemindHandleS.vue

@@ -87,7 +87,7 @@ export default {
       }else if(code=='NO_REPLY'){
         this.$router.push('/origion/evaluate');
         this.evaluateCurrentId('repeat')
-        this.evaluateRepeatId('0')
+        this.evaluateRepeatId('0,2,3')
       }else{
         this.$router.push('/origion/evaluate');
         this.evaluateCurrentId('situation')

src/components/total-handle/TotalHandle.vue

@@ -115,10 +115,10 @@ export default {
       numHb:'',
       numQcwb:'',
       orderNumAll: [ '0', '0', ',', '0', '0', '0', ',', '0','0','0'],
-      orderNumWb: ['0', '0', '0' ,'0', '0', '0'],
-      orderNumQcwb: [ '0','0', '0' ,'0', '0', '0'],
-      orderNumHb: [ '0','0', '0' ,'0', '0', '0'],
-      orderNumKb: [ '0','0', '0' ,'0', '0', '0'],
+      orderNumWb: ['0','0', '0', '0' ,'0', '0', '0'],
+      orderNumQcwb: [ '0','0','0', '0' ,'0', '0', '0'],
+      orderNumHb: ['0', '0','0', '0' ,'0', '0', '0'],
+      orderNumKb: [ '0','0','0', '0' ,'0', '0', '0'],
     }
   },
   mounted() {
@@ -148,13 +148,13 @@ export default {
             this.setNumberTransformWb();
             this.numKb = dataArr[i].kbCount;
             this.toOrderNumKb(dataArr[i].kbCount) // 这里输入数字即可调用
-            this.setNumberTransformQcwb();
+            this.setNumberTransformKb();
             this.numHb = dataArr[i].hbCount;
             this.toOrderNumHb(dataArr[i].hbCount) // 这里输入数字即可调用
             this.setNumberTransformHb();
             this.numQcwb = dataArr[i].qcwbCount;
             this.toOrderNumQcwb(dataArr[i].qcwbCount) // 这里输入数字即可调用
-            this.setNumberTransformKb();
+            this.setNumberTransformQcwb();
         }
 
       })
@@ -214,59 +214,59 @@ export default {
         this.orderNum = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
-        this.$message.warning('总量数字过大，显示异常')
+        //this.$message.warning('总量数字过大，显示异常')
       }
     },
     toOrderNumHb(num) {
       num = num.toString()
       // 把订单数变成字符串
-      if (num.length < 6) {
+      if (num.length < 7) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNumHb(num) // 递归添加"0"补位
-      } else if (num.length === 6) {
+      } else if (num.length === 7) {
         this.orderNumHb = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
-        this.$message.warning('总量数字过大，显示异常')
+        //this.$message.warning('总量数字过大，显示异常')
       }
     },
     toOrderNumKb(num) {
       num = num.toString()
       // 把订单数变成字符串
-      if (num.length < 6) {
+      if (num.length < 7) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNumKb(num) // 递归添加"0"补位
-      } else if (num.length === 6) {
+      } else if (num.length === 7) {
         this.orderNumKb = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
-        this.$message.warning('总量数字过大，显示异常')
+        //this.$message.warning('总量数字过大，显示异常')
       }
     },
     toOrderNumWb(num) {
       num = num.toString()
       // 把订单数变成字符串
-      if (num.length < 6) {
+      if (num.length < 7) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNumWb(num) // 递归添加"0"补位
-      } else if (num.length === 6) {
+      } else if (num.length === 7) {
         this.orderNumWb = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
-        this.$message.warning('总量数字过大，显示异常')
+        //this.$message.warning('总量数字过大，显示异常')
       }
     },
     toOrderNumQcwb(num) {
       num = num.toString()
       // 把订单数变成字符串
-      if (num.length < 6) {
+      if (num.length < 7) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNumQcwb(num) // 递归添加"0"补位
-      } else if (num.length === 6) {
+      } else if (num.length === 7) {
         this.orderNumQcwb = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
-        this.$message.warning('总量数字过大，显示异常')
+        //this.$message.warning('总量数字过大，显示异常')
       }
     },
     firstNum(num){
@@ -530,9 +530,9 @@ export default {
       height:70%;
       display: flex;
       flex-wrap: wrap;
-      justify-content: space-evenly;
+      justify-content: space-between;
       .title_number_single{
-        width: 40%;
+        width: 48%;
         height:50%;
         display: flex;
         flex-direction: column;
@@ -602,7 +602,7 @@ export default {
           }
           /*滚动数字设置*/
           .number-item {
-            margin-left: 10%;
+            margin-left: 5%;
             width: 40px;
             height: 50px;
             /*background: #ccc;*/

src/store/evaluate/index.js

@@ -6,7 +6,7 @@ const evaluateStore = {
         evaluateSecondLevel:'',  //1好评、0差评
         evaluateThirdLevel:'',  //事项
         evaluateTimer:'',  // 时间 0：近一年，1：近一月
-        evaluateRepeatId:'0',
+        evaluateRepeatId:'0,2,3',
         evaluateUnit:'',
     },
     mutations:{

src/views/evaluate/Evaluate.vue

@@ -180,7 +180,7 @@ export default {
     typeChange(id){
 
       this.evaluateCurrentId(id);
-      this.evaluateRepeatId('0');
+      this.evaluateRepeatId('0,2,3');
       this.evaluateThirdLevel('');
     },
     clickTableTr(row, column, event) {

src/views/evaluate/EvaluateRepeat.vue

@@ -461,6 +461,7 @@ export default {
     }
   },
   mounted(){
+    console.log(this.evaRepeatId)
     this.currentRepeatId = this.evaRepeatId;
     selectConfigModuleByRole(this);
   },
@@ -724,7 +725,7 @@ export default {
         case "0,1,2,3,4":
           this.dialogRepeatTitle  = '差评回复';
           break;
-        case "0":
+        case "0,2,3":
           this.dialogRepeatTitle  = '差评回复';
           break;
         case "1":