doctor-admin-components 1.0.13-beta.40 → 1.0.13-beta.41

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 (4) hide show
  1. package/package.json +1 -1
  2. package/packages/src/views/biz/bizFileInfo/contract.vue +59 -50
  3. package/packages/src/views/biz/bizFileInfo/contractFile/ProgressDetail.vue +5 -5
  4. package/packages/src/views/biz/bizFileInfo/contractFile/ShowAndHide.vue +173 -0
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.13-beta.40",
4
+ "version": "1.0.13-beta.41",
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
@@ -442,7 +442,7 @@
442
442
  bgTime: contract.contractType == 'purchase' ? shipmentFileInfo.purchasePersonalPackingList && timeFormate(shipmentFileInfo.purchasePersonalPackingList) : shipmentFileInfo.salePersonalPackingList && timeFormate(shipmentFileInfo.salePersonalPackingList),
443
443
  bgcolor: shipProgressInfo.bgcolor
444
444
  }"></ContentTitle>
445
- <el-row v-if="contract.contractType == 'sale'">
445
+ <el-row v-if="contract.contractType == 'purchase'">
446
446
  <div>
447
447
  <div class="sub-title">
448
448
  <span style="color: #1890ff; cursor: pointer" v-if="shipmentFileInfo &&
@@ -464,57 +464,63 @@
464
464
  ">{{ identify }}
465
465
  </span>
466
466
  </div>
467
- <el-col :span="24">
468
- <div class="file-list">
469
- <!-- <el-col :span="12" v-if="!shipmentFileInfo.purchasePersonalPackingList || shipmentFileInfo.purchasePersonalPackingList.length == 0" class="center-status">
470
- <i class="el-icon-time"></i>
471
- 装箱单待更新
472
- </el-col> -->
473
- <file-show :hiddenOperation="channel == 'official-website'" @refresh="handleRefresh"
474
- @checked="handleChecked" @uncheck="handleUncheck" :selectFileListProp="selectFileList" :file-info="item" v-for="(
475
- item, i
476
- ) in shipmentFileInfo.purchasePersonalPackingList" :key="i" />
477
-
478
- <contract-file-drag-upload
479
- @upload="handleUpload(
480
- $event,
481
- shipmentFileInfo.shipmentId,
482
- 'shipment',
483
- 'purchase_personal_shipment_packing_list'
484
- )"
485
- :isShowTip="false"
486
- uploadNameStr="装箱单"
487
- />
488
- </div>
489
- </el-col>
467
+ <ShowAndHide :dataInfoArr="shipmentFileInfo.purchasePersonalPackingList" heightStr="50px" :HideAmount="4">
468
+ <template>
469
+ <el-col :span="24">
470
+ <div class="file-list">
471
+ <!-- <el-col :span="12" v-if="!shipmentFileInfo.purchasePersonalPackingList || shipmentFileInfo.purchasePersonalPackingList.length == 0" class="center-status">
472
+ <i class="el-icon-time"></i>
473
+ 装箱单待更新
474
+ </el-col> -->
475
+ <file-show :hiddenOperation="channel == 'official-website'" @refresh="handleRefresh"
476
+ @checked="handleChecked" @uncheck="handleUncheck" :selectFileListProp="selectFileList" :file-info="item" v-for="(
477
+ item, i
478
+ ) in shipmentFileInfo.purchasePersonalPackingList" :key="i" />
479
+
480
+ <contract-file-drag-upload
481
+ @upload="handleUpload(
482
+ $event,
483
+ shipmentFileInfo.shipmentId,
484
+ 'shipment',
485
+ 'purchase_personal_shipment_packing_list'
486
+ )"
487
+ :isShowTip="false"
488
+ uploadNameStr="装箱单"
489
+ />
490
+ </div>
491
+ </el-col>
492
+ </template>
493
+ </ShowAndHide>
490
494
  </div>
491
495
  </el-row>
492
- <el-row v-if="contract.contractType == 'purchase'">
496
+ <el-row v-if="contract.contractType == 'sale'">
493
497
  <div>
494
- <el-col :span="24">
495
- <div class="file-list">
496
- <el-col :span="12" v-if="!shipmentFileInfo.salePersonalPackingList || shipmentFileInfo.salePersonalPackingList.length == 0" class="center-status">
497
- <i class="el-icon-time"></i>
498
- 装箱单待更新
498
+ <ShowAndHide :dataInfoArr="shipmentFileInfo.salePersonalPackingList" heightStr="50px" :HideAmount="4">
499
+ <el-col :span="24">
500
+ <div class="file-list">
501
+ <el-col :span="12" v-if="!shipmentFileInfo.salePersonalPackingList || shipmentFileInfo.salePersonalPackingList.length == 0" class="center-status">
502
+ <i class="el-icon-time"></i>
503
+ 装箱单待更新
504
+ </el-col>
505
+ <file-show :hiddenOperation="channel == 'official-website'" @refresh="handleRefresh"
506
+ @checked="handleChecked" @uncheck="handleUncheck" :selectFileListProp="selectFileList" :file-info="item" v-for="(
507
+ item, i
508
+ ) in shipmentFileInfo.salePersonalPackingList" :key="i" />
509
+ <!-- sale 只做展示 -->
510
+ <!-- <contract-file-drag-upload v-if="channel !== 'official-website'" @upload="
511
+ handleUpload(
512
+ $event,
513
+ shipmentFileInfo.shipmentId,
514
+ 'shipment',
515
+ 'sale_personal_shipment_packing_list'
516
+ )
517
+ "
518
+ :isShowTip="false"
519
+ uploadNameStr="装箱单"
520
+ /> -->
521
+ </div>
499
522
  </el-col>
500
- <file-show :hiddenOperation="channel == 'official-website'" @refresh="handleRefresh"
501
- @checked="handleChecked" @uncheck="handleUncheck" :selectFileListProp="selectFileList" :file-info="item" v-for="(
502
- item, i
503
- ) in shipmentFileInfo.salePersonalPackingList" :key="i" />
504
- <!-- sale 只做展示 -->
505
- <!-- <contract-file-drag-upload v-if="channel !== 'official-website'" @upload="
506
- handleUpload(
507
- $event,
508
- shipmentFileInfo.shipmentId,
509
- 'shipment',
510
- 'sale_personal_shipment_packing_list'
511
- )
512
- "
513
- :isShowTip="false"
514
- uploadNameStr="装箱单"
515
- /> -->
516
- </div>
517
- </el-col>
523
+ </ShowAndHide>
518
524
  </div>
519
525
  </el-row>
520
526
 
@@ -1264,6 +1270,8 @@ import SectionSlot from "./contractFile/SectionSlot.vue";
1264
1270
  import ContentTitle from './contractFile/ContentTitle.vue';
1265
1271
  import IMGPreviewCheckBox from './contractFile/IMGPreviewCheckBox.vue'
1266
1272
  import BillOfLadingNoTab from './contractFile/BillOfLadingNoTab.vue'
1273
+ import ShowAndHide from './contractFile/ShowAndHide.vue'
1274
+
1267
1275
  let handleGenerateflag = false;
1268
1276
  let handleGenerateflag1 = false;
1269
1277
 
@@ -1284,7 +1292,8 @@ export default {
1284
1292
  ProgressDetail,
1285
1293
  ContentTitle,
1286
1294
  IMGPreviewCheckBox,
1287
- BillOfLadingNoTab
1295
+ BillOfLadingNoTab,
1296
+ ShowAndHide
1288
1297
  },
1289
1298
  props: {
1290
1299
  // 文件信息
@@ -2310,7 +2319,7 @@ export default {
2310
2319
  .addshipment {
2311
2320
  position: absolute;
2312
2321
  left:100px;
2313
- top:88px;
2322
+ top:120px;
2314
2323
  background-color:#fff;
2315
2324
  height:30px;
2316
2325
  line-height:30px;
package/packages/src/views/biz/bizFileInfo/contractFile/ProgressDetail.vue CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
3
3
  * @Date: 2024-02-22 11:04:36
4
4
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
5
- * @LastEditTime: 2024-04-08 16:04:47
5
+ * @LastEditTime: 2024-04-09 19:17:27
6
6
  * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/bizFileInfo/contractFile/Process.vue
7
7
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8
8
  -->
@@ -71,12 +71,12 @@ export default {
71
71
  <style lang="scss" scoped>
72
72
  .progress {
73
73
  min-width: 85px;
74
- min-height: 112px;
74
+ min-height: 150px;
75
75
  padding:5px;
76
76
  box-sizing: border-box;
77
77
  position:relative;
78
78
  .progress-left {
79
- min-height:112px;
79
+ min-height:150px;
80
80
  display: flex;
81
81
  align-items: center;
82
82
  justify-content: center;
@@ -102,14 +102,14 @@ export default {
102
102
  color: #231F20;
103
103
  }
104
104
  .progress-info {
105
- min-height:112px;
105
+ min-height:150px;
106
106
  overflow:hidden;
107
107
  .progress-info-item {
108
108
  margin-top:8px;
109
109
  overflow:hidden;
110
110
  }
111
111
  .progress-info-text {
112
- min-height:112px;
112
+ min-height:150px;
113
113
  padding-left:10px;
114
114
  display:flex;
115
115
  flex-direction: column;
package/packages/src/views/biz/bizFileInfo/contractFile/ShowAndHide.vue ADDED
@@ -0,0 +1,173 @@
1
+ <!--
2
+ * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
3
+ * @Date: 2024-02-26 10:03:01
4
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
5
+ * @LastEditTime: 2024-04-09 18:54:16
6
+ * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/bizFileInfo/IMGPreviewCheckBox.vue
7
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8
+ -->
9
+ <template>
10
+ <div class="img-preview-root">
11
+ <div class="img-preview" :style="open ? 'height:max-content' : {'height':''}">
12
+ <slot></slot>
13
+ <div class="billOfLadingNo-more" @click.stop="openFun" v-if="imgList && imgList.length > HideAmount">
14
+ <i v-if="open" class="el-icon-caret-top"></i>
15
+ <i v-else class="el-icon-caret-bottom"></i>
16
+ </div>
17
+ </div>
18
+ </div>
19
+ </template>
20
+
21
+ <script>
22
+
23
+ export default {
24
+ name: 'ShowAndHide',
25
+ props: {
26
+ dataInfoArr: {
27
+ type: Array,
28
+ default: () => []
29
+ },
30
+ heightStr: {
31
+ type: String,
32
+ default: '110px'
33
+ },
34
+ HideAmount: {
35
+ type: Number,
36
+ default: 4
37
+ }
38
+ },
39
+ data() {
40
+ return {
41
+ open: false,
42
+ imgList: []
43
+ };
44
+ },
45
+
46
+ mounted() {
47
+
48
+ },
49
+
50
+ methods: {
51
+
52
+
53
+
54
+ // 文件名称
55
+ extractFileName() {
56
+ return 'loading photos-' + this.info.containerNo + '/container ' + this.info?.containerId + '/ Dated ' + this.$moment(new Date().getTime()).format('YYYY-MM-DD')
57
+ },
58
+ /**
59
+ * @description: 下载一个文件
60
+ * @param {*} file
61
+ * @return {*}
62
+ */
63
+ downloadSingleFile(file) {
64
+ this.loadingInstance = Loading.service({
65
+ text: '请稍候',
66
+ spinner: 'el-icon-loading',
67
+ background: 'rgba(0, 0, 0, 0.7)',
68
+ });
69
+ // 从URL中提取文件名
70
+ const fileName = this.extractFileName();
71
+ // 如果是zip文件，重新命名为当前时间戳，否则使用原文件名
72
+ const newName = /\.zip$/i.test(fileName) ? fileName + '.zip' : fileName;
73
+ saveAs(file.url, newName);
74
+ this.loadingInstance.close();
75
+ },
76
+
77
+ openFun () {
78
+ this.open = !this.open
79
+ },
80
+ },
81
+ watch: {
82
+ dataInfoArr: {
83
+ handler(val) {
84
+ if(val.length) {
85
+ this.imgList = val;
86
+ }
87
+ },
88
+ deep: true,
89
+ immediate: true
90
+ }
91
+ },
92
+ computed: {
93
+ },
94
+ beforeDestroy() {
95
+ this.loadingInstance = null
96
+ clearTimeout(this.timer)
97
+ }
98
+ };
99
+ </script>
100
+
101
+ <style lang="scss" scoped>
102
+ .img-preview {
103
+ display:flex;
104
+ flex-wrap: wrap;
105
+ padding-right:40px;
106
+ height:110px;
107
+ overflow:hidden;
108
+ position: relative;
109
+ width:100%;
110
+ .img-block {
111
+ position: relative;
112
+ margin:0 15px 15px 0;
113
+ background-color: #666;
114
+ }
115
+ .fold-wrap {
116
+ position: absolute;
117
+ right: 0;
118
+ width: 80px;
119
+ height: 100%;
120
+ display: flex;
121
+ justify-content: center;
122
+ align-items: center;
123
+ .el-button {
124
+ margin-bottom: 20px;
125
+ }
126
+
127
+ }
128
+ }
129
+ .checkbox-size {
130
+ position:absolute;
131
+ left:0;
132
+ width:18px;
133
+ height:18px;
134
+ }
135
+ .download-icon {
136
+ position: absolute;
137
+ bottom:2px;
138
+ right:0;
139
+ background-color: #fff;
140
+ cursor: pointer;
141
+ }
142
+
143
+ .billOfLadingNo-more {
144
+ width:20px;
145
+ height:100px;
146
+ position:absolute;
147
+ right:0;
148
+ top:0;
149
+ background-color: #999;
150
+ text-align: center;
151
+ line-height: 100px;
152
+ }
153
+
154
+ .img-preview-root {
155
+ position: relative;
156
+ .batch-download {
157
+ position: absolute;
158
+ top: -41px;
159
+ left: 620px;
160
+ min-width: 80px;
161
+ width:max-content;
162
+ padding:0 10px;
163
+ height: 22px;
164
+ line-height: 22px;
165
+ text-align: center;
166
+ border-radius: 10px;
167
+ background-color: #54B8FF;
168
+ cursor: pointer;
169
+ font-size:12px;
170
+ }
171
+ }
172
+
173
+ </style>