doctor-admin-components 1.0.14-beta.31 → 1.0.14-beta.32

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 (2) hide show
  1. package/package.json +1 -1
  2. package/packages/src/views/biz/contractTracing/shipmentPurchaseAmount.vue +14 -14
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.31",
4
+ "version": "1.0.14-beta.32",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
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-23 14:27:23
5
+ * @LastEditTime: 2024-08-23 15:57: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
  -->
@@ -22,7 +22,7 @@
22
22
  <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">{{item.askName}};</div>
23
23
  </template>
24
24
  </el-table-column>
25
- <el-table-column align="center" label="净量(MT)" prop="goodsNetWeight">
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
28
  <span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{$formatNumber(item.goodsNetWeight, 3)}};</span>
@@ -206,28 +206,28 @@
206
206
  </el-form-item>
207
207
  </el-col>
208
208
  <el-col :span="8">
209
- <el-form-item label="本次剩余定金:">
210
- <el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
209
+ <el-form-item label="总剩余定金:">
210
+ <el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
211
211
  <span>
212
- <span v-if="form.thisRemainingDeposit == null">$0</span>
212
+ <span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
213
213
  <span v-else>
214
- $ {{ $formatNumber(form.thisRemainingDeposit || 0, 2) }}
214
+ $ {{ $formatNumber(form.purchaseDepositBalanceAmount || 0 ,2) }}
215
215
  </span>
216
- <i class="el-icon-question"></i>
217
- </span>
216
+ <i class="el-icon-question"></i>
217
+ </span>
218
218
  </el-tooltip>
219
219
  </el-form-item>
220
220
  </el-col>
221
221
  <el-col :span="8">
222
- <el-form-item label="总剩余定金:">
223
- <el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
222
+ <el-form-item label="本次剩余定金:">
223
+ <el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
224
224
  <span>
225
- <span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
225
+ <span v-if="form.thisRemainingDeposit == null">$0</span>
226
226
  <span v-else>
227
- $ {{ $formatNumber(form.purchaseDepositBalanceAmount || 0 ,2) }}
227
+ $ {{ $formatNumber(form.thisRemainingDeposit || 0, 2) }}
228
228
  </span>
229
- <i class="el-icon-question"></i>
230
- </span>
229
+ <i class="el-icon-question"></i>
230
+ </span>
231
231
  </el-tooltip>
232
232
  </el-form-item>
233
233
  </el-col>