Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/track/cabinet/AddOrUpdate.vue

@@ -666,7 +666,7 @@
               </div>
             </div>
           </div>
-          <el-table :data="feesList" style="width: 100%">
+          <el-table :data="chiFeesList" style="width: 100%">
             <el-table-column
               prop="fCorpid"
               label="结算单位"
@@ -1084,6 +1084,7 @@ export default {
   },
   data() {
     return {
+      chiFeesList:[],
       // 控制弹出框显示隐藏
       showDialog: false,
       billTypeList: [],
@@ -1224,7 +1225,7 @@ export default {
       }
     },
     addRelevt2() {
-      let arr = this.feesList;
+      let arr = this.chiFeesList;
       arr.filter((e) => e.actId == "1080");
       if (arr.length > 0) {
         this.$confirm("已生成费用信息, 是否重新生成?", "提示", {
@@ -1233,12 +1234,8 @@ export default {
           type: "warning",
         })
           .then(() => {
-            this.$nextTick().then(() => {
-              this.feesList = this.feesList.filter((e) => e.actId != "1080");
-            });
-            this.$nextTick().then(() => {
+              this.chiFeesList =this.chiFeesList.filter((e) => e.actId != "1080");
               this.addRelevt3();
-            });
           })
           .catch(() => {
             this.$message({
@@ -1252,7 +1249,7 @@ export default {
     },
     addRelevt3() {
       if (this.form.oilAmt > 0) {
-        this.feesList.push({
+        this.chiFeesList.push({
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 52,
@@ -1268,7 +1265,7 @@ export default {
         });
       }
       if (this.form.driverbonus > 0) {
-        this.feesList.push({
+        this.chiFeesList.push({
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 53,
@@ -1284,7 +1281,7 @@ export default {
         });
       }
       if (this.form.costOth > 0) {
-        this.feesList.push({
+        this.chiFeesList.push({
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 54,
@@ -1300,7 +1297,7 @@ export default {
         });
       }
       if (this.form.costomAmt03 > 0) {
-        this.feesList.push(
+        this.chiFeesList.push(
           {
             actId: "1080",
             fCorpid: this.form.fCorpId,
@@ -1332,7 +1329,7 @@ export default {
         );
       }
       if (this.form.costomAmt04 > 0) {
-        this.feesList.push(
+        this.chiFeesList.push(
           {
             actId: "1080",
             fCorpid: this.form.fCorpId,
@@ -1364,7 +1361,7 @@ export default {
         );
       }
       if (this.form.costomAmt02 > 0) {
-        this.feesList.push(
+        this.chiFeesList.push(
           {
             actId: "1080",
             fCorpid: this.form.fCorpId,
@@ -1396,7 +1393,7 @@ export default {
         );
       }
       if (this.form.costomAmt05 > 0) {
-        this.feesList.push(
+        this.chiFeesList.push(
           {
             actId: "1080",
             fCorpid: this.form.fCorpId,
@@ -1428,7 +1425,7 @@ export default {
         );
       }
       if (this.form.costomAmt06 > 0) {
-        this.feesList.push(
+        this.chiFeesList.push(
           {
             actId: "1080",
             fCorpid: this.form.fCorpId,
@@ -1460,7 +1457,7 @@ export default {
         );
       }
       if (this.form.costomAmt01 > 0) {
-        this.feesList.push(
+        this.chiFeesList.push(
           {
             actId: "1080",
             fCorpid: this.form.fCorpId,
@@ -1491,6 +1488,7 @@ export default {
           }
         );
       }
+      // this.$emit('getComponentsdate',this.chiFeesList)
     },
     // 弹出框关闭后触发
     handleClose() {
@@ -1605,6 +1603,9 @@ export default {
     addOrUpdateVisible(oldVal, newVal) {
       this.showDialog = this.addOrUpdateVisible;
     },
+    feesList(newVal, oldVal) {
+			 this.chiFeesList=newVal 
+      }
   },
 };
 </script>

src/views/track/cabinet/index.vue

@@ -452,6 +452,7 @@
       :feesList="feesList"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
+      @getComponentsdate="getComponentsdate"
       ref="addOrUpdateRef"
     ></add-or-update>
   </div>
@@ -1057,15 +1058,10 @@ export default {
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },
-    // //获取到保存并复制
-    // getSave(data) {
-    //   data.data.map((e) => {s
-    //     if (e.cntrId != null) {
-    //       return (e.cntrId = e.cntrId.toString());
-    //     }
-    //   });
-    //   this.vehicleList = data.data;
-    // },
+    //获取到保存并复制
+    getComponentsdate(data) {
+      this.feesList = data;
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;