doctor-admin-components 1.0.13-beta.45 → 1.0.13-beta.47

package/package.json

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

package/packages/src/i18n/en/message.json

@@ -96,12 +96,12 @@
     "Deposit_received": "Deposit received",
     "Deposit_invoice_to_be_uploaded":"Deposit invoice to be uploaded",
     "Generate_deposit_invoice":"Generate deposit invoice",
-    "Payment_voucher":"Payment Voucher",
+    "Payment_voucher":"Deposit Remittance Receipt/Swift",
     "Please_enter_a_file_name":"Please enter a file name",
     "rename":"Rename",
-    "tip15": "Drag files here",
+    "tip15": "Drag and drop the files to upload",
     "Final_payment_unpaid":"Final Payment Unpaid",
-    "Final_payment_voucher":"Final payment voucher",
+    "Final_payment_voucher":"Final payment Final Payment Remittance Receipt swift",
     "final_payment_warning":"The system automatically calculates the reference final payment based on the weight x unit price minus deposit, which can be used to verify the invoice. Click on the blue font to view the system's data source details and modify the automatically calculated deduction deposit.",
     "Copy_of_formal_bill_of_lading":"Copy of formal bill of lading",
     "Formal_bill_of_lading_copy_to_be_updated": "Formal bill of lading copy to be updated",

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

@@ -140,7 +140,7 @@
                   <span class="bg-history" v-if="channel !== 'official-website'" @click="skipInvoiceList">{{ $t('contractDetail.invoice_list') }}</span>
                 </div>
               </el-col>
-
+              <!-- 支付凭证 -->
               <el-col :span="12" v-if="contractFileInfo.proformaInvoiceWaterBillFileInfo && contractFileInfo.proformaInvoiceWaterBillFileInfo.length">
                 <ContentTitle :contentTitleProp="{
                     bgButton: $t('contractDetail.Payment_voucher'),
@@ -465,7 +465,7 @@
                       ">{{ identify }}
                     </span>
                   </div>
-                  <ShowAndHide :dataInfoArr="shipmentFileInfo.purchasePersonalPackingList" heightStr="50px" :HideAmount="2">
+                  <ShowAndHide :dataInfoArr="shipmentFileInfo.purchasePersonalPackingList" heightStr="100px" :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="2">
+                  <ShowAndHide :dataInfoArr="shipmentFileInfo.packingList || []" heightStr="100px" :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"> 
@@ -535,7 +535,7 @@
                 <el-col :span="24">
                   <div class="content-root-row">
                     <ContentTitle :contentTitleProp="{
-                        bgButton: $t('contractDetail.packingPhoto') + containerFile.containerNo,
+                        bgButton: $t('contractDetail.packingPhoto')+ ' ' + containerFile.containerNo,
                         bgTime: containerFile.packingPhoto && timeFormate(containerFile.packingPhoto),
                         bgcolor: shipProgressInfo.bgcolor
                       }"></ContentTitle>
@@ -1907,7 +1907,7 @@ export default {
           }
 
           // 是否已支付尾款
-          if(!shipmentItem.balanceInvoiceFullyPaidFlag && this.contract.contractType == 'sale') {
+          if(!shipmentItem.generateInvoiceFlag && this.contract.contractType == 'purchase') {
            // 尾款发票待上传（英文：Balance Invoice to be updated）
            shipTextArr.push(this.$t('contractDetail.balance_invoice_false'))
           }

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

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
  * @Date: 2024-02-22 11:04:36
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-04-10 15:04:48
+ * @LastEditTime: 2024-04-11 10:28:42
  * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/bizFileInfo/contractFile/Process.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -71,6 +71,7 @@ export default {
         font-size: 14px;
         line-height:27px;
         font-weight: normal;
+        color: #FFFFFF;
     }
     .progress-rate {
         font-size: 14px;