doctor-admin-components 1.0.14-beta.26 → 1.0.14-beta.27
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-22 14:51:11
|
|
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,28 @@
|
|
|
32
32
|
prop="purchaseDepositTotalAmount"
|
|
33
33
|
label="定金总额">
|
|
34
34
|
<template slot-scope="{ row }">
|
|
35
|
-
{{ row.purchaseDepositTotalAmount ? "$" +
|
|
35
|
+
{{ row.purchaseDepositTotalAmount ? "$" + $formatNumber(row.purchaseDepositTotalAmount, 2) : '' }}
|
|
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 ? "$" +
|
|
42
|
+
{{ row.purchaseDepositBalance ? "$" + $formatNumber(row.purchaseDepositBalance,2) : '' }}
|
|
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 ? "$" +
|
|
49
|
+
<span class="edit-style" v-if="row.purchaseDepositAmount" @click.stop="jumpFileManage(row)">{{ row.purchaseDepositAmount ? "$" + $formatNumber(row.purchaseDepositAmount, 2) : '' }}</span>
|
|
50
50
|
</template>
|
|
51
51
|
</el-table-column>
|
|
52
52
|
<el-table-column
|
|
53
53
|
prop="purchaseDepositRemainAmount"
|
|
54
54
|
label="定金余额">
|
|
55
55
|
<template slot-scope="{ row }">
|
|
56
|
-
{{ row.purchaseDepositRemainAmount ? "$" +
|
|
56
|
+
{{ row.purchaseDepositRemainAmount ? "$" + $formatNumber(row.purchaseDepositRemainAmount, 2) : '' }}
|
|
57
57
|
</template>
|
|
58
58
|
</el-table-column>
|
|
59
59
|
</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-22 15:30:54
|
|
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
|
-->
|
|
@@ -25,21 +25,28 @@
|
|
|
25
25
|
<el-table-column align="center" label="净量(MT)" prop="goodsNetWeight">
|
|
26
26
|
<template slot-scope="{ row }">
|
|
27
27
|
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
28
|
-
<span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{item.goodsNetWeight}}</span>
|
|
28
|
+
<span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{$formatNumber(item.goodsNetWeight, 3)}}</span>
|
|
29
29
|
</div>
|
|
30
30
|
</template>
|
|
31
31
|
</el-table-column>
|
|
32
32
|
<el-table-column align="center" label="单价($)" width="100" prop="purchasePriceResult">
|
|
33
33
|
<template slot-scope="{ row }">
|
|
34
34
|
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
35
|
-
<
|
|
35
|
+
<el-tooltip class="ml10" effect="dark" placement="top">
|
|
36
|
+
<template slot="content">
|
|
37
|
+
{{getPurchaseAmountTip(item, row)}}
|
|
38
|
+
</template>
|
|
39
|
+
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{$formatNumber(item.purchasePriceResult, 2)}}
|
|
40
|
+
<i class="el-icon-question"></i>
|
|
41
|
+
</span>
|
|
42
|
+
</el-tooltip>
|
|
36
43
|
</div>
|
|
37
44
|
</template>
|
|
38
45
|
</el-table-column>
|
|
39
46
|
<el-table-column align="center" label="修正净重(MT)" width="130" prop="purchaseActualNetWeight">
|
|
40
47
|
<template slot-scope="{ row }">
|
|
41
48
|
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
42
|
-
<span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{item.purchaseActualNetWeight}}</span>
|
|
49
|
+
<span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{$formatNumber(item.purchaseActualNetWeight, 3)}}</span>
|
|
43
50
|
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item,'purchaseActualNetWeight', '1')"/>
|
|
44
51
|
</div>
|
|
45
52
|
</template>
|
|
@@ -47,13 +54,17 @@
|
|
|
47
54
|
<el-table-column align="center" label="修正单价($)" width="130" prop="purchaseActualUnitPrice">
|
|
48
55
|
<template slot-scope="{ row }">
|
|
49
56
|
<div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
|
|
50
|
-
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{item.purchaseActualUnitPrice}}</span>
|
|
57
|
+
<span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{$formatNumber(item.purchaseActualUnitPrice, 2)}}</span>
|
|
51
58
|
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item, 'purchaseActualUnitPrice', '1')"/>
|
|
52
59
|
</div>
|
|
53
60
|
</template>
|
|
54
61
|
</el-table-column>
|
|
55
|
-
<el-table-column align="center" prop="amount" label="采购金额($)" width="130"
|
|
56
|
-
|
|
62
|
+
<el-table-column align="center" prop="amount" label="采购金额($)" width="130">
|
|
63
|
+
<template slot-scope="{ row }">{{ $formatNumber(row.amount, 2) }}</template>
|
|
64
|
+
</el-table-column>
|
|
65
|
+
<el-table-column align="center" prop="purchaseDepositAmount" label="扣减定金($)" width="130">
|
|
66
|
+
<template slot-scope="{ row }">{{ $formatNumber(row.purchaseDepositAmount, 2) }}</template>
|
|
67
|
+
</el-table-column>
|
|
57
68
|
<el-table-column align="center" label="尾款">
|
|
58
69
|
<template slot-scope="{ row }">{{ $formatNumber(row.amount - row.purchaseDepositAmount, 2) }}</template>
|
|
59
70
|
</el-table-column>
|
|
@@ -61,17 +72,17 @@
|
|
|
61
72
|
<div class="my-footer">
|
|
62
73
|
<div class="footer-item" style="width:150px;text-align:center"> 总计</div>
|
|
63
74
|
<div class="footer-item" style="width:150px;text-align:center"> 柜数：{{ form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜</div>
|
|
64
|
-
<div class="footer-item">装运总净重：<br/>{{form.totalNetWeight + 'MT'}}</div>
|
|
75
|
+
<div class="footer-item">装运总净重：<br/>{{$formatNumber(form.totalNetWeight || 0, 3) + 'MT'}}</div>
|
|
65
76
|
<div style="width:100px"></div>
|
|
66
|
-
<div class="footer-item">装运总修正净重：<br/>{{
|
|
77
|
+
<div class="footer-item">装运总修正净重：<br/>{{$formatNumber(form.actualTotalNetWeight || 0, 3) + 'MT'}}</div>
|
|
67
78
|
<div style="width:135px"></div>
|
|
68
79
|
<div class="footer-item">采购总金额：
|
|
69
80
|
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseActualTotalAmount', '2')"/>
|
|
70
|
-
<br/>$ {{ form.totalPurchaseAmount }}
|
|
81
|
+
<br/>$ {{ $formatNumber(form.totalPurchaseAmount, 2) }}
|
|
71
82
|
</div>
|
|
72
83
|
<div class="footer-item">本次扣减定金：
|
|
73
84
|
<i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseDepositAmount', '2')"/>
|
|
74
|
-
<br/>$ {{ form.purchaseDepositAmount }}
|
|
85
|
+
<br/>$ {{ $formatNumber(form.purchaseDepositAmount, 2) }}
|
|
75
86
|
</div>
|
|
76
87
|
<div class="footer-item">采购总尾款：<br/>$ {{ $formatNumber(form.totalPurchaseAmount - form.purchaseDepositAmount, 2) }}</div>
|
|
77
88
|
</div>
|
|
@@ -84,7 +95,7 @@
|
|
|
84
95
|
<el-form-item label="本次装运总修正净重:">
|
|
85
96
|
<el-tooltip class="ml10" effect="dark" content="本次一共装了多少吨的货（取修正重量汇总）" placement="top">
|
|
86
97
|
<span>
|
|
87
|
-
{{
|
|
98
|
+
{{ $formatNumber(form.actualTotalNetWeight || 0, ) + 'MT'}}
|
|
88
99
|
<i class="el-icon-question"></i>
|
|
89
100
|
</span>
|
|
90
101
|
</el-tooltip>
|
|
@@ -105,7 +116,7 @@
|
|
|
105
116
|
<el-tooltip class="ml10" effect="dark" content="采购定金发票一共已付多少金额" placement="top">
|
|
106
117
|
<span>
|
|
107
118
|
$ {{
|
|
108
|
-
|
|
119
|
+
$formatNumber(form.totalPurchaseDepositAmount || 0, 2)
|
|
109
120
|
}}
|
|
110
121
|
<i class="el-icon-question"></i>
|
|
111
122
|
</span>
|
|
@@ -116,7 +127,7 @@
|
|
|
116
127
|
<el-form-item label="总已装运净重:">
|
|
117
128
|
<el-tooltip class="ml10" effect="dark" content="该采购合同一共装了多少吨的货" placement="top">
|
|
118
129
|
<span>
|
|
119
|
-
{{form.totalNetWeight + 'MT'}}
|
|
130
|
+
{{ $formatNumber(form.totalNetWeight, 3) + 'MT'}}
|
|
120
131
|
<i class="el-icon-question"></i>
|
|
121
132
|
</span>
|
|
122
133
|
</el-tooltip>
|
|
@@ -136,9 +147,9 @@
|
|
|
136
147
|
<el-form-item label="上次剩余定金:">
|
|
137
148
|
<el-tooltip class="ml10" effect="dark" content="创建时间在此之前的装运还剩多少定金可以抵扣，不会随着上次的抵扣金额中途变更而刷新，可为负数" placement="top">
|
|
138
149
|
<span>
|
|
139
|
-
<span v-if="form.purchaseDepositBalanceAmount == null"
|
|
150
|
+
<span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
|
|
140
151
|
<span v-else>
|
|
141
|
-
$ {{
|
|
152
|
+
$ {{ $formatNumber(form.purchaseDepositBalanceAmount, 2) }}
|
|
142
153
|
<span @click.stop="queryDeductionRecords" class="edit-style">点击查询扣减记录</span>
|
|
143
154
|
</span>
|
|
144
155
|
<i class="el-icon-question"></i>
|
|
@@ -150,7 +161,7 @@
|
|
|
150
161
|
<el-form-item label="签约总净重:">
|
|
151
162
|
<el-tooltip class="ml10" effect="dark" content="该采购合同一共签了多少吨的货（实时刷新合同的签约重量）" placement="top">
|
|
152
163
|
<span>
|
|
153
|
-
{{form.signedContractWeight + 'MT'}}
|
|
164
|
+
{{ $formatNumber(form.signedContractWeight || 0, 3) + 'MT'}}
|
|
154
165
|
<i class="el-icon-question"></i>
|
|
155
166
|
</span>
|
|
156
167
|
</el-tooltip>
|
|
@@ -171,9 +182,9 @@
|
|
|
171
182
|
<el-form-item label="本次扣减定金:">
|
|
172
183
|
<el-tooltip class="ml10" effect="dark" content="当前装运抵扣了多少定金" placement="top">
|
|
173
184
|
<span>
|
|
174
|
-
<span v-if="form.purchaseDepositAmount == null"
|
|
185
|
+
<span v-if="form.purchaseDepositAmount == null">$0</span>
|
|
175
186
|
<span v-else>
|
|
176
|
-
$ {{
|
|
187
|
+
$ {{ $formatNumber(form.purchaseDepositAmount || 0, 2)}}
|
|
177
188
|
</span>
|
|
178
189
|
<i class="el-icon-question"></i>
|
|
179
190
|
</span>
|
|
@@ -194,9 +205,9 @@
|
|
|
194
205
|
<el-form-item label="本次剩余定金:">
|
|
195
206
|
<el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
|
|
196
207
|
<span>
|
|
197
|
-
<span v-if="form.thisRemainingDeposit == null"
|
|
208
|
+
<span v-if="form.thisRemainingDeposit == null">$0</span>
|
|
198
209
|
<span v-else>
|
|
199
|
-
$ {{
|
|
210
|
+
$ {{ $formatNumber(form.thisRemainingDeposit || 0, 2) }}
|
|
200
211
|
</span>
|
|
201
212
|
<i class="el-icon-question"></i>
|
|
202
213
|
</span>
|
|
@@ -207,9 +218,9 @@
|
|
|
207
218
|
<el-form-item label="总剩余定金:">
|
|
208
219
|
<el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
|
|
209
220
|
<span>
|
|
210
|
-
<span v-if="form.purchaseDepositBalanceAmount == null"
|
|
221
|
+
<span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
|
|
211
222
|
<span v-else>
|
|
212
|
-
$ {{
|
|
223
|
+
$ {{ $formatNumber(form.purchaseDepositBalanceAmount || 0 ,2) }}
|
|
213
224
|
</span>
|
|
214
225
|
<i class="el-icon-question"></i>
|
|
215
226
|
</span>
|
|
@@ -402,8 +413,8 @@ export default {
|
|
|
402
413
|
getPurchaseAmountTip(item, row) {
|
|
403
414
|
var msg
|
|
404
415
|
msg = '成交单价为'
|
|
405
|
-
msg = msg + (item.quoteType
|
|
406
|
-
msg = msg + ',' + row.pointDate + '点到的期货价格为$' + row.pointPrice
|
|
416
|
+
msg = msg + (item.quoteType.includes('CMX') ? item.quoteType + item.purchaseUnitPrice : item.quoteType.includes('LME') ? item.purchaseUnitPrice + '%' + item.quoteType : '')
|
|
417
|
+
msg = msg + ', ' + row.pointDate + '点到的期货价格为$' + row.pointPrice
|
|
407
418
|
return msg
|
|
408
419
|
},
|
|
409
420
|
getColumnProp(row, type) {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
|
|
3
3
|
* @Date: 2024-08-19 15:46:00
|
|
4
4
|
* @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
|
|
5
|
-
* @LastEditTime: 2024-08-
|
|
5
|
+
* @LastEditTime: 2024-08-22 15:26:39
|
|
6
6
|
* @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue
|
|
7
7
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
8
8
|
-->
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
v-if="dialogVisible"
|
|
13
13
|
:visible.sync="dialogVisible"
|
|
14
14
|
width="40%"
|
|
15
|
+
style="margin-top: 30vh"
|
|
15
16
|
:modal="false"
|
|
16
17
|
:before-close="handleClose">
|
|
17
18
|
<div>
|