doctor-admin-components 1.0.14-beta.25 → 1.0.14-beta.26

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 +2 -2
  4. package/packages/src/views/biz/contractTracing/shipmentPurchaseAmount.vue +25 -11
  5. package/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue +2 -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.26",
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-21 15:41:57
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
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-21 16:17:53
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>
@@ -53,21 +55,25 @@
53
55
  <el-table-column align="center" prop="amount" label="采购金额($)" width="130"></el-table-column>
54
56
  <el-table-column align="center" prop="purchaseDepositAmount" label="扣减定金($)" width="130"></el-table-column>
55
57
  <el-table-column align="center" label="尾款">
56
- <template slot-scope="{ row }">{{ (row.amount - row.purchaseDepositAmount).toFixed(2) }}</template>
58
+ <template slot-scope="{ row }">{{ $formatNumber(row.amount - row.purchaseDepositAmount, 2) }}</template>
57
59
  </el-table-column>
58
60
  </el-table>
59
61
  <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 }}
62
+ <div class="footer-item" style="width:150px;text-align:center"> 总计</div>
63
+ <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>
65
+ <div style="width:100px"></div>
66
+ <div class="footer-item">装运总修正净重：<br/>{{ form.actualTotalNetWeight || 0 + 'MT'}}</div>
67
+ <div style="width:135px"></div>
68
+ <div class="footer-item">采购总金额：
65
69
  <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseActualTotalAmount', '2')"/>
70
+ <br/>$ {{ form.totalPurchaseAmount }}
66
71
  </div>
67
- <div>本次扣减定金：$ {{ form.purchaseDepositAmount }}
72
+ <div class="footer-item">本次扣减定金：
68
73
  <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseDepositAmount', '2')"/>
74
+ <br/>$ {{ form.purchaseDepositAmount }}
69
75
  </div>
70
- <div>采购总尾款：$ {{ form.totalPurchaseAmount - form.purchaseDepositAmount }}</div>
76
+ <div class="footer-item">采购总尾款：<br/>$ {{ $formatNumber(form.totalPurchaseAmount - form.purchaseDepositAmount, 2) }}</div>
71
77
  </div>
72
78
  <!-- 自定义合并行 -->
73
79
  <div>
@@ -445,5 +451,13 @@ export default {
445
451
  background-color: #f5f7fa;
446
452
  padding: 10px;
447
453
  font-weight: bold;
454
+ .footer-item {
455
+ text-align: center;
456
+ width:130px;
457
+ }
458
+ }
459
+ ::v-deep .cell {
460
+ padding: 0;
461
+ word-break: break-word;
448
462
  }
449
463
  </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-21 15:20:00
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
  -->
@@ -30,7 +30,7 @@
30
30
  需要将采购总金额由$ <span style="color:#1890ff">{{ currentVal }}</span> 直接改成
31
31
  </div>
32
32
  <el-form-item :label="label">
33
- <el-input v-decimal="decimal" v-model="form.vlaue" placeholder="请输入标签">
33
+ <el-input v-decimal="decimal" v-model="form.vlaue" placeholder="请输入">
34
34
  <template slot="prepend" v-if="unitPostion == 'pre'">{{ unit }}</template>
35
35
  <template slot="append" v-if="unitPostion == 'append'">{{ unit }}</template>
36
36
  </el-input>