Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -1000,8 +1000,12 @@ export default {
           customerConfirmationStatusFlag:
             this.modification[0].customerConfirmationStatusFlag,
             id:this.modification[0].id,
+            contractNo:this.modification[0].contractNo,
+            carryOverWeight: this.carryoverlist.carryOverWeight,
+            purchaseReceiptReport: {
             contractNo: this.carryoverlist.contractNo,
             carryOverWeight: this.carryoverlist.carryOverWeight,
+            },
           amountNotPayable: this.modification[0].amountNotPayable,
         })
           .toPromise()
@@ -1041,11 +1045,13 @@ export default {
         this.$message.warning('请选择一条要结转的条目')
       } else {
         this.dialogFormVisible11 = true
-        // this.carryovercontractnolist = this.contractNoList.records.filter(
-        //   (item) => {
-        //     return this.modification[0].id != item.id
-        //   }
-        // )
+        console.log(this.contractNoList.records)
+        this.carryovercontractnolist = this.contractNoList.records.filter(
+          (item) => {
+            return this.modification[0].id != item.id
+          }
+        )
+        
       }
     },
     handleSelectionChange(val) {

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -398,13 +398,12 @@ export default {
     this.getList()
     this.showType = this.isShow
   },
-  computed:{
-    sum:function(){
-        this.amendlist.settlementPrice = Number(
-          this.amendlist.unitPrice )+ Number(this.amendlist.basisPrice )+ Number(this.amendlist.invoiceFee)
-    }
-
-  },
+  // computed:{
+  //   sum:function(){
+  //       this.amendlist.settlementPrice = Number(
+  //         this.amendlist.unitPrice )+ Number(this.amendlist.basisPrice )+ Number(this.amendlist.invoiceFee)
+  //    }
+  // },
   methods: {
     selectInit(row){
 //在这里一定要记得类型匹配的上。