doctor-admin-components 1.0.14-beta.15 → 1.0.14-beta.17

package/package.json

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

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

@@ -1064,7 +1064,7 @@
                 </div>
               </el-col>
 
-              <el-row v-if="channel !== 'official-website'">
+              <div v-if="channel !== 'official-website'">
                 <el-col :span="24" style="padding-top: 20px;">
                   <span>内部文件夹</span>
                   <div class="file-list" v-if="contract.contractType == 'purchase'">
@@ -1106,7 +1106,7 @@
                         :isShowTip="false" uploadNameStr="内部文件" />
                   </div>
                 </el-col>
-              </el-row>
+              </div>
               
             </div>
           </template>
@@ -1196,6 +1196,7 @@
                   bgTime: claimFileInfoCom && timeFormate(claimFileInfoCom),
                   bgcolor: claimProgressInfo.bgcolor
                 }"></ContentTitle>
+                <!--  <span class="bg-history" @click="handleHistory(!buyerFlag ? 'claim_credit_note' : 'claim_debit_note', linkId, false)">{{ $t('contractDetail.view_history') }}</span> -->
               </div>
               <el-col :span="24">
                 <div class="file-list" v-if="claimFileInfoCom">
@@ -1545,10 +1546,6 @@ export default {
   methods: {
     // 装运模块状态变化，需要同步关联模块
     handleShippingUpdateOpen(isOpen) {
-      console.log(this.$refs.SectionReceiving)
-      console.log(this.$refs.SectionClaim)
-      console.log(this.$refs.SectionCNDN)
-
       this.$refs.SectionReceiving[0]?.setOpen(isOpen)
       this.$refs.SectionClaim[0]?.setOpen(isOpen)
       this.$refs.SectionCNDN?.setOpen(isOpen)
@@ -2356,24 +2353,36 @@ export default {
 
     },
     claimFileInfoCom() {
-      if (
-        (this.contractFileInfo &&
-          this.contractFileInfo.claimCreditNoteFileList &&
-          this.contractFileInfo.claimCreditNoteFileList[0]) ||
-        (this.contractFileInfo &&
-          this.contractFileInfo.claimDebitNoteFileList &&
-          this.contractFileInfo.claimDebitNoteFileList[0])
-      ) {
-        return !this.buyerFlag
-          ? this.contractFileInfo &&
-          this.contractFileInfo.claimCreditNoteFileList &&
-          this.contractFileInfo.claimCreditNoteFileList
-          : this.contractFileInfo &&
-          this.contractFileInfo.claimDebitNoteFileList &&
-          this.contractFileInfo.claimDebitNoteFileList;
-      } else {
-        false;
-      }
+      // if (
+      //   (this.contractFileInfo &&
+      //     this.contractFileInfo.claimCreditNoteFileList &&
+      //     this.contractFileInfo.claimCreditNoteFileList[0]) ||
+      //   (this.contractFileInfo &&
+      //     this.contractFileInfo.claimDebitNoteFileList &&
+      //     this.contractFileInfo.claimDebitNoteFileList[0])
+      // ) {
+      //   return !this.buyerFlag
+      //     ? this.contractFileInfo &&
+      //     this.contractFileInfo.claimCreditNoteFileList &&
+      //     this.contractFileInfo.claimCreditNoteFileList
+      //     : this.contractFileInfo &&
+      //     this.contractFileInfo.claimDebitNoteFileList &&
+      //     this.contractFileInfo.claimDebitNoteFileList;
+      // } else {
+      //   false;
+      // }
+      if(this.contractFileInfo?.bills) {
+        return this.contractFileInfo.bills.map(item => { 
+                item.url = item.billNo + '.pdf'
+                item.fileName = 'DebitNote' + item.billNo + '.pdf'
+                item.downloadUrl = '/bill/download?id=' + item.id
+                return item
+            }).filter(item => {
+              return item.businessType == 1
+            })
+        } else {
+            return false
+        }
     },
     // 采购获取最新的尾款发票
     DNbillsCom() {
@@ -2385,6 +2394,8 @@ export default {
                 item.downloadUrl = '/bill/download?id=' + item.id
                 return item
               }
+            }).filter(item => {
+              return item.businessType != 1
             })
         } else {
             return false
@@ -2399,6 +2410,8 @@ export default {
                 item.downloadUrl = '/bill/download?id=' + item.id
                 return item
               }
+            }).filter(item => {
+              return item.businessType != 1
             })
         } else {
             return false
@@ -2448,7 +2461,7 @@ export default {
   min-width: 45px;
   padding: 0 10px;
   width: max-content;
-  height: 21px;
+  min-height: 21px;
   text-align: center;
   line-height: 17px;
   background: #FFFFFF;

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

@@ -34,15 +34,18 @@
         <el-col :span="24">
           <div class="bank-item">Beneficiary Address：{{ bankData.beneficiaryAddress }}</div>
         </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Remark：{{ bankData.remark }}</div>
+        </el-col>
       </el-row>
     </div>
     <!-- 添加入口 -->
     <div v-if="!bankList || bankList.length == 0" style="padding-left: 30px; padding-top: 10px">
       <span>未添加收款账户信息，</span>
-      <el-button type="text" size="mini" @click="clickAdd">去添加</el-button>
+      <el-button type="text" size="mini"  v-hasPermi="['biz:company:payment:account:add']" @click="clickAdd">去添加</el-button>
     </div>
     <div v-else-if="bankList && bankList.length < 3" style="padding-left: 30px; padding-top: 10px">
-      <el-button type="text" size="mini" @click="clickAdd">去添加</el-button>
+      <el-button type="text" size="mini" @click="clickAdd" v-hasPermi="['biz:company:payment:account:add']">去添加</el-button>
       <span>收款账户信息</span>
     </div>
     <!-- 添加收款账户弹框 -->
@@ -79,6 +82,11 @@
               <el-input maxlength="500" v-model="form.beneficiaryAddress" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
+          <el-col :span="18">
+            <el-form-item label="Remark" label-width="150px">
+              <el-input maxlength="500" v-model="form.remark" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -137,7 +145,8 @@ export default {
         bankAddress: null,
         beneficiaryAccount: null,
         beneficiary: null,
-        beneficiaryAddress: null
+        beneficiaryAddress: null,
+        remark: null,
       },
       rules: {}
     }
@@ -154,7 +163,8 @@ export default {
         bankAddress: null,
         beneficiaryAccount: null,
         beneficiary: null,
-        beneficiaryAddress: null
+        beneficiaryAddress: null,
+        remark: null,
       }
     },
     handleCaclSelectIndex() {
@@ -194,7 +204,7 @@ export default {
     },
     clickConfirm() {
       let e = this.form
-      if (!(e.swiftCode || e.bankName || e.bankAddress || e.beneficiaryAccount || e.beneficiary || e.beneficiaryAddress)) {
+      if (!(e.swiftCode || e.bankName || e.bankAddress || e.beneficiaryAccount || e.beneficiary || e.beneficiaryAddress || e.remark)) {
         this.$modal.msgError('请输入内容')
         return
       }

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

@@ -109,12 +109,7 @@
           <el-descriptions-item label="Service Fee">{{ contract.serviceFee }}</el-descriptions-item>
           <el-descriptions-item label="Freight Terms">{{ contract.freightTerms }}</el-descriptions-item>
           <el-descriptions-item label="Payment Terms">
-            <div v-if="(contract.balanceDays || contract.balanceDays == 0) && contract.balance && contract.balancePaymentType && contract.balancePaymentForm">
-              <span v-if="contract.deposit"> Deposit ratio {{ contract.deposit }}% {{ contract.depositDays }} days {{ contract.depositPaymentForm }} and </span>
-              {{ contract.balance }}% balance {{ contract.balancePaymentType }} paid {{ contract.balanceDays }} days {{ contract.balancePaymentForm }}
-              {{ contract.otherPaymentTerm }}
-            </div>
-            <div v-else>{{ contract.otherPaymentTerm }}</div>
+            {{ contract.paymentTermFullText }}
           </el-descriptions-item>
           <el-descriptions-item label="Price Fixing Option">
             <div v-if="contract.livePriceSwitch">