doctor-admin-components 1.0.14-beta.2 → 1.0.14-beta.20

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

@@ -8,7 +8,7 @@
 -->
 <template>
     <div class="bill-no-root" :style="open ? 'height:max-content': ''">
-        <div :class="'bill-no'" :style="shipmentIndex == shipBillNo ? { color: progressInfo.bgcolor } : ''" v-for="(
+        <div :class="'bill-no'" :style="shipmentIndex == shipBillNo ? { color:'white', fontSize: '16px', backgroundColor: progressInfo.bgcolor, border: '0' } : { color: '#231F20', fontSize: '14px', border: '1px solid #231F20', backgroundColor:'transparent' }" v-for="(
               shipmentFileInfo, shipmentIndex
             ) in contractFileInfoData.shipmentFileInfoList" :key="shipmentIndex" @click="changeShipBillNo(shipmentIndex)">
 
@@ -81,10 +81,9 @@ export default {
 .bill-no-root {
   display: flex;
   flex-wrap: wrap;
-  padding:0 20px;
   width:100%;
   position:relative;
-  height:60px;
+  height:55px;
   overflow:hidden;
 
   .billOfLadingNo-more {
@@ -99,11 +98,14 @@ export default {
   }
 
   .bill-no {
-    width:23%;
     font-size: 14px;
-    color: #A7A9AC;
-    padding:20px 20px 20px 0;
-    cursor: pointer;
+    color: #231F20;
+    padding: 0 10px;
+    height: 40px;
+    align-content: center;
+    border-radius: 8px;
+    margin-right: 30px;
+    margin-bottom: 15px;
   }
 
   .bill-no-active {

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

@@ -2,7 +2,7 @@
  * @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-05-08 15:22:56
+ * @LastEditTime: 2024-07-25 18:37:49
  * @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
 -->
@@ -64,7 +64,8 @@ export default {
             imgList: [],
             srcList:[],
             loadingInstance: null,
-            timer: null
+            timer: null,
+            hasClicked: false,
         };
     },
 
@@ -87,6 +88,17 @@ export default {
         checkClick(index) {
             this.imgList[index].checked = !this.imgList[index].checked;
         },
+        clickSelectAll() {
+            this.hasClicked = !this.hasClicked
+            if (this.hasClicked) {
+                this.checkAll1()
+            } else {
+                this.cancelAll1()
+            }
+        },
+        hasSelectAll() {
+            return !this.hasClicked
+        },
         checkAll1() {
             this.imgList.forEach((item) => {
                 item.checked = true;
@@ -192,9 +204,9 @@ export default {
     watch: {
         imgArr: {
             handler(val) {
+                this.imgList = [];
+                this.srcList = [];
                 if(val.length) {
-                    this.imgList = [];
-                    this.srcList = [];
                     val.forEach((item) => {
                         let coverUrl = this.othersFile(item.url)
                         this.imgList.push({
@@ -204,6 +216,9 @@ export default {
                         });
                         this.srcList.push(coverUrl);
                     });
+                } else {
+                    this.imgList = []
+                    this.srcList = []
                 }
             },
             deep: true,
@@ -288,7 +303,7 @@ export default {
     .batch-download {
         position: absolute;
         top: -41px;
-        left: 620px;
+        left: 650px;
         min-width: 80px;
         width:max-content;
         padding:0 10px;
@@ -297,11 +312,12 @@ export default {
         text-align: center;
         border-radius: 10px;
         background-color: #54B8FF;
+        color: white;
         cursor: pointer;
         font-size:12px;
     }
     .batch-delete {
-        left: 710px;
+        left: 740px;
     }
 }
 

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

@@ -8,14 +8,14 @@
 -->
 <template>
     <div>
-        <div>
+        <div @click="clickOpen">
             <slot name="header"></slot>
         </div>
         <div class="slot-content-root" :style="{backgroundColor:info.bgcolor}">
             <div :style="open ? 'height:max-content' : 'height:0;overflow:hidden'">
                 <slot name="content"></slot>
             </div>
-            <div class="arrow" @click="open = !open">
+            <div class="arrow" @click="clickOpen">
                 <i v-if="open"  class="el-icon-arrow-up"></i>
                 <i v-else class="el-icon-arrow-down"></i>
             </div>
@@ -46,7 +46,14 @@ export default {
     },
 
     methods: {
-        
+        // 设置状态
+        setOpen(isOpen) {
+            this.open = isOpen
+        },
+        clickOpen() {
+            this.open = !this.open
+            this.$emit('updateOpen', this.open)
+        }
     },
     watch: {
         infoPro: {
@@ -64,6 +71,7 @@ export default {
 
 .slot-content-root {
     padding-bottom:25px;
+    margin-bottom: 30px;
     background-color: #fff;
     position: relative;
     .arrow {

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

@@ -1,7 +1,7 @@
 <template>
   <div class="file-info" v-if="fileInfo.url">
     <div class="main">
-      <el-checkbox v-if="!this.hiddenOperation" label="" class="checkbox-position" @change="handleCheck" v-model="checkFlag">
+      <el-checkbox v-if="!this.hiddenOperation && !hiddenSelect" label="" class="checkbox-position" @change="handleCheck" v-model="checkFlag">
       </el-checkbox>
       <div class="area">
         <div class="area-info">
@@ -109,10 +109,18 @@ export default {
       type: Boolean,
       default: false,
     },
+    hiddenSelect: {
+      type: Boolean,
+      default: false,
+    },
     type: {
       type: String,
       default: '',
     },
+    deleteTips: {
+      type: String,
+      default: null,
+    },
   },
   data() {
     return {
@@ -129,7 +137,7 @@ export default {
       form: {},
       //上传表单
       uploadForm: {},
-      checkFlag: false
+      checkFlag: false,
     }
   },  
   computed: {
@@ -203,7 +211,7 @@ export default {
     handleDelete(row) {
       const fileIds = row.fileId || this.ids
       this.$modal
-        .confirm('是否确认删除该文件？')
+        .confirm(this.deleteTips || '是否确认删除该文件？')
         .then(function () {
           return delBizFileInfo(fileIds)
         })

package/packages/src/views/biz/bizShipment/add.vue

@@ -3,6 +3,7 @@
     <!-- 添加或修改装运对话框 -->
     <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose" :title="title">
       <slot name="">
+        <span v-if="isDraft" style="color: red">提示: 当前打开了【{{ form.lastUpdateUserName }}】在【{{ form.updateTime }}】保存的装运草稿</span>
         <span v-if="voidInvoiceList" style="color: red">【快捷转卖】：系统检测到此销售合同关联的采购合同存在【已作废】的装运，</span>
         <el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
       </slot>
@@ -244,7 +245,13 @@
                         :rules="rules.packageNetWeight"
                         :prop="'containerList.' + index + '.containerDetailList.' + scope1.$index + '.packageList.' + scope2.$index + '.packageNetWeight'"
                       >
-                        <el-input v-model="scope2.row.packageNetWeight" placeholder="请输入净重" size="mini" type="number" @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row,'packageNetWeight')"></el-input>
+                        <el-input
+                          v-model="scope2.row.packageNetWeight"
+                          placeholder="请输入净重"
+                          size="mini"
+                          type="number"
+                          @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageNetWeight')"
+                        ></el-input>
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -384,7 +391,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="warning" @click="onSaveDraft" style="margin-right: 10px">保存草稿</el-button>
+        <el-button type="warning" @click="onSaveDraft" style="margin-right: 10px" v-if="title === '生成装运'">保存草稿</el-button>
         <el-button type="primary" @click="submitShipment" style="margin-right: 10px">{{ title == '生成装运' ? '仅生成装运' : '保存草稿' }}</el-button>
         <el-dropdown @command="(command) => handleTemplate(command)" trigger="click" v-if="title == '生成装运'" style="margin-right: 10px">
           <el-button type="primary">{{ '装运并下载' }}</el-button>
@@ -547,7 +554,8 @@ export default {
       //编辑开关
       editSwitch: false,
       //
-      currentRow: null
+      currentRow: null,
+      isDraft: false
     }
   },
   props: {
@@ -674,15 +682,15 @@ export default {
     },
 
     limitDecimalPlaces(index, scope1Index, scope2Index, data, type) {
-      let value = data[type];
-      const decimalPlaces = 3;
+      let value = data[type]
+      const decimalPlaces = 3
       if (!isNaN(value)) {
-        value = parseFloat(value).toFixed(decimalPlaces);
-        value = parseFloat(value).toString();
-        data[type] = value;
+        value = parseFloat(value).toFixed(decimalPlaces)
+        value = parseFloat(value).toString()
+        data[type] = value
       }
       if (type == 'packageGrossWeight') {
-        this.changePackageGrossWeight(index, scope1Index, scope2Index);
+        this.changePackageGrossWeight(index, scope1Index, scope2Index)
       } else if (type == 'packageTareWeight') {
         this.changePackageTareWeight(index, scope1Index, scope2Index)
       } else if (type == 'packageNetWeight') {
@@ -1299,11 +1307,14 @@ export default {
       }
     },
     async onGetDraft() {
-      if(this.form.contractIds) {
+      if (this.form.contractIds) {
         const contractId = this.form.contractIds[0]
         const res = await getDraft(contractId)
         if (res.data) {
+          this.isDraft = true
           this.form = res.data
+        } else {
+          this.isDraft = false
         }
       }
     }

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" style="display:flex;"><p>Remark：</p><p style="white-space: pre-wrap;">{{ bankData.remark }}</p></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" type="textarea" rows="4" 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

@@ -11,7 +11,7 @@
           {{ contract.contractType == 'sale' ? 'Sales Order #:' : 'Purchase Order' }}
         </el-col>
         <el-col :span="7">{{ contract.contractNo }}</el-col>
-        <el-col :span="5">{{ `Reference#: ${contract.reference}` }}</el-col>
+        <el-col :span="5">Reference#: {{ contract.reference }}</el-col>
         <el-col :span="7"></el-col>
       </el-row>
       <div>
@@ -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">

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

@@ -12,31 +12,22 @@
       <div class="app-container-left">
         <div class="contract-number">
           <div>{{ $t('contractDetail.Contract_No') }}</div>
-          <div>{{ contract.contractNo }}</div>
+          <div style="word-wrap: break-word;">{{ contract.contractNo }}</div>
         </div>
         <div class="contract-number">
           <div>
             <span>{{$t('contractDetail.Reference_No')}}</span>
             <el-button size="mini" type="text" icon="el-icon-edit" @click="clickEditReference"></el-button>
           </div>
-          <div>{{ contract.reference  || '--' }}</div>
+          <div style="word-wrap: break-word;">{{ contract.reference  || '--' }}</div>
         </div>
         <div class="tab-root">
           <div :class="['tab', activeName == tabsItem.name ? 'active' : '']" v-for="tabsItem in saleTabsArr" :key="tabsItem.id" @click="changeTabs(tabsItem)">
             {{ tabsItem.label }}
           </div>
         </div>
-        <div>
-          <!-- 选择项 -->
-          <div class="selection-root">
-            <span>{{ $t('contractDetail.Selected') }} {{ selectFileList.length }} {{ $t('contractDetail.item') }}</span>
-            <div class="border-button" @click.stop="downLoadAll">{{ $t('contractDetail.Download_All') }}</div>
-            <div class="border-button" @click.stop="deleteAll">{{ $t('contractDetail.Delete_All') }}</div>
-            <div class="border-button" @click.stop="cancelAll">{{ $t('contractDetail.Deselect') }}</div>
-          </div>
-        </div>
       </div>
-      <div class="app-container-right">
+      <div class="app-container-right" :style="activeName == 'fourth' ? 'overflow:visible' : 'overflow:auto'">
         <contract-summary v-if="activeName == 'first'" :channel="channel"></contract-summary>
         <contract-info v-if="activeName == 'second'" :channel="channel"></contract-info>
         <!-- 提单指令 -->
@@ -54,7 +45,6 @@
           :contract="contract"
           :channel="channel"
           :buyerFlag="buyerFlag"
-          :selectFileListProp="selectFileList"
           ref="contractFileRef"
         ></contract-file>
       </div>
@@ -106,7 +96,6 @@ import ContractSummary from './contractSummary.vue'
 import BillInfo from './billInfo.vue'
 import ContractFile from '../bizFileInfo/contract.vue'
 import ContractInfo from './contractInfo.vue'
-import { delBizFileInfo } from '../../../api/biz/bizFileInfo'
 
 export default {
   name: 'ContractTracingDetail',
@@ -165,7 +154,6 @@ export default {
         }
       ],
 
-      selectFileList: [],
       // 提单指令列表
       blList: null,
       activeBillIndex: null
@@ -205,46 +193,7 @@ export default {
           console.log(e)
         })
     },
-    /**
-     * @description: 取消全部选择
-     * @return {*}
-     */
-    cancelAll() {
-      this.$refs.contractFileRef.cancelAllSelectFileList()
-    },
-
-    /**
-     * @description: 全部下载
-     * @return {*}
-     */
-    downLoadAll() {
-      if (this.selectFileList.length == 0) {
-        return this.$message.warning(this.$t('contractDetail.please_select_file'))
-      }
-      this.$refs.contractFileRef.downloadZip()
-    },
-    deleteAll() {
-      console.log('==delBizFileInfo==', this.selectFileList)
-      if (this.selectFileList.length == 0) {
-        return this.$message.warning(this.$t('contractDetail.please_select_file'))
-      }
-
-      this.$confirm('是否删除选中文件', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          const ids = this.selectFileList.map((item) => item.fileId)
-          delBizFileInfo(ids).then(() => {
-            this.$message.success('删除成功')
-            this.$refs.contractFileRef.handleRefresh()
-          })
-        })
-        .catch(() => {
-          this.$message.info('已取消删除')
-        })
-    },
+    
     /**
      * @description: 切换tab
      * @param {*} tab
@@ -329,29 +278,8 @@ export default {
       height: 100%;
       overflow: auto;
     }
+    
   }
 }
 
-.selection-root {
-  margin-top: 26px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 20px;
-}
-
-.border-button {
-  margin-top: 10px;
-  padding: 0 10px;
-  width: max-content;
-  height: 21px;
-  text-align: center;
-  line-height: 17px;
-  background: #ffffff;
-  border-radius: 11px;
-  font-size: 12px;
-  border: 2px solid #d1d3d4;
-  cursor: pointer;
-}
 </style>