|
|
@@ -136,7 +136,12 @@
|
|
|
prop="freezingDeposit"
|
|
|
label="冻结定金(元)"
|
|
|
width="90"
|
|
|
- ></el-table-column>
|
|
|
+ >
|
|
|
+ <template slot-scope="scope" >
|
|
|
+ <span v-if="scope.row.totalDeposit > scope.row.shouldFreeze">{{scope.row.shouldFreeze}}</span>
|
|
|
+ <span v-else-if="scope.row.totalDeposit < scope.row.shouldFreeze">{{scope.row.totalDeposit}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
class="table_td"
|
|
|
prop="defaultDeposit"
|
|
|
@@ -1415,6 +1420,7 @@ export default {
|
|
|
this.aduitlist.unloadingCharge = '-' + this.aduitlist.unloadingCharge
|
|
|
this.aduitlist.basis = '-' + this.aduitlist.basis
|
|
|
this.aduitlist.procurementPlanType = this.aduitlist.procurementPlanType
|
|
|
+ //this.aduitlist.freezingDeposit = this.aduitlist.freezingDeposit
|
|
|
this.dialogFormVisible4 = false
|
|
|
this.$confirm(`审核通过后，将通知客户订单生效，是否确定通过审核？`, {
|
|
|
confirmButtonText: '确定',
|
|
|
@@ -1588,6 +1594,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
|
zxz