doctor-admin-components 1.0.14-beta.25 → 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.
Files changed (5) hide show
  1. package/package.json +1 -1
  2. package/packages/src/views/biz/contractTracing/changrLogList.vue +2 -2
  3. package/packages/src/views/biz/contractTracing/queryDeductionRecords.vue +6 -6
  4. package/packages/src/views/biz/contractTracing/shipmentPurchaseAmount.vue +56 -31
  5. package/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue +3 -2
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "doctor-admin-components",
3
3
  "version1": "1.0.11",
4
- "version": "1.0.14-beta.25",
4
+ "version": "1.0.14-beta.27",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
package/packages/src/views/biz/contractTracing/changrLogList.vue CHANGED
@@ -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-20 17:43:59
5
+ * @LastEditTime: 2024-08-21 16:19: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,7 +12,7 @@
12
12
  <div class="wrap" v-for="listItem in list" :key="listItem.changeId">
13
13
  <div class="row-wrap">
14
14
  <div class="time">{{ utc2local(listItem.changeTime, 'yyyy-MM-DD HH:mm:ss') }}</div>
15
- <div class="time">修改人{{ listItem.operName }}</div>
15
+ <div class="time">修改人：{{ listItem.operName }}</div>
16
16
  </div>
17
17
  <div class="row-wrap-1">
18
18
  <div class="title bold">修改内容：</div>
package/packages/src/views/biz/contractTracing/queryDeductionRecords.vue 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-20 13:45:55
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
  -->
@@ -10,7 +10,7 @@
10
10
  <el-dialog
11
11
  title="定金扣减记录"
12
12
  :visible.sync="dialogVisible"
13
- width="800px"
13
+ width="1200px"
14
14
  :modal="false"
15
15
  >
16
16
  <el-table
@@ -32,28 +32,28 @@
32
32
  prop="purchaseDepositTotalAmount"
33
33
  label="定金总额">
34
34
  <template slot-scope="{ row }">
35
- {{ row.purchaseDepositTotalAmount ? "$" + 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 ? "$" + 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 ? "$" + row.purchaseDepositAmount : '' }}</span>
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 ? "$" + row.purchaseDepositRemainAmount : '' }}
56
+ {{ row.purchaseDepositRemainAmount ? "$" + $formatNumber(row.purchaseDepositRemainAmount, 2) : '' }}
57
57
  </template>
58
58
  </el-table-column>
59
59
  </el-table>
package/packages/src/views/biz/contractTracing/shipmentPurchaseAmount.vue CHANGED
@@ -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-20 17:59:26
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
  -->
@@ -13,9 +13,11 @@
13
13
  <el-form :model="form">
14
14
  <el-table
15
15
  :data="form.containerPurchaseAmountRespList"
16
+ :cell-style="{'padding': '10px 0'}"
17
+ :header-cell-style="{'padding': '10px 0'}"
16
18
  >
17
- <el-table-column align="center" prop="containerNo" label="柜号"></el-table-column>
18
- <el-table-column align="center" label="货物名称">
19
+ <el-table-column align="center" prop="containerNo" width="150" label="柜号"></el-table-column>
20
+ <el-table-column align="center" label="货物名称" width="150" >
19
21
  <template slot-scope="{ row }">
20
22
  <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">{{item.askName}}</div>
21
23
  </template>
@@ -23,21 +25,28 @@
23
25
  <el-table-column align="center" label="净量(MT)" prop="goodsNetWeight">
24
26
  <template slot-scope="{ row }">
25
27
  <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
26
- <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>
27
29
  </div>
28
30
  </template>
29
31
  </el-table-column>
30
32
  <el-table-column align="center" label="单价($)" width="100" prop="purchasePriceResult">
31
33
  <template slot-scope="{ row }">
32
34
  <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
33
- <span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{item.purchasePriceResult}}</span>
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>
34
43
  </div>
35
44
  </template>
36
45
  </el-table-column>
37
46
  <el-table-column align="center" label="修正净重(MT)" width="130" prop="purchaseActualNetWeight">
38
47
  <template slot-scope="{ row }">
39
48
  <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
40
- <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>
41
50
  <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item,'purchaseActualNetWeight', '1')"/>
42
51
  </div>
43
52
  </template>
@@ -45,29 +54,37 @@
45
54
  <el-table-column align="center" label="修正单价($)" width="130" prop="purchaseActualUnitPrice">
46
55
  <template slot-scope="{ row }">
47
56
  <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
48
- <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>
49
58
  <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item, 'purchaseActualUnitPrice', '1')"/>
50
59
  </div>
51
60
  </template>
52
61
  </el-table-column>
53
- <el-table-column align="center" prop="amount" label="采购金额($)" width="130"></el-table-column>
54
- <el-table-column align="center" prop="purchaseDepositAmount" label="扣减定金($)" width="130"></el-table-column>
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>
55
68
  <el-table-column align="center" label="尾款">
56
- <template slot-scope="{ row }">{{ (row.amount - row.purchaseDepositAmount).toFixed(2) }}</template>
69
+ <template slot-scope="{ row }">{{ $formatNumber(row.amount - row.purchaseDepositAmount, 2) }}</template>
57
70
  </el-table-column>
58
71
  </el-table>
59
72
  <div class="my-footer">
60
- <div style="width:115px;text-align:center"> 总计</div>
61
- <div> 柜数：{{ form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜</div>
62
- <div>装运总净重： {{form.totalNetWeight + 'MT'}}</div>
63
- <div>装运总修正净重：{{ form.actualTotalNetWeight || 0 + 'MT'}}</div>
64
- <div>采购总金额：$ {{ form.totalPurchaseAmount }}
73
+ <div class="footer-item" style="width:150px;text-align:center"> 总计</div>
74
+ <div class="footer-item" style="width:150px;text-align:center"> 柜数：{{ form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜</div>
75
+ <div class="footer-item">装运总净重：<br/>{{$formatNumber(form.totalNetWeight || 0, 3) + 'MT'}}</div>
76
+ <div style="width:100px"></div>
77
+ <div class="footer-item">装运总修正净重：<br/>{{$formatNumber(form.actualTotalNetWeight || 0, 3) + 'MT'}}</div>
78
+ <div style="width:135px"></div>
79
+ <div class="footer-item">采购总金额：
65
80
  <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseActualTotalAmount', '2')"/>
81
+ <br/>$ {{ $formatNumber(form.totalPurchaseAmount, 2) }}
66
82
  </div>
67
- <div>本次扣减定金：$ {{ form.purchaseDepositAmount }}
83
+ <div class="footer-item">本次扣减定金：
68
84
  <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseDepositAmount', '2')"/>
85
+ <br/>$ {{ $formatNumber(form.purchaseDepositAmount, 2) }}
69
86
  </div>
70
- <div>采购总尾款：$ {{ form.totalPurchaseAmount - form.purchaseDepositAmount }}</div>
87
+ <div class="footer-item">采购总尾款：<br/>$ {{ $formatNumber(form.totalPurchaseAmount - form.purchaseDepositAmount, 2) }}</div>
71
88
  </div>
72
89
  <!-- 自定义合并行 -->
73
90
  <div>
@@ -78,7 +95,7 @@
78
95
  <el-form-item label="本次装运总修正净重:">
79
96
  <el-tooltip class="ml10" effect="dark" content="本次一共装了多少吨的货（取修正重量汇总）" placement="top">
80
97
  <span>
81
- {{ form.actualTotalNetWeight || 0 + 'MT'}}
98
+ {{ $formatNumber(form.actualTotalNetWeight || 0, ) + 'MT'}}
82
99
  <i class="el-icon-question"></i>
83
100
  </span>
84
101
  </el-tooltip>
@@ -99,7 +116,7 @@
99
116
  <el-tooltip class="ml10" effect="dark" content="采购定金发票一共已付多少金额" placement="top">
100
117
  <span>
101
118
  $ {{
102
- form.totalPurchaseDepositAmount
119
+ $formatNumber(form.totalPurchaseDepositAmount || 0, 2)
103
120
  }}
104
121
  <i class="el-icon-question"></i>
105
122
  </span>
@@ -110,7 +127,7 @@
110
127
  <el-form-item label="总已装运净重:">
111
128
  <el-tooltip class="ml10" effect="dark" content="该采购合同一共装了多少吨的货" placement="top">
112
129
  <span>
113
- {{form.totalNetWeight + 'MT'}}
130
+ {{ $formatNumber(form.totalNetWeight, 3) + 'MT'}}
114
131
  <i class="el-icon-question"></i>
115
132
  </span>
116
133
  </el-tooltip>
@@ -130,9 +147,9 @@
130
147
  <el-form-item label="上次剩余定金:">
131
148
  <el-tooltip class="ml10" effect="dark" content="创建时间在此之前的装运还剩多少定金可以抵扣，不会随着上次的抵扣金额中途变更而刷新，可为负数" placement="top">
132
149
  <span>
133
- <span v-if="form.purchaseDepositBalanceAmount == null"></span>
150
+ <span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
134
151
  <span v-else>
135
- $ {{ form.purchaseDepositBalanceAmount }}
152
+ $ {{ $formatNumber(form.purchaseDepositBalanceAmount, 2) }}
136
153
  <span @click.stop="queryDeductionRecords" class="edit-style">点击查询扣减记录</span>
137
154
  </span>
138
155
  <i class="el-icon-question"></i>
@@ -144,7 +161,7 @@
144
161
  <el-form-item label="签约总净重:">
145
162
  <el-tooltip class="ml10" effect="dark" content="该采购合同一共签了多少吨的货（实时刷新合同的签约重量）" placement="top">
146
163
  <span>
147
- {{form.signedContractWeight + 'MT'}}
164
+ {{ $formatNumber(form.signedContractWeight || 0, 3) + 'MT'}}
148
165
  <i class="el-icon-question"></i>
149
166
  </span>
150
167
  </el-tooltip>
@@ -165,9 +182,9 @@
165
182
  <el-form-item label="本次扣减定金:">
166
183
  <el-tooltip class="ml10" effect="dark" content="当前装运抵扣了多少定金" placement="top">
167
184
  <span>
168
- <span v-if="form.purchaseDepositAmount == null"/>
185
+ <span v-if="form.purchaseDepositAmount == null">$0</span>
169
186
  <span v-else>
170
- $ {{ form.purchaseDepositAmount}}
187
+ $ {{ $formatNumber(form.purchaseDepositAmount || 0, 2)}}
171
188
  </span>
172
189
  <i class="el-icon-question"></i>
173
190
  </span>
@@ -188,9 +205,9 @@
188
205
  <el-form-item label="本次剩余定金:">
189
206
  <el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
190
207
  <span>
191
- <span v-if="form.thisRemainingDeposit == null"></span>
208
+ <span v-if="form.thisRemainingDeposit == null">$0</span>
192
209
  <span v-else>
193
- $ {{ form.thisRemainingDeposit }}
210
+ $ {{ $formatNumber(form.thisRemainingDeposit || 0, 2) }}
194
211
  </span>
195
212
  <i class="el-icon-question"></i>
196
213
  </span>
@@ -201,9 +218,9 @@
201
218
  <el-form-item label="总剩余定金:">
202
219
  <el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
203
220
  <span>
204
- <span v-if="form.purchaseDepositBalanceAmount == null"></span>
221
+ <span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
205
222
  <span v-else>
206
- $ {{ form.purchaseDepositBalanceAmount }}
223
+ $ {{ $formatNumber(form.purchaseDepositBalanceAmount || 0 ,2) }}
207
224
  </span>
208
225
  <i class="el-icon-question"></i>
209
226
  </span>
@@ -396,8 +413,8 @@ export default {
396
413
  getPurchaseAmountTip(item, row) {
397
414
  var msg
398
415
  msg = '成交单价为'
399
- msg = msg + (item.quoteType == 'CMX' ? 'CMX-' + item.purchaseUnitPrice : item.quoteType == 'LME' ? item.purchaseUnitPrice + '%LME' : '')
400
- 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
401
418
  return msg
402
419
  },
403
420
  getColumnProp(row, type) {
@@ -445,5 +462,13 @@ export default {
445
462
  background-color: #f5f7fa;
446
463
  padding: 10px;
447
464
  font-weight: bold;
465
+ .footer-item {
466
+ text-align: center;
467
+ width:130px;
468
+ }
469
+ }
470
+ ::v-deep .cell {
471
+ padding: 0;
472
+ word-break: break-word;
448
473
  }
449
474
  </style>
package/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue CHANGED
@@ -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-20 18:16:26
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>
@@ -30,7 +31,7 @@
30
31
  需要将采购总金额由$ <span style="color:#1890ff">{{ currentVal }}</span> 直接改成
31
32
  </div>
32
33
  <el-form-item :label="label">
33
- <el-input v-decimal="decimal" v-model="form.vlaue" placeholder="请输入标签">
34
+ <el-input v-decimal="decimal" v-model="form.vlaue" placeholder="请输入">
34
35
  <template slot="prepend" v-if="unitPostion == 'pre'">{{ unit }}</template>
35
36
  <template slot="append" v-if="unitPostion == 'append'">{{ unit }}</template>
36
37
  </el-input>