doctor-admin-components 1.0.13-beta.88 → 1.0.13-beta.89

package/package.json

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

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

@@ -83,7 +83,8 @@
     "remarkTip": "Please enter a note",
     "Payable_Amount": "Payable Amount",
     "Amount_Paid": "Amount Paid",
-    "Balance_Due": "Balance Due"
+    "Balance_Due": "Balance Due",
+    "Voided": "Voided"
   },
   "contractDetail": {
     "Reference_No": "Reference No.",
@@ -293,7 +294,8 @@
     "voided": "Voided",
     "voucherOrReceipt": "Voucher/Receipt",
     "weight": "weight(MT)",
-    "yes": "Yes"
+    "yes": "Yes",
+    "cndn": "Debit note & Credit note"
   },
   "distpicker":{
     "province": "Province",

package/packages/src/i18n/zh-CN/message.json

@@ -83,7 +83,8 @@
     "remarkTip": "请输入备注",
     "Payable_Amount": "应付金额",
     "Amount_Paid": "已付金额",
-    "Balance_Due": "待付余额"
+    "Balance_Due": "待付余额",
+    "Voided": "已作废"
   },
   "contractDetail": {
     "Reference_No": "合同参考号",
@@ -293,7 +294,8 @@
     "voided": "已作废",
     "voucherOrReceipt": "凭证/条款",
     "weight": "重量(MT)",
-    "yes": "Yes"
+    "yes": "Yes",
+    "cndn": "Debit note & Credit note"
   },
   "distpicker":{
     "province": "省",

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

@@ -1202,6 +1202,84 @@
         </template>
       </SectionSlot>
     </div>
+    <!-- cndn -->
+    <div style="margin-top:50px" v-if="CNbillsCom.length || DNbillsCom.length">
+      <SectionSlot
+        :infoPro="cndnProgressInfo" 
+        >
+          <template v-slot:header>
+            <div>
+              <ProgressDetail :infoPro="cndnProgressInfo"></ProgressDetail>
+            </div>
+          </template>
+          <template v-slot:content>
+            <div class="content-root">
+              <div v-if="DNbillsCom.length">
+                <ContentTitle
+                 :contentTitleProp="{
+                bgButton: $t('contractDetail.Debit_Note'),
+                bgTime: DNbillsCom.length && timeFormate(DNbillsCom),
+                bgcolor: cndnProgressInfo.bgcolor
+              }"></ContentTitle>
+                <el-col :span="24">
+                  <div class="file-list" v-if="DNbillsCom.length">
+                    <file-show @refresh="handleRefresh" @checked="handleChecked" @uncheck="handleUncheck"
+                      :selectFileListProp="selectFileList"
+                      :hiddenOperation="true"
+                      :file-info="item" v-for="(item, i) in DNbillsCom" :key="i" />
+                    <!-- <contract-file-drag-upload
+                      @upload="
+                        handleUpload(
+                          $event,
+                          shipmentFileInfo.shipmentId,
+                          'shipment',
+                          'shipment_delivery_receipt'
+                        )
+                      "
+                      :isShowTip="false"
+                    /> -->
+                  </div>
+                  <!-- <div v-else class="center-status">
+                    <i class="el-icon-time"></i>
+                    {{ $t('contractDetail.no_files') }}
+                  </div> -->
+                </el-col>
+              </div>
+              <div v-if="CNbillsCom.length">
+                <ContentTitle
+                :contentTitleProp="{
+                bgButton: $t('contractDetail.Credit_Note'),
+                bgTime: CNbillsCom.length && timeFormate(CNbillsCom),
+                bgcolor: cndnProgressInfo.bgcolor
+              }"></ContentTitle>
+                <el-col :span="24">
+                  <div class="file-list" v-if="CNbillsCom.length">
+                    <file-show @refresh="handleRefresh" @checked="handleChecked" @uncheck="handleUncheck"
+                      :selectFileListProp="selectFileList"
+                      :hiddenOperation="true"
+                      :file-info="item" v-for="(item, i) in CNbillsCom" :key="i" />
+                    <!-- <contract-file-drag-upload
+                      @upload="
+                        handleUpload(
+                          $event,
+                          shipmentFileInfo.shipmentId,
+                          'shipment',
+                          'shipment_delivery_receipt'
+                        )
+                      "
+                      :isShowTip="false"
+                    /> -->
+                  </div>
+                  <!-- <div v-else class="center-status">
+                    <i class="el-icon-time"></i>
+                    {{ $t('contractDetail.no_files') }}
+                  </div> -->
+                </el-col>
+              </div>
+            </div>
+          </template>
+        </SectionSlot>
+    </div>
 
     <deposit-invoice ref="depositInvoice"></deposit-invoice>
 
@@ -1340,28 +1418,40 @@ export default {
         rate: 0,
         img: 'https://s3.cdn.doctorscrap.com/dev/user/image_9/805524d45f964ad0b3f51437d3b5750e.png',
         bgcolor: '#FBB040',
-        textArr:[]
+        textArr:[],
+        hidden: false
       },
       shipProgressInfo: {
         text: this.$t('contractDetail.shipment'),
         rate: 0,
         img: 'https://s3.cdn.doctorscrap.com/dev/user/image_9/8517dbf0444542d5bf100279231c9597.png',
         bgcolor: '#54B8FF',
-        textArr:[this.$t('contractDetail.Waiting_for_the_seller_to_ship')]
+        textArr:[this.$t('contractDetail.Waiting_for_the_seller_to_ship')],
+        hidden: false
       },
       getGoodsProgressInfo: {
         text: this.$t('contractDetail.receiving'),
         rate: 0,
         img: 'https://s3.cdn.doctorscrap.com/dev/user/image_9/a43ef25e953747efa9b88d3d9bbe674f.png',
         bgcolor: '#7CCF48',
-        textArr:[]
+        textArr:[],
+        hidden: false
       },
       claimProgressInfo: {
         text: this.$t('contractDetail.claim'),
         rate: 0,
         img: 'https://s3.cdn.doctorscrap.com/dev/user/image_9/b427331405604eeb8ec368130f00c5e6.png',
         bgcolor: '#adadad',
-        textArr:[]
+        textArr:[],
+        hidden: false
+      },
+      cndnProgressInfo: {
+        text: this.$t('contractDetail.cndn'),
+        rate: 100,
+        img: 'https://s3.cdn.doctorscrap.com/dev/user/image_9/b427331405604eeb8ec368130f00c5e6.png',
+        bgcolor: '#c47afc',
+        textArr:[],
+        hidden: true
       },
       identify: this.$t('contractDetail.identify'),
       selectRadio: 0,
@@ -2210,6 +2300,33 @@ export default {
         false;
       }
     },
+    // 采购获取最新的尾款发票
+    DNbillsCom() {
+        if(this.contractFileInfo?.bills) {
+            return this.contractFileInfo.bills.filter(item => { 
+              if(item.billType == 'receipt') {
+                item.url = item.billNo + '.pdf'
+                item.downloadUrl = '/bill/download?id=' + item.id
+                return item
+              }
+            })
+        } else {
+            return false
+        }
+    },
+    CNbillsCom() {
+        if(this.contractFileInfo?.bills) {
+            return this.contractFileInfo.bills.filter(item => {
+              if(item.billType == 'payment') {
+                item.url = item.billNo + '.pdf'
+                item.downloadUrl = '/bill/download?id=' + item.id
+                return item
+              }
+            })
+        } else {
+            return false
+        }
+    },
   },
   watch: {
     selectFileListProp: {
@@ -2363,7 +2480,7 @@ export default {
         }
         .addshipment {
           position: absolute;
-          left:100px;
+          left:140px;
           top:120px;
           background-color:#fff;
           height:30px;

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

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
  * @Date: 2024-03-13 14:28:59
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-04-09 20:28:44
+ * @LastEditTime: 2024-06-05 13:54:37
  * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/bizFileInfo/contractFile/BillOfLadingNoTab.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -14,7 +14,7 @@
 
           {{ $t('contractDetail.BL_No') }} {{ shipmentFileInfo.billOfLadingNo
     ? shipmentFileInfo.billOfLadingNo
-    : '' }}
+    : '' }} <span v-if="shipmentFileInfo.voidStatus  == 1"> ( {{ $t('contract.Voided') }} )</span>
         </div>
         <div class="billOfLadingNo-more" v-if="contractFileInfoData.shipmentFileInfoList && contractFileInfoData.shipmentFileInfoList.length > 4" @click.stop="openFun">
         <!-- <div class="billOfLadingNo-more"  @click.stop="openFun"> -->

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

@@ -2,20 +2,20 @@
  * @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-09 20:27:24
+ * @LastEditTime: 2024-06-05 13:48:22
  * @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
 -->
 <template>
     <div class="progress" :style="{backgroundColor:info.bgcolor}">
         <el-row>
-            <el-col :span="8">
+            <el-col :span="info.hidden ? 13: 8">
                 <div class="progress-left">
                     <img class="progress-img" :src="info.img" alt="">
                     <div class="progress-text">{{ info.text}}</div>
                 </div>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="info.hidden ? 11 : 16">
                 <div class="progress-info"
                  :style="{background:`linear-gradient(to right,${info.bgcolor} 0%, ${info.bgcolor} ${rate}%, #fff ${rate}%, #fff 100%)`}"
                  >
@@ -27,7 +27,7 @@
                 </div>
             </el-col>
         </el-row>
-        <div class="progress-rate">{{ $t('contractDetail.progress') }} {{ rate }}%</div>
+        <div v-if="!info.hidden" class="progress-rate">{{ $t('contractDetail.progress') }} {{ rate }}%</div>
     </div>
 </template>
 
@@ -79,7 +79,8 @@ export default {
         min-height:150px;
         display: flex;
         align-items: center;
-        justify-content: center;
+        //justify-content: center;
+        margin-left:120px;
         .progress-img {
             width: 36px;
             height: 36px;

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

@@ -12,6 +12,7 @@
           <div> {{ fileInfo.fileName }}</div>
           <div class="preview-download-root">
             <div
+              v-if="!fileInfo.downloadUrl"
               type="text"
               size="mini"
               class="preview-download"
@@ -268,7 +269,17 @@ export default {
     /** 下载文件 */
     handleDownload() {
       // this.download(this.fileInfo.url, {}, this.fileInfo.fileName);
-      downloadFile(this.fileInfo.url, this.fileInfo.fileName)
+      if(this.fileInfo.downloadUrl) {
+        let filename
+      if (this.fileInfo.billType === 'receipt') {
+        filename = 'DebitNote ' + this.fileInfo.billNo + '.pdf'
+      } else {
+        filename = 'CreditNote ' + this.fileInfo.billNo + '.pdf'
+      }
+      this.$download.zip('/bill/download?id=' + this.fileInfo.id, filename)
+      } else {
+        downloadFile(this.fileInfo.url, this.fileInfo.fileName)
+      }
     },
     openFile(url) {
       window.open(url)