doctor-admin-components 1.0.14-beta.3 → 1.0.14-beta.31

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,19 @@ 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() {
+            let res = this.imgList.find((item) => item.checked);
+            // console.log('xxxxxxx', res)
+            return res
+        },
         checkAll1() {
             this.imgList.forEach((item) => {
                 item.checked = true;
@@ -192,9 +206,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 +218,9 @@ export default {
                         });
                         this.srcList.push(coverUrl);
                     });
+                } else {
+                    this.imgList = []
+                    this.srcList = []
                 }
             },
             deep: true,
@@ -288,7 +305,7 @@ export default {
     .batch-download {
         position: absolute;
         top: -41px;
-        left: 620px;
+        left: 650px;
         min-width: 80px;
         width:max-content;
         padding:0 10px;
@@ -297,11 +314,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>
@@ -49,17 +50,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="ETA" prop="eta" label-width="100">
-              <el-date-picker
-                style="width: 75%"
-                clearable
-                size="small"
-                v-model="form.eta"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择预计到港日期"
-              ></el-date-picker>
-            </el-form-item>
+              <el-form-item label="ETA" prop="eta" label-width="100">
+                <div style="display: flex; flex-direction: row; align-items: center">
+                  <el-date-picker
+                    style="width: 75%"
+                    clearable
+                    size="small"
+                    v-model="form.eta"
+                    type="date"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="请选择预计到港日期"
+                  ></el-date-picker>
+                  <el-button type="text" @click="refreshUpdateTime">更新</el-button>
+                </div>
+              </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实际到港日" prop="actualArrivalDate" label-width="90px">
@@ -210,7 +214,7 @@
                           v-model="scope2.row.packageGrossWeight"
                           placeholder="请输入毛重"
                           size="mini"
-                          type="number"
+                          v-decimal="3"
                           @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageGrossWeight')"
                         ></el-input>
                       </el-form-item>
@@ -229,7 +233,7 @@
                           v-model="scope2.row.packageTareWeight"
                           placeholder="请输入皮重"
                           size="mini"
-                          type="number"
+                          v-decimal="3"
                           @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageTareWeight')"
                         ></el-input>
                       </el-form-item>
@@ -244,7 +248,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"
+                          v-decimal="3"
+                          @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageNetWeight')"
+                        ></el-input>
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -384,7 +394,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>
@@ -448,7 +458,7 @@ import {
   updateWithContainer,
   updateWithContainerAndInvoice,
   saveDraft,
-  getDraft
+  getDraft, refreshUpdateTime
 } from '../../../api/biz/bizShipment'
 import { generateFinalInvoiceByShipmentId } from '../../../api/biz/bizInvoice'
 import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
@@ -547,7 +557,8 @@ export default {
       //编辑开关
       editSwitch: false,
       //
-      currentRow: null
+      currentRow: null,
+      isDraft: false
     }
   },
   props: {
@@ -674,15 +685,15 @@ export default {
     },
 
     limitDecimalPlaces(index, scope1Index, scope2Index, data, type) {
-      let value = data[type];
-      const decimalPlaces = 3;
-      if (!isNaN(value)) {
-        value = parseFloat(value).toFixed(decimalPlaces);
-        value = parseFloat(value).toString();
-        data[type] = value;
-      }
+      // let value = data[type]
+      // const decimalPlaces = 3
+      // if (!isNaN(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,13 +1310,27 @@ 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
         }
       }
+    },
+    refreshUpdateTime() {
+      if (this.form.shipmentId) {
+        const loading = this.openLoading()
+        refreshUpdateTime(this.form.shipmentId).then((res) => {
+          loading.close()
+          this.$modal.msgSuccess('更新成功')
+        }).catch(() => {
+          loading.close();
+        })
+      }
     }
   }
 }

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

@@ -198,17 +198,17 @@
           <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('contract.company') + ':'">
-                {{ 'TTYY INTERNATIONAL LIMITED' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.companyName : ""}}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.taxId') + ':'">
-                {{ '73855725-000-23-0' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.taxNumber : "" }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.address') + ':'">
-                {{ 'FLAT/RM 07, 12/F, CHEVALIER COMMERCIAL CENTRE, 8 WANG HOI ROAD, KOWLOON BAY' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.address : "" }}
               </el-form-item>
             </el-col>
           </el-row>
@@ -216,19 +216,19 @@
           <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('contract.contact') + ':'">
-                {{ 'Ms. Zhou' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.contactPerson : "" }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.phoneNumber') + ':'">
-                {{ '00-852 53816912' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.phoneNumber : "" }}
               </el-form-item>
             </el-col>
             <el-col :span="8"></el-col>
           </el-row>
 
           <el-row>
-            <el-form-item :label="$t('contract.email') + ':'">{{ 'info@tyzltech.com' }}</el-form-item>
+            <el-form-item :label="$t('contract.email') + ':'">{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.email : "" }}</el-form-item>
           </el-row>
           <el-divider></el-divider>
           <div class="sub-title mb20">{{ $t('contract.otherInfo') }}</div>
@@ -303,6 +303,7 @@ import { listBizContractCompany } from '../../../api/biz/bizContractCompany'
 import BillPdf from './billPdf.vue'
 import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods'
 import EditBill from './editBill.vue'
+import { getSecondNotifyInfo } from '../../../api/biz/bizContract'
 // import { getSaleContractInfo } from '../../../api/biz/bizContract'
 
 export default {
@@ -368,7 +369,8 @@ export default {
         notifierCompanyId: [{ required: true, trigger: 'blur' }],
         goodsName: [{ required: true, trigger: 'blur' }]
       },
-      isMobile: document.body.clientWidth <= 768
+      isMobile: document.body.clientWidth <= 768,
+      secondNotifyInfoInfo: null
     }
   },
   created() {
@@ -378,6 +380,7 @@ export default {
     if (printModel == 1) {
       this.printModel = true
     }
+    this.getSecondNotifyInfo();
     // this.getSaleContractInfo(this.contract.dealId)
   },
   methods: {
@@ -436,6 +439,11 @@ export default {
         }
       })
     },
+    getSecondNotifyInfo() {
+      getSecondNotifyInfo().then((res) => {
+        this.secondNotifyInfoInfo = res.data;
+      })
+    },
     //更改收货人或者通知人公司时 相应显示变更
     changeSubCompany(val, type) {
       if (type == 'delivery') {

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

@@ -0,0 +1,67 @@
+<!--
+ * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @Date: 2024-08-19 15:46:00
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-08-21 16:19:39
+ * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+       <div v-if="list.length">
+         <div class="bold" style="margin-bottom:10px">历史修正记录</div>
+         <div class="wrap" v-for="listItem in list" :key="listItem.changeId">
+            <div class="row-wrap">
+                <div class="time">{{ utc2local(listItem.changeTime, 'yyyy-MM-DD HH:mm:ss') }}</div>
+                <div class="time">修改人：{{ listItem.operName }}</div>
+            </div>
+            <div class="row-wrap-1">
+                <div class="title bold">修改内容：</div>
+                <div>{{ listItem.changeContent }}</div>
+            </div>
+            <div class="row-wrap-1" v-if="listItem.changeReason">
+                <div class="title bold">修改原因：</div>
+                <div style="white-space: pre-line !important">{{ listItem.changeReason }}</div>
+            </div>
+         </div>
+       </div>
+  
+</template>
+<script>
+export default {
+    props: {
+        list: {
+            type: Array,
+            default: () => []
+        }
+    },
+    name: 'changrLogList',
+    data() {
+        return {}
+    }
+}
+</script>
+<style scoped lang="scss">
+.wrap {
+    padding:10px 20px;
+    margin-bottom: 10px;
+    background-color: #f2f2f2;
+}
+.bold {
+    font-weight: bold;
+}   
+.row-wrap {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    .time {
+        font-size:12px;
+    }
+}
+.row-wrap-1 {
+    display: flex;
+    margin-bottom: 10px;
+    .title {
+        min-width: 70px;
+    }
+}
+</style>

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">