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

package/package.json

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

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

@@ -183,7 +183,7 @@
                     @checked="handleChecked" @uncheck="handleUncheck"  :selectFileListProp="selectFileList" :file-info="item" v-for="(
                       item, i
                     ) in contractFileInfo.personalProformaInvoiceFileInfo" :key="i" />
-                  <contract-file-drag-upload v-show="(!contractFileInfo.personalProformaInvoiceFileInfo || contractFileInfo.personalProformaInvoiceFileInfo.length == 0) && contract.contractType == 'sale'" @upload="
+                  <contract-file-drag-upload v-show="contract.contractType == 'sale' && ((!contractFileInfo.personalProformaInvoiceFileInfo || contractFileInfo.personalProformaInvoiceFileInfo.length == 0) && (!contractFileInfo.proformaInvoiceFileInfo || contractFileInfo.proformaInvoiceFileInfo.length == 0))" @upload="
                     handleUpload(
                       $event,
                       contractFileInfo.proformaInvoice.id,
@@ -782,11 +782,11 @@
                         <i class="el-icon-question" slot="reference" style="color:#c2c4c5;"/>
                     </el-popover>
                   </div>
-                  <el-col :span="12">
+                  <el-col :span="12" :getNewInfo="getNewInfo">
                     <div style="display:flex;align-items:center">
                       <ContentTitle :contentTitleProp="{
                         bgButton: $t('contractDetail.finallyInvoice'),
-                        bgTime: contract.contractType == 'sale' ? shipmentFileInfo.saleFinallyInvoice && timeFormate(shipmentFileInfo.saleFinallyInvoice) : shipmentFileInfo.purchaseFinallyInvoice && timeFormate(shipmentFileInfo.purchaseFinallyInvoice),
+                        bgTime: contract.contractType == 'sale' ? getNewInfo && timeFormate(getNewInfo) : shipmentFileInfo.purchaseFinallyInvoice && timeFormate(shipmentFileInfo.purchaseFinallyInvoice),
                         bgcolor: shipProgressInfo.bgcolor
                       }"></ContentTitle>
                       <span
@@ -837,6 +837,7 @@
                         </div>
                       </div>
                     </el-col> -->
+                    <!-- 尾款发票 -->
                     <el-col :span="12">
                       <div>
                         <div class="file-list">
@@ -849,17 +850,17 @@
                             :file-info="item"
                             v-for="(
                               item, i
-                            ) in shipmentFileInfo.saleFinallyInvoice"
+                            ) in getNewInfo"
                             :key="i"
                           />
                           <contract-file-drag-upload
-                            v-show="(!shipmentFileInfo.saleFinallyInvoice || shipmentFileInfo.saleFinallyInvoice.length == 0) && channel !== 'official-website'"
+                            v-show="(!getNewInfo) && channel !== 'official-website'"
                             @upload="
                               handleUpload(
                                 $event,
                                 shipmentFileInfo.shipmentId,
                                 'shipment',
-                                'sale_finally_invoice'
+                                'sale_personal_finally_invoice'
                               )
                             "
                             :isShowTip="false"
@@ -1455,7 +1456,7 @@ export default {
      * @return {*}
      */
     timeFormate(info) {
-      if(info.length > 0 && info[0].createTime) {
+      if(info.length > 0 && info && info[0].createTime) {
         return this.$moment.utc(info[0].createTime).local().format('YYYY-MM-DD HH:mm');
       } else {
         return '';
@@ -1496,7 +1497,7 @@ export default {
     identifyPageBoth(shipmentFileInfo, type) {
       // 正式 purchaseFinallyInvoice
       if (type == 2) {
-        if (shipmentFileInfo?.purchaseFinallyInvoice[0]?.url) {
+        if (shipmentFileInfo?.purchaseFinallyInvoice && shipmentFileInfo?.purchaseFinallyInvoice[0]?.url) {
           this.identifyPage(
             shipmentFileInfo?.purchaseFinallyInvoice[0]?.url,
             shipmentFileInfo && shipmentFileInfo.shipmentId,
@@ -2147,6 +2148,31 @@ export default {
     },
   },
   computed: {
+    // 销售获取最新的尾款发票
+    getNewInfo() {
+      // 时间比较
+      let shipmentFileInfo  = this.shipmentItemData && this.shipmentItemData
+      if((shipmentFileInfo.saleFinallyInvoice && shipmentFileInfo.saleFinallyInvoice.length > 0) && (shipmentFileInfo.salePersonalFinallyInvoice && shipmentFileInfo.salePersonalFinallyInvoice.length > 0)) {
+          if((shipmentFileInfo.saleFinallyInvoice && shipmentFileInfo.saleFinallyInvoice[0]?.createTime) > (shipmentFileInfo.salePersonalFinallyInvoice && shipmentFileInfo.salePersonalFinallyInvoice[0]?.createTime)) {
+              return shipmentFileInfo.saleFinallyInvoice
+          } else {
+              return shipmentFileInfo.salePersonalFinallyInvoice
+          }
+      } else {
+        // 展示存在的其中一个 saleFinallyInvoice
+        if(shipmentFileInfo.saleFinallyInvoice && shipmentFileInfo.saleFinallyInvoice.length && (!shipmentFileInfo.salePersonalFinallyInvoice || shipmentFileInfo.salePersonalFinallyInvoice.length == 0)) {
+            return shipmentFileInfo.saleFinallyInvoice
+        }
+  
+        // 展示存在的其中一个 salePersonalFinallyInvoice
+        if((!shipmentFileInfo.saleFinallyInvoice || shipmentFileInfo.saleFinallyInvoice.length == 0) &&  (shipmentFileInfo.salePersonalFinallyInvoice &&  shipmentFileInfo.salePersonalFinallyInvoice.length)) {
+            return shipmentFileInfo.salePersonalFinallyInvoice
+        }
+        
+        return ''
+      }
+
+    },
     claimFileInfoCom() {
       if (
         (this.contractFileInfo &&