更新

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -867,9 +867,9 @@ export default {
               this.dataList.outputPrivate =
                 CodeToText[this.selectedOptions1[0]]
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-              if(this.dataList.procurementPlanType=='期货'){
-                this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
-              }
+              // if(this.dataList.procurementPlanType=='期货'){
+              //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              // }
               this.dataList.compId = this.compId
               this.dataList.unitPrice=this.dataList.procurementPrice
               

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -899,9 +899,9 @@ export default {
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-              if(this.dataList.procurementPlanType=='期货'){
-                this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
-              }
+              // if(this.dataList.procurementPlanType=='期货'){
+              //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              // }
               this.dataList.compId = this.compId
               // this.dataList.pcFlag = 1
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')

src/views/purchasingManagement/procurementPlanList.vue

@@ -561,7 +561,8 @@ export default {
           .then(() => {
             procurementEditOther({
               flag: 1,
-              basisPrice: '-'+Math.abs(row.basisPrice),
+              // basisPrice: '-'+Math.abs(row.basisPrice),
+              basisPrice: row.basisPrice,
               id: row.id,
             })
               .toPromise()

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1103,7 +1103,8 @@ export default {
         .then(() => {
           editStatus({
             flag: 3,
-            basis: '-'+Math.abs(row.basis),
+            // basis: '-'+Math.abs(row.basis),
+            basis: row.basis,
             id: row.id,
           })
             .toPromise()
@@ -1281,7 +1282,7 @@ export default {
         })
         return
       }
-      this.closePositionList1.closingBasis='-'+Math.abs(this.closePositionList1.closingBasis)
+      // this.closePositionList1.closingBasis='-'+Math.abs(this.closePositionList1.closingBasis)
       closePositionList(this.closePositionList1)
         .toPromise()
         .then((response) => {
@@ -1299,10 +1300,15 @@ export default {
       if(this.closePositionList1.transactionPrice
       && this.closePositionList1.closeRate && this.closePositionList1.closingBasis && this.closePositionList1.closingQuantity)
       {
-        this.closePositionList1.closingPositionPayable =
+        // this.closePositionList1.closingPositionPayable =
+        //   (this.closePositionList1.transactionPrice -
+        //     this.closePositionList1.closeRate-
+        //     Math.abs(this.closePositionList1.closingBasis)) *
+        //   this.closePositionList1.closingQuantity
+         this.closePositionList1.closingPositionPayable =
           (this.closePositionList1.transactionPrice -
-            this.closePositionList1.closeRate-
-            Math.abs(this.closePositionList1.closingBasis)) *
+            this.closePositionList1.closeRate+
+            this.closePositionList1.closingBasis) *
           this.closePositionList1.closingQuantity
       }
     },
@@ -1425,7 +1431,8 @@ export default {
       this.$set(this.aduitlist, 'procurementPlanType', item.procurementPlanType)
       this.$set(this.aduitlist, 'unitPrice', item.unitPrice)
       this.$set(this.aduitlist, 'invoiceFee', item.invoiceFee)
-      this.$set(this.aduitlist, 'basis', Math.abs(item.basis))
+      // this.$set(this.aduitlist, 'basis', Math.abs(item.basis))
+      this.$set(this.aduitlist, 'basis', item.basis)
       this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)
       this.$set(this.aduitlist, 'baggingNotes', item.baggingNotes)
@@ -1515,9 +1522,9 @@ export default {
       this.aduitlist.procurementPlanType = this.aduitlist.procurementPlanType
        if (this.aduitlist.procurementPlanType == '期货') {
            this.aduitlist.freezingDeposit = this.aduitlist.transactionsNumber*this.aduitlist.depositRatio
-           if(this.aduitlist.invoiceFee){
-             this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
-           }
+          //  if(this.aduitlist.invoiceFee){
+          //    this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
+          //  }
             this.aduitlist.unloadingCharge = '-' + this.aduitlist.unloadingCharge
             this.aduitlist.basis = '-' + this.aduitlist.basis
        }
@@ -1656,7 +1663,8 @@ export default {
           id: this.clinchdeal.id,
           commonId: this.clinchdeal.commonId,
           compId: sessionStorage.getItem('ws-pf_compId'),
-          basis:'-'+Math.abs(this.clinchdeal1.basis)
+          // basis:'-'+Math.abs(this.clinchdeal1.basis)
+          basis:this.clinchdeal1.basis
         })
           .toPromise()
           .then((response) => {

src/views/salesManagement/salesPlanOrderList.vue

@@ -1400,7 +1400,8 @@ export default {
     },
     //修改基差
     changebasis(item) {
-      editStatus({ basis: Math.abs(this.basis), id: item.id, flag: 3 })
+      // editStatus({ basis: Math.abs(this.basis), id: item.id, flag: 3 })
+      editStatus({ basis: this.basis, id: item.id, flag: 3 })
         .toPromise()
         .then((response) => {
           this.$message.success('修改基差成功')

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -1241,11 +1241,16 @@ export default {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
             response.records[i].settlementPrice =
-              response.records[i].unitPrice -
-              Math.abs(response.records[i].basisPrice) -
-              Math.abs(response.records[i].unloadingCharge) -
-              Math.abs(response.records[i].invoiceFee) -
-              Math.abs(response.records[i].deductionAmount)
+              // response.records[i].unitPrice -
+              // Math.abs(response.records[i].basisPrice) -
+              // Math.abs(response.records[i].unloadingCharge) -
+              // Math.abs(response.records[i].invoiceFee) -
+              // Math.abs(response.records[i].deductionAmount)
+              response.records[i].unitPrice +
+              response.records[i].basisPrice+
+              response.records[i].unloadingCharge+
+              response.records[i].invoiceFee+
+              response.records[i].deductionAmount
           }
 
           this.deptBudgetTotal = response.total