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

src/views/purchasingManagement/purchaseOrderList.vue

@@ -136,7 +136,8 @@
         prop="freezingDeposit"
         label="冻结定金(元)"
         width="90"
-      ></el-table-column>
+      >
+      </el-table-column>
       <el-table-column
         class="table_td"
         prop="defaultDeposit"
@@ -1308,11 +1309,7 @@ export default {
       this.$set(this.replenishlist, 'id', item.id)
       this.$set(this.replenishlist, 'customer', item.customer)
       this.$set(this.replenishlist, 'defaultDeposit', item.defaultDeposit)
-      this.$set(
-        this.replenishlist,
-        'totalDeposit',
-        item.customerInfo.totalDeposit
-      )
+      this.$set(this.replenishlist,'totalDeposit', item.customerInfo.totalDeposit)
       this.$set(this.replenishlist, 'freezingDeposit', item.freezingDeposit)
     },
     aduit(item) {
@@ -1331,6 +1328,8 @@ export default {
       this.$set(this.aduitlist, 'typeKey', item.typeKey)
       this.$set(this.aduitlist, 'procurementPlanType', item.procurementPlanType)
       this.$set(this.aduitlist, 'basis', Math.abs(item.basis))
+      this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
+      this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)
     },
     aduitconfirm() {
       if (!this.aduitlist.unitPrice) {
@@ -1415,6 +1414,9 @@ export default {
       this.aduitlist.unloadingCharge = '-' + this.aduitlist.unloadingCharge
       this.aduitlist.basis = '-' + this.aduitlist.basis
       this.aduitlist.procurementPlanType = this.aduitlist.procurementPlanType
+       if (this.aduitlist.procurementPlanType == '期货') {
+           this.aduitlist.freezingDeposit = this.aduitlist.transactionsNumber*this.aduitlist.depositRatio
+       }
       this.dialogFormVisible4 = false
       this.$confirm(`审核通过后，将通知客户订单生效，是否确定通过审核？`, {
         confirmButtonText: '确定',
@@ -1588,6 +1590,9 @@ export default {
               response.records[i].cumulativeTurnover -
               response.records[i].closedPosition -
               response.records[i].stockInQuantity
+            response.records[i].shouldFreeze = 
+              response.records[i].depositRatio * response.records[i].transactionsNumber
+
           }
           this.warehouseList = response
           this.deptCircularPage.currentPage = response.current

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -469,6 +469,17 @@ export default {
       })
         .toPromise()
         .then(response => {
+          for (var i = 0; i < response.records.length; i++) {
+            if((response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity>0){
+              response.records[i].amountIngPayable=(response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity
+            }
+            else{
+              response.records[i].collectionIngPayable=response.records[i].collectionIngPayable+Math.abs((response.records[i].transactionPrice-response.records[i].closeRate+response.records[i].basisPrice)*response.records[i].closingQuantity)
+              response.records[i].amountIngPayable=0
+              response.records[i].amountEdPayable=0
+              response.records[i].amountNotPayable=0
+            }
+          }
           this.warehouseList = response
           this.deptBudgetTotal=response.total
         })