doctor-admin-components 1.0.14-beta.29 → 1.0.14-beta.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
|
|
3
3
|
* @Date: 2024-08-20 10:37:30
|
|
4
4
|
* @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
|
|
5
|
-
* @LastEditTime: 2024-08-
|
|
5
|
+
* @LastEditTime: 2024-08-23 13:49:18
|
|
6
6
|
* @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/contractTracing/queryDeductionRecords.vue
|
|
7
7
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
8
8
|
-->
|
|
@@ -32,28 +32,29 @@
|
|
|
32
32
|
prop="purchaseDepositTotalAmount"
|
|
33
33
|
label="定金总额">
|
|
34
34
|
<template slot-scope="{ row }">
|
|
35
|
-
{{ row.purchaseDepositTotalAmount ? "$" + $formatNumber(row.purchaseDepositTotalAmount, 2) : '' }}
|
|
35
|
+
{{ row.purchaseDepositTotalAmount ? "$" + $formatNumber(row.purchaseDepositTotalAmount, 2) : '0' }}
|
|
36
36
|
</template>
|
|
37
37
|
</el-table-column>
|
|
38
38
|
<el-table-column
|
|
39
39
|
prop="purchaseDepositBalance"
|
|
40
40
|
label="上次剩余定金">
|
|
41
41
|
<template slot-scope="{ row }">
|
|
42
|
-
{{ row.purchaseDepositBalance ? "$" + $formatNumber(row.purchaseDepositBalance,2) : '' }}
|
|
42
|
+
{{ row.purchaseDepositBalance ? "$" + $formatNumber(row.purchaseDepositBalance,2) : '0' }}
|
|
43
43
|
</template>
|
|
44
44
|
</el-table-column>
|
|
45
45
|
<el-table-column
|
|
46
46
|
prop="purchaseDepositAmount"
|
|
47
47
|
label="扣减定金">
|
|
48
48
|
<template slot-scope="{ row }">
|
|
49
|
-
<span class="edit-style" v-if="row.purchaseDepositAmount" @click.stop="jumpFileManage(row)">{{ row.purchaseDepositAmount ? "$" + $formatNumber(row.purchaseDepositAmount, 2) : '' }}</span>
|
|
49
|
+
<span class="edit-style" v-if="row.purchaseDepositAmount" @click.stop="jumpFileManage(row)">{{ row.purchaseDepositAmount ? "$" + $formatNumber(row.purchaseDepositAmount, 2) : '0' }}</span>
|
|
50
|
+
<span v-else>0</span>
|
|
50
51
|
</template>
|
|
51
52
|
</el-table-column>
|
|
52
53
|
<el-table-column
|
|
53
54
|
prop="purchaseDepositRemainAmount"
|
|
54
55
|
label="定金余额">
|
|
55
56
|
<template slot-scope="{ row }">
|
|
56
|
-
{{ row.purchaseDepositRemainAmount ? "$" + $formatNumber(row.purchaseDepositRemainAmount, 2) : '' }}
|
|
57
|
+
{{ row.purchaseDepositRemainAmount ? "$" + $formatNumber(row.purchaseDepositRemainAmount, 2) : '0' }}
|
|
57
58
|
</template>
|
|
58
59
|
</el-table-column>
|
|
59
60
|
</el-table>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: zhangpengwei 15038779532@163.com
|
|
3
3
|
* @Date: 2023-07-31 17:40:56
|
|
4
4
|
* @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
|
|
5
|
-
* @LastEditTime: 2024-08-
|
|
5
|
+
* @LastEditTime: 2024-08-23 14:16:00
|
|
6
6
|
* @FilePath: /doctor-admin-components/packages/src/views/biz/contractTracing/chargingDialog.vue
|
|
7
7
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
8
8
|
-->
|
|
@@ -37,12 +37,12 @@
|
|
|
37
37
|
{{getPurchaseAmountTip(item, row)}}
|
|
38
38
|
</template>
|
|
39
39
|
<span>
|
|
40
|
-
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{$formatNumber(item.purchasePriceResult, 2)}}
|
|
40
|
+
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{item.purchasePriceResult ? $formatNumber(item.purchasePriceResult, 2) : (item.purchaseUnitPriceFormula || getPrice(item)) }}
|
|
41
41
|
</span>
|
|
42
42
|
<i class="el-icon-question"></i>
|
|
43
43
|
</span>
|
|
44
44
|
</el-tooltip>
|
|
45
|
-
<span v-else :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{$formatNumber(item.purchasePriceResult, 2)}}
|
|
45
|
+
<span v-else :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{item.purchasePriceResult ? $formatNumber(item.purchasePriceResult, 2) : (item.purchaseUnitPriceFormula || getPrice(item)) }}
|
|
46
46
|
</span>
|
|
47
47
|
</div>
|
|
48
48
|
</template>
|
|
@@ -415,14 +415,17 @@ export default {
|
|
|
415
415
|
})
|
|
416
416
|
},
|
|
417
417
|
getPurchaseAmountTip(item, row) {
|
|
418
|
-
if(item.quoteType == 'FIXED') {
|
|
418
|
+
if(item.quoteType == 'FIXED' || !item.pointDate) {
|
|
419
419
|
return ''
|
|
420
420
|
}
|
|
421
421
|
let msg = '成交单价为'
|
|
422
|
-
msg = msg +
|
|
422
|
+
msg = msg + this.getPrice(item)
|
|
423
423
|
msg = msg + ', ' + row.pointDate + '点到的期货价格为$' + row.pointPrice
|
|
424
424
|
return msg
|
|
425
425
|
},
|
|
426
|
+
getPrice(item) {
|
|
427
|
+
return (item.quoteType.includes('CMX') ? item.quoteType + '-' +item.purchaseUnitPrice : item.quoteType.includes('LME') ? item.purchaseUnitPrice + '%' + item.quoteType : '')
|
|
428
|
+
},
|
|
426
429
|
getColumnProp(row, type) {
|
|
427
430
|
var list = []
|
|
428
431
|
row?.containerDetailPurchaseAmountRespList?.forEach((containerDetail) => {
|