doctor-admin-components 1.0.13-beta.42 → 1.0.13-beta.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.13-beta.42",
+  "version": "1.0.13-beta.44",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -440,7 +440,7 @@
               <!-- 装箱单 -->
               <ContentTitle :contentTitleProp="{
                   bgButton: $t('contractDetail.packingList'),
-                  bgTime: contract.contractType == 'purchase' ? shipmentFileInfo.purchasePersonalPackingList && timeFormate(shipmentFileInfo.purchasePersonalPackingList) : shipmentFileInfo.salePersonalPackingList && timeFormate(shipmentFileInfo.salePersonalPackingList),
+                  bgTime: contract.contractType == 'purchase' ? shipmentFileInfo.purchasePersonalPackingList && timeFormate(shipmentFileInfo.purchasePersonalPackingList) : shipmentFileInfo.packingList && timeFormate(shipmentFileInfo.packingList),
                   bgcolor: shipProgressInfo.bgcolor
               }"></ContentTitle>
               <el-row v-if="contract.contractType == 'purchase'">
@@ -465,7 +465,7 @@
                       ">{{ identify }}
                     </span>
                   </div>
-                  <ShowAndHide :dataInfoArr="shipmentFileInfo.purchasePersonalPackingList" heightStr="50px" :HideAmount="4">
+                  <ShowAndHide :dataInfoArr="shipmentFileInfo.purchasePersonalPackingList" heightStr="50px" :HideAmount="2">
                     <template>
                       <el-col :span="24">
                         <div class="file-list">
@@ -496,7 +496,7 @@
               </el-row>
               <el-row v-if="contract.contractType == 'sale'">
                 <div>
-                  <ShowAndHide :dataInfoArr="shipmentFileInfo.packingList || []" heightStr="50px" :HideAmount="4">
+                  <ShowAndHide :dataInfoArr="shipmentFileInfo.packingList || []" heightStr="50px" :HideAmount="2">
                     <el-col :span="24">
                     <div class="file-list">
                       <el-col :span="12" v-if="!shipmentFileInfo.packingList || shipmentFileInfo.packingList.length == 0" class="center-status"> 
@@ -760,7 +760,7 @@
               </el-col>
               <el-col :span="24">
                 <el-col :span="24">
-                  <div>
+                  <div style="margin-bottom:-20px">
                     {{ getShipmentPurchaseAmount(shipmentFileInfo,shipmentIndex) }}
                     <span
                       v-if="channel !== 'official-website' &&
@@ -941,8 +941,7 @@
                           bgcolor: getGoodsProgressInfo.bgcolor,
                           successFlag: true
                         }"></ContentTitle>
-
-                      <div v-if="!contractFileInfo.balanceInvoiceFullyPaidFlag">
+                      <div v-if="!shipmentFileInfo.balanceInvoiceFullyPaidFlag">
                             <i class="el-icon-time"></i>
                             <span style="color:#f00">{{ $t('contractDetail.Final_payment_unpaid') }}</span>
                       </div>

package/packages/src/views/biz/bizFileInfo/contractFile/ShowAndHide.vue

@@ -2,17 +2,17 @@
  * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
  * @Date: 2024-02-26 10:03:01
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-04-09 20:22:20
+ * @LastEditTime: 2024-04-10 19:59:13
  * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/bizFileInfo/IMGPreviewCheckBox.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
     <div class="img-preview-root">
-        <div class="img-preview" :style="open ? 'height:max-content' : {'height':''}">
+        <div class="img-preview" :style="open ? 'height:max-content' : {'height':heightStr}">
             <slot></slot>
-             <div class="billOfLadingNo-more"  @click.stop="openFun" v-if="imgList && imgList.length > HideAmount">
-                <i v-if="open" class="el-icon-caret-top"></i>
-                <i v-else class="el-icon-caret-bottom"></i>
+             <div class="billOfLadingNo-more"  @click.stop="openFun" v-if="imgList && imgList.length > HideAmount" :style="{'height':heightStr}">
+                <i v-if="open" class="el-icon-caret-top icon-more"></i>
+                <i v-else class="el-icon-caret-bottom icon-more"></i>
             </div>
         </div>
     </div>
@@ -148,7 +148,12 @@ export default {
     top:0;
     background-color: #999;
     text-align: center;
-    line-height: 100px;
+    .icon-more {
+        position: absolute;
+        top: 50%;
+        left:50%;
+        transform: translate(-50%, -50%);
+    }
   }
 
 .img-preview-root {

package/packages/src/views/biz/contractTracing/contractTracingDetail.vue

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-07-20 17:13:54
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-04-10 11:31:10
+ * @LastEditTime: 2024-04-10 20:22:55
  * @FilePath: /recycle-vue-ui再生博士后台管理/src/views/biz/contractTracing/contractTracingDetail.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -154,8 +154,8 @@ export default {
     const contractId = this.$route.params && this.$route.params.contractId;
     this.getContract(contractId);
     const activeName = this.$route.query && this.$route.query.activeName;
-    // this.activeName = activeName || 'first';
-    this.activeName = 'fourth'
+    this.activeName = activeName || 'first';
+    // this.activeName = 'fourth'
     localStorage.setItem('contractDetail', location.href);
     location.href;
   },