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

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 (6) hide show
  1. package/package.json +1 -1
  2. package/packages/src/views/biz/bizFileInfo/contract.vue +7 -6
  3. package/packages/src/views/biz/bizFileInfo/contractFile/IMGPreviewCheckBox.vue +3 -1
  4. package/packages/src/views/biz/contractTracing/changrLogList.vue +2 -2
  5. package/packages/src/views/biz/contractTracing/shipmentPurchaseAmount.vue +3 -3
  6. package/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue +31 -8
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.23",
4
+ "version": "1.0.14-beta.25",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
package/packages/src/views/biz/bizFileInfo/contract.vue CHANGED
@@ -580,7 +580,7 @@
580
580
  </div>
581
581
  <el-divider direction="vertical"></el-divider>
582
582
  <div :class="hasSelectAllContainer(containerFile.containerId) ? 'border-button' : 'border-button border-button-blue'" @click.stop="clickSelectAllContainer(containerFile.containerId)">
583
- {{ hasSelectAllContainer(containerFile.containerId) ? $t('contractDetail.select_all') : $t('contractDetail.Deselect') }}
583
+ {{ hasSelectAllContainer(containerFile.containerId) ? $t('contractDetail.Deselect') : $t('contractDetail.select_all') }}
584
584
  </div>
585
585
  </div>
586
586
  </div>
@@ -1552,8 +1552,8 @@ export default {
1552
1552
  methods: {
1553
1553
  // 装运模块状态变化，需要同步关联模块
1554
1554
  handleShippingUpdateOpen(isOpen) {
1555
- this.$refs.SectionReceiving[0]?.setOpen(isOpen)
1556
- this.$refs.SectionClaim[0]?.setOpen(isOpen)
1555
+ this.$refs.SectionReceiving && this.$refs.SectionReceiving[0]?.setOpen(isOpen)
1556
+ this.$refs.SectionClaim && this.$refs.SectionClaim[0]?.setOpen(isOpen)
1557
1557
  this.$refs.SectionCNDN?.setOpen(isOpen)
1558
1558
  },
1559
1559
  handleScroll(elementId) {
@@ -1631,9 +1631,10 @@ export default {
1631
1631
  },
1632
1632
 
1633
1633
  hasSelectAllContainer(containerId) {
1634
- setTimeout(() => {
1635
- return this.$refs['container_packing_photo_' + containerId] && this.$refs['container_packing_photo_' + containerId][0]?.hasSelectAll()
1636
- }, 1000);
1634
+ // setTimeout(() => {
1635
+ let res = this.$refs['container_packing_photo_' + containerId] && this.$refs['container_packing_photo_' + containerId][0]?.hasSelectAll()
1636
+ return res
1637
+ // }, 1000);
1637
1638
  },
1638
1639
 
1639
1640
  changeShipBillNo(index) {
package/packages/src/views/biz/bizFileInfo/contractFile/IMGPreviewCheckBox.vue CHANGED
@@ -97,7 +97,9 @@ export default {
97
97
  }
98
98
  },
99
99
  hasSelectAll() {
100
- return !this.hasClicked
100
+ let res = this.imgList.find((item) => item.checked);
101
+ // console.log('xxxxxxx', res)
102
+ return res
101
103
  },
102
104
  checkAll1() {
103
105
  this.imgList.forEach((item) => {
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 13:41:47
5
+ * @LastEditTime: 2024-08-20 17:43:59
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
  -->
@@ -20,7 +20,7 @@
20
20
  </div>
21
21
  <div class="row-wrap-1" v-if="listItem.changeReason">
22
22
  <div class="title bold">修改原因：</div>
23
- <div>{{ listItem.changeReason }}</div>
23
+ <div style="white-space: pre-line !important">{{ listItem.changeReason }}</div>
24
24
  </div>
25
25
  </div>
26
26
  </div>
package/packages/src/views/biz/contractTracing/shipmentPurchaseAmount.vue CHANGED
@@ -2,14 +2,14 @@
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 14:23:13
5
+ * @LastEditTime: 2024-08-20 17:59:26
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
  -->
9
9
  <template>
10
10
  <div class="app-container">
11
11
  <!-- 合同争议详情对话框 -->
12
- <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
12
+ <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
13
13
  <el-form :model="form">
14
14
  <el-table
15
15
  :data="form.containerPurchaseAmountRespList"
@@ -57,7 +57,7 @@
57
57
  </el-table-column>
58
58
  </el-table>
59
59
  <div class="my-footer">
60
- <div style="width:65px;text-align:center"> 总计</div>
60
+ <div style="width:115px;text-align:center"> 总计</div>
61
61
  <div> 柜数：{{ form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜</div>
62
62
  <div>装运总净重： {{form.totalNetWeight + 'MT'}}</div>
63
63
  <div>装运总修正净重：{{ form.actualTotalNetWeight || 0 + 'MT'}}</div>
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 14:21:29
5
+ * @LastEditTime: 2024-08-20 18:16:26
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
  -->
@@ -46,6 +46,8 @@
46
46
  </template>
47
47
  <script>
48
48
  import { containerEditBatch, updateBizShipment } from '../../../api/biz/bizShipment'
49
+ import { MessageBox } from 'element-ui'
50
+
49
51
  export default {
50
52
  data() {
51
53
  return {
@@ -104,13 +106,31 @@ export default {
104
106
  }
105
107
 
106
108
  updateBizShipment(info).then(res => {
107
- this.$message({
108
- message: '修改成功',
109
- type: 'success'
110
- });
111
-
112
- this.$emit('refresh');
113
- this.dialogVisible = false;
109
+ if(this.prop == 'purchaseDepositContainerNumber') {
110
+ this.$message({
111
+ message: '修改成功',
112
+ type: 'success'
113
+ });
114
+ this.$emit('refresh');
115
+ MessageBox.confirm('您修改了总柜数，系统的计算的扣减定金将不再准确，请您手动修正本次扣减定金', '', {
116
+ confirmButtonText: '我知道了',
117
+ cancelButtonText: '取消',
118
+ type: 'warning'
119
+ })
120
+ .then(() => {
121
+ this.dialogVisible = false;
122
+ })
123
+ .catch(() => {
124
+ this.dialogVisible = false;
125
+ })
126
+ } else {
127
+ this.$message({
128
+ message: '修改成功',
129
+ type: 'success'
130
+ });
131
+ this.$emit('refresh');
132
+ this.dialogVisible = false;
133
+ }
114
134
  })
115
135
  }
116
136
  },
@@ -122,6 +142,9 @@ export default {
122
142
  this.prop = prop;
123
143
  this.info = info;
124
144
  this.form.vlaue = info[prop];
145
+ this.changeReason = null;
146
+ this.currentVal = null;
147
+
125
148
  if(prop == 'purchaseActualTotalAmount') {
126
149
  this.currentVal = info[prop];
127
150
  this.form.vlaue = null