1

src/components/icss/plan/AddPlan.vue

@@ -296,39 +296,38 @@ export default {
       }
       let res1 = await api.getPlanInfoIds(params);
       if (res1.data.code === '0') {
-        // this.planDefaultList = res.data.data[0].sysSetInfo[0].planDetails;
         newPlan = res1.data.data[0].sysSetInfo[0].planDetails;
         this.form.planName = res1.data.data[0].planName;
         this.form.planCode = res1.data.data[0].planCode;
         this.switchSubStatus = res1.data.data[0].sysSetInfo[0].status;
         this.switchMedStatus = res1.data.data[0].sysSetInfo[1].status;
-        this.planDefaultList = res1.data.data[0].sysSetInfo[0].planDetails;
+        // this.planDefaultList = res1.data.data[0].sysSetInfo[0].planDetails;
       }
-
-      // api.getPlanInfoIds(params).then(res => {
-      //   if (res.data.code === '0') {
-      //     // this.planDefaultList = res.data.data[0].sysSetInfo[0].planDetails;
-      //     newPlan = res.data.data[0].sysSetInfo[0].planDetails;
-      //     this.form.planName = res.data.data[0].planName;
-      //     this.form.planCode = res.data.data[0].planCode;
-      //     this.switchSubStatus = res.data.data[0].sysSetInfo[0].status;
-      //     this.switchMedStatus = res.data.data[0].sysSetInfo[1].status;
-      //   }
-      // });
-      // console.log(newPlan, '获取的方案配置');
-      // console.log(tempArr, '===========');
-      let tempArr2 = tempArr.map( item=>{
-        return {...item, status: 0, isNO: true}
-      })
-      // let tempArr2 = [...tempArr]
-      for (var i = 0; i < newPlan.length; i++) {
-        for (var j = 0; j < tempArr2.length; j++) {
-          if (tempArr2[j].code === newPlan[i].code) {
-            tempArr2.splice(j, 1,newPlan[i]);
+      let arr = [];
+      let arrTemp = [];
+      let arrTemp1 = []; // 不同index
+      for (var i = 0; i < tempArr.length; i++) {
+        arrTemp.push(i);
+      }
+      for (var i = 0; i < tempArr.length; i++) {
+        for (var j = 0; j < newPlan.length; j++) {
+          if (tempArr[i].code === newPlan[j].code) {
+            arr.push(i);
           }
         }
       }
-      // console.log(tempArr2);
+      arrTemp1 = arr
+        .filter(x => arrTemp.indexOf(x) == -1)
+        .concat(arrTemp.filter(x => arr.indexOf(x) == -1));
+      let endArr = [...newPlan]
+      for (var j = 0; j < arrTemp1.length; j++) {
+        let temp = tempArr[arrTemp1[j]]
+        temp.orderNo = arr.length + j + 1
+        temp.status = 0
+        endArr.push(temp)
+      }
+      // console.log(endArr,'-=-=-=-=-=');
+      this.planDefaultList = endArr
     },
 
     // format处理细项数据
@@ -475,8 +474,8 @@ export default {
           width: 30px;
           cursor: pointer;
           img {
-            width: 16px;
-            height: 20px;
+            width: 10px;
+            height: 14px;
           }
         }
         .down {
@@ -486,8 +485,8 @@ export default {
           justify-content: center;
           align-items: center;
           img {
-            width: 16px;
-            height: 20px;
+            width: 10px;
+            height: 14px;
           }
         }
       }