doctor-admin-components 1.0.13-pro.0 → 1.0.14-beta.1

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

@@ -1,34 +1,55 @@
 <template>
   <div class="file-info" v-if="fileInfo.url">
     <div class="main">
-      <el-checkbox v-if="!this.hiddenOperation" label="" @change="handleCheck"> </el-checkbox>
+      <el-checkbox v-if="!this.hiddenOperation" label="" class="checkbox-position" @change="handleCheck" v-model="checkFlag">
+      </el-checkbox>
       <div class="area">
         <div class="area-info">
-          <div class="area-pdf" v-if="fileInfo.ext == '.pdf'"></div>
-          <el-image style="width: 54px; height: 54px" :src="fileInfo.url" fit="contain" :preview-src-list="[fileInfo.url]" v-else-if="isImage(fileInfo.ext)"></el-image>
+          <div class="area-pdf" v-if="isPdf(fileInfo.url)"></div>
+          <el-image style="width: 38px; height: 46px" :src="fileInfo.url" fit="contain" :preview-src-list="[fileInfo.url]" v-else-if="isImage(fileInfo.url)"></el-image>
           <div class="area-file" v-else></div>
-          <el-button type="text" size="mini" class="ml5" @click="openFile(fileInfo.url)">{{ $t('contractDetail.preview') }}</el-button>
-          <el-button type="text" size="mini" @click="handleDownload">
-            {{ $t('contractDetail.download') }}
-          </el-button>
-        </div>
-        <div v-if="!this.hiddenOperation">
-          <el-dropdown trigger="click" @command="handleCommand">
-            <span class="el-dropdown-link">
+          <div>
+          <div> {{ fileInfo.fileName }}</div>
+          <div class="preview-download-root">
+            <div
+              v-if="!fileInfo.downloadUrl"
+              type="text"
+              size="mini"
+              class="preview-download"
+              @click="openFile(fileInfo.url)"
+              >{{ $t("contractDetail.preview") }}</div
+            >
+            <div  class="preview-download" type="text" size="mini" @click="handleDownload">
+              {{ $t("contractDetail.download") }}
+            </div>
+            <div v-if="!this.hiddenOperation">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <span class="el-dropdown-link">
+                  <div class="more-icon"></div>
+                </span>
+                
+                <el-dropdown-menu slot="dropdown" v-if="type == 'signContract'" >
+                  <el-dropdown-item command="signContract">
+                   {{ $t('contractDetail.withdraw_sign') }} 
+                  </el-dropdown-item>
+                  <el-dropdown-item command="rename">{{$t('contractDetail.rename')}}</el-dropdown-item>
+                </el-dropdown-menu>
+                <el-dropdown-menu slot="dropdown" v-else >
+                  <el-dropdown-item command="delete">{{
+                    $t("contractDetail.delete")
+                  }}</el-dropdown-item>
+                  <el-dropdown-item command="rename">{{$t('contractDetail.rename')}}</el-dropdown-item>
+                  <!-- <el-dropdown-item command="deleteAndUpload">
+                    {{ $t("contractDetail.deleteAndUpload") }}
+                  </el-dropdown-item> -->
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+            <!-- <div v-else  style="width:120px;word-break:break-all">
               {{ fileInfo.fileName }}
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="delete">{{ $t('contractDetail.delete') }}</el-dropdown-item>
-              <el-dropdown-item command="rename">重命名</el-dropdown-item>
-              <el-dropdown-item command="deleteAndUpload">
-                {{ $t('contractDetail.deleteAndUpload') }}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
-        <div v-else style="width: 120px; word-break: break-all">
-          {{ fileInfo.fileName }}
+            </div> -->
+          </div>
+          </div>
         </div>
       </div>
     </div>
@@ -37,7 +58,7 @@
     <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px">
         <el-form-item :label="$t('contractDetail.fileNmae')" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入文件名" />
+          <el-input v-model="form.fileName" :placeholder="$t('contractDetail.Please_enter_a_file_name')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -60,7 +81,9 @@
 </template>
 <script>
 import { downloadFile } from '../../../utils/request'
-import { getBizFileInfo, delBizFileInfo, addBizFileInfo, updateBizFileInfo } from '../../../api/biz/bizFileInfo'
+import { getBizFileInfo, delBizFileInfo, addBizFileInfo, updateBizFileInfo, shipmentWithDrawDraftBill } from '../../../api/biz/bizFileInfo'
+import { isImage, isPdf } from '../../../utils/index';
+
 export default {
   name: 'FileShow',
   props: {
@@ -75,14 +98,26 @@ export default {
         }
       }
     },
+    selectFileListProp: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
     //是否隐藏操作
     hiddenOperation: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
+    type: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
+      isImage,
+      isPdf,
       checkedIds: [],
       //是否显示上传弹出层
       uploadOpen: false,
@@ -93,9 +128,10 @@ export default {
       // 表单参数
       form: {},
       //上传表单
-      uploadForm: {}
+      uploadForm: {},
+      checkFlag: false
     }
-  },
+  },  
   computed: {
     fileId() {
       return this.fileInfo.fileId
@@ -172,8 +208,15 @@ export default {
           return delBizFileInfo(fileIds)
         })
         .then(() => {
-          this.$emit('refresh')
-          this.$modal.msgSuccess('删除成功')
+          if(row.fileType == "draft_bill_of_lading") {
+            shipmentWithDrawDraftBill({shipmentId:row.linkId}).then(() => {
+              this.$emit('refresh')
+              this.$modal.msgSuccess('删除成功')
+            })
+          } else {
+            this.$emit('refresh')
+            this.$modal.msgSuccess('删除成功')
+          }
         })
         .catch(() => {})
     },
@@ -207,26 +250,36 @@ export default {
     },
     handleCommand(command) {
       switch (command) {
-        case 'delete':
-          this.handleDelete(this.fileInfo)
-          break
-        case 'rename':
-          this.handleUpdate(this.fileInfo)
-          break
-        case 'deleteAndUpload':
-          this.handleDeleteAndUpload(this.fileInfo)
-          break
+        case "delete":
+          this.handleDelete(this.fileInfo);
+          break;
+        case "rename":
+          this.handleUpdate(this.fileInfo);
+          break;
+        case "signContract":
+          this.$emit("signContract", this.fileInfo);
+          break;
+        case "deleteAndUpload":
+          this.handleDeleteAndUpload(this.fileInfo);
+          break;
         default:
           break
       }
     },
-    isImage(ext) {
-      return ['.jpg', '.jpeg', '.png', '.gif'].includes(ext)
-    },
     /** 下载文件 */
     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)
@@ -234,20 +287,36 @@ export default {
     handleCheck(val) {
       if (val) {
         this.$emit('checked', this.fileInfo)
+        this.checkFlag = true
       } else {
         this.$emit('uncheck', this.fileInfo.fileId)
+        this.checkFlag = false
       }
     }
+  },
+  watch: {
+    selectFileListProp: {
+      handler(val) {
+        if(val == 0) {
+          this.checkFlag = false
+        }
+      },
+      immediate: true,
+      deep: true 
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
 .file-info {
-  width: 160px;
+  min-width: 450px;
   display: flex;
   // border: 1px solid red;
   .main {
     display: flex;
+    .checkbox-position {
+      margin-top: 10px;
+    }
     .area {
       margin-left: 5px;
       width: 100%;
@@ -258,7 +327,7 @@ export default {
         .area-pdf {
           width: 38px;
           height: 46px;
-          background: url('../../../assets/images/pdf.png') no-repeat center;
+          background: url("../../../assets/images/pdf-new.png") no-repeat center;
           background-size: contain;
         }
         .area-file {
@@ -267,6 +336,33 @@ export default {
           background: url('../../../assets/images/file.png') no-repeat center;
           background-size: contain;
         }
+        .more-icon {
+          margin-left:10px;
+          cursor: pointer;
+          width: 20px;
+          height: 20px;
+          background: url("../../../assets/images/more.png") no-repeat center;
+          background-size: contain;
+        }
+        .preview-download-root {
+          display:flex;
+          margin-top:5px;
+          
+          .preview-download {
+            cursor: pointer;
+            margin-left:8px;
+            min-width: 45px;
+            width:max-content;
+            padding: 0 10px;
+            height: 21px;
+            text-align: center;
+            line-height: 17px;
+            background: #FFFFFF;
+            border-radius: 11px;
+            font-size:12px;
+            border: 2px solid #D1D3D4;
+          } 
+        }
       }
     }
     .filename {

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

@@ -269,7 +269,7 @@ export default {
         .area-pdf {
           width: 38px;
           height: 46px;
-          background-image: url("../../../assets/images/pdf.png") no-repeat
+          background-image: url("../../../assets/images/pdf-new.png") no-repeat
             center;
           background-size: contain;
         }

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

@@ -1,7 +1,13 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改装运对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" :before-close="handleClose">
+    <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose">
+      <slot name="">
+        <span>{{ title }}</span>
+        <span v-if="voidInvoiceList" style="color: red">【快捷转卖】：系统检测到此销售合同关联的采购合同存在【已作废】的装运，</span>
+        <el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
+      </slot>
+      <div v-if="reason" style="color: #f00; padding-left: 60px; margin-bottom: 10px">{{ reason }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
         <el-row>
           <el-col :span="6">
@@ -88,11 +94,16 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="对应采购合同" prop="purchaseContractNo" label-width="100">
-              <el-select v-model="form.purchaseContractNo" size="small">
+              <el-select v-model="form.purchaseContractNo" size="small" clearable="">
                 <el-option v-for="item in contract.purchaseContractNos" :key="item" :label="item" :value="item" />
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="ETA更新" prop="etaUpdateOn" label-width="100">
+              <el-switch v-model="form.etaUpdateOn" active-text="自动" inactive-text="手动"> </el-switch>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-table stripe :data="contractDetailList" border>
           <el-table-column label="序号" type="index" align="center"></el-table-column>
@@ -147,14 +158,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="集装箱皮重(kg)" :prop="'containerList.' + index + '.containerTareWeight'" :rules="subrules.containerTareWeight" label-width="120px">
-                <el-input v-model="dt.containerTareWeight" placeholder="请输入" size="mini"></el-input>
+                <el-input v-model="dt.containerTareWeight" placeholder="请输入" size="mini" type="number"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="总货物毛重(t)" :prop="'containerList.' + index + '.totalGoodsGrossWeight'" :rules="subrules.totalGoodsGrossWeight" label-width="105px">
-                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsGrossWeight"></el-input>
+                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsGrossWeight" type="number"></el-input>
                 <div v-else>
                   {{ dt.totalGoodsGrossWeight ? dt.totalGoodsGrossWeight : '自动计算' }}
                 </div>
@@ -162,7 +173,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="总货物皮重(t)" :prop="'containerList.' + index + '.totalGoodsTareWeight'" :rules="subrules.totalGoodsTareWeight" label-width="105px">
-                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsTareWeight"></el-input>
+                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsTareWeight" type="number"></el-input>
                 <div v-else>
                   {{ dt.totalGoodsTareWeight ? dt.totalGoodsTareWeight : '自动计算' }}
                 </div>
@@ -170,7 +181,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="总货物净重(t)" :prop="'containerList.' + index + '.totalGoodsNetWeight'" :rules="subrules.totalGoodsNetWeight" label-width="105px">
-                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsNetWeight"></el-input>
+                <el-input v-if="editSwitch" size="mini" v-model="dt.totalGoodsNetWeight" type="number"></el-input>
                 <div v-else>
                   {{ dt.totalGoodsNetWeight ? dt.totalGoodsNetWeight : '自动计算' }}
                 </div>
@@ -202,6 +213,7 @@
                           v-model="scope2.row.packageGrossWeight"
                           placeholder="请输入毛重"
                           size="mini"
+                          type="number"
                           @input="changePackageGrossWeight(index, scope1.$index, scope2.$index)"
                         ></el-input>
                       </el-form-item>
@@ -220,6 +232,7 @@
                           v-model="scope2.row.packageTareWeight"
                           placeholder="请输入皮重"
                           size="mini"
+                          type="number"
                           @input="changePackageTareWeight(index, scope1.$index, scope2.$index)"
                         ></el-input>
                       </el-form-item>
@@ -234,7 +247,7 @@
                         :rules="rules.packageNetWeight"
                         :prop="'containerList.' + index + '.containerDetailList.' + scope1.$index + '.packageList.' + scope2.$index + '.packageNetWeight'"
                       >
-                        <el-input v-model="scope2.row.packageNetWeight" placeholder="请输入净重" size="mini"></el-input>
+                        <el-input v-model="scope2.row.packageNetWeight" placeholder="请输入净重" size="mini" type="number"></el-input>
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -348,7 +361,7 @@
                   :prop="'containerList.' + index + '.containerDetailList.' + scope.$index + '.goodsNumber'"
                   :rules="subrules.goodsNumber"
                 >
-                  <el-input v-model="scope.row.goodsNumber" size="small" @change="changeTotalGoodsNumber(index)"></el-input>
+                  <el-input v-model="scope.row.goodsNumber" size="small" @change="changeTotalGoodsNumber(index)" type="number"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -421,26 +434,44 @@
     </el-dialog>
 
     <select-booking ref="selectBooking" @submit="setBooking" @unSubmit="unSetBooking" />
+    <!-- 引用装运 -->
+    <reference-alert @referenced="handleReferenced" ref="referenceAlert" />
   </div>
 </template>
 
 <script>
-import { listBizShipment, getBizShipment, delBizShipment, addWithContainer, updateWithContainer, updateWithContainerAndInvoice } from '../../../api/biz/bizShipment'
+import {
+  haveVoidShipment,
+  listBizShipment,
+  getBizShipment,
+  delBizShipment,
+  addWithContainer,
+  addContainerCheck,
+  updateWithContainer,
+  updateWithContainerAndInvoice
+} from '../../../api/biz/bizShipment'
 import { generateFinalInvoiceByShipmentId } from '../../../api/biz/bizInvoice'
 import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
+import { queryPurchaseContracts } from '../../../api/biz/bizContract'
+
 import { Loading } from 'element-ui'
 import { listDictData } from '../../../api/biz/dictData'
 import selectBooking from './selectBooking.vue'
 import { listBizBooking } from '../../../api/biz/bizBooking'
+import ReferenceAlert from './referenceAlert.vue'
+import { MessageBox } from 'element-ui'
 
 export default {
   name: 'AddShipment',
   dicts: ['shipping_company'],
   components: {
-    selectBooking
+    selectBooking,
+    ReferenceAlert
   },
   data() {
     return {
+      // 已作废的装运合同
+      voidInvoiceList: null,
       //目的地港口列表
       destinationPortList: [],
       //折叠面板
@@ -488,7 +519,9 @@ export default {
         actualArrivalDate: null
       },
       // 表单参数
-      form: {},
+      form: {
+        etaUpdateOn: true
+      },
       // 表单校验
       rules: {
         billOfLadingNo: [{ required: true, message: '提单号不能为空', trigger: 'blur' }],
@@ -523,6 +556,10 @@ export default {
       default: () => {
         return null
       }
+    },
+    reason: {
+      type: String,
+      default: ''
     }
   },
   created() {
@@ -563,6 +600,21 @@ export default {
     }
   },
   methods: {
+    // 已用的数据，赋值给form
+    handleReferenced(data) {
+      //shipment, copyFileTypeList
+      let contractIds = this.form.contractIds // 保持不变
+      this.form = { ...this.form, ...data.shipment, contractIds: contractIds }
+      // 需要去掉shipmentId
+      this.form.shipmentId = null
+      this.form.citeShipmentId = data.shipment.shipmentId
+      this.form.copyFileTypeList = data.copyFileTypeList
+      console.log('form:', this.form)
+    },
+    //引用已作废的装运
+    handleReference() {
+      this.$refs.referenceAlert.handleOpen(this.voidInvoiceList)
+    },
     //编辑开关
     openEditSwitch() {
       this.editSwitch = this.editSwitch = true
@@ -774,6 +826,7 @@ export default {
         bookingNo: null,
         billOfLadingNo: null,
         destinationPort: null,
+        purchaseContractNo: null,
         etd: null,
         eta: null,
         actualArrivalDate: null,
@@ -781,6 +834,7 @@ export default {
         createTime: null,
         updateTime: null,
         containerList: [],
+        etaUpdateOn: true,
         loadingTime: this.utc2local(new Date(), 'yyyy-MM-DD HH:mm:ss')
       }
       this.contract = {
@@ -849,19 +903,28 @@ export default {
       this.contractDetailList = contractDetailList.map((v) => {
         return { ...v, selected: false }
       })
-      var purchaseContractNos = contract?.purchaseContractNos
-      if (typeof purchaseContractNos == 'string') {
-        purchaseContractNos = purchaseContractNos?.split(',')
+      // 过滤作废的采购合同
+      queryPurchaseContracts(contract.contractId).then((res) => {
+        let purchaseContractNos = res.rows
         this.contract.purchaseContractNos = purchaseContractNos
         if (purchaseContractNos && purchaseContractNos.length == 1) {
           this.form.purchaseContractNo = purchaseContractNos[0]
         }
-      } else {
-        this.contract.purchaseContractNos = purchaseContractNos
-        if (purchaseContractNos && purchaseContractNos.length == 1) {
-          this.form.purchaseContractNo = purchaseContractNos[0]
-        }
-      }
+      })
+      // var purchaseContractNos = contract?.purchaseContractNos
+      // if (typeof purchaseContractNos == 'string') {
+      //   purchaseContractNos = purchaseContractNos?.split(',')
+      //   this.contract.purchaseContractNos = purchaseContractNos
+      //   if (purchaseContractNos && purchaseContractNos.length == 1) {
+      //     this.form.purchaseContractNo = purchaseContractNos[0]
+      //   }
+      // } else {
+      //   this.contract.purchaseContractNos = purchaseContractNos
+      //   if (purchaseContractNos && purchaseContractNos.length == 1) {
+      //     this.form.purchaseContractNo = purchaseContractNos[0]
+      //   }
+      // }
+
       let containerNum = 1
       this.form.destinationPort = destinationPort
       this.form.contractIds = Array.from(new Set(contractDetailList.map((i) => i.contractId)))
@@ -879,6 +942,12 @@ export default {
         .catch((error) => {
           console.error(error)
         })
+      // 查询是否有可引用的
+      haveVoidShipment(contract.contractId).then((res) => {
+        this.voidInvoiceList = res.rows && res.rows.length > 0 ? res.rows : null
+      })
+      // 测试数据
+      // this.voidInvoiceList = [{'contractId': '1', 'contractNo':'合同号1'}]
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -993,16 +1062,21 @@ export default {
       })
     },
     //仅生成装运
-    submitShipment() {
+    async submitShipment() {
+      // 装运前校验
+      let resOK = await this.checkPreShipment()
+      if (!resOK) {
+        return
+      }
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          let loadingInstance = Loading.service({
+            text: '请稍候',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)',
+            customClass: 'custom-loading-class'
+          })
           if (this.form.shipmentId == null) {
-            let loadingInstance = Loading.service({
-              text: '请稍候',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)',
-              customClass: 'custom-loading-class'
-            })
             addWithContainer(this.form).then((response) => {
               if (response.code == 200) {
                 this.open = false
@@ -1026,6 +1100,8 @@ export default {
             })
           } else {
             updateWithContainer(this.form).then((res) => {
+              loadingInstance.close()
+              this.open = false
               this.$modal.msgSuccess('修改成功')
               this.$emit('refresh')
             })
@@ -1034,7 +1110,12 @@ export default {
       })
     },
     //装运并下载
-    handleTemplate(command) {
+    async handleTemplate() {
+      // 装运前校验
+      let resOK = await this.checkPreShipment()
+      if (!resOK) {
+        return
+      }
       this.submitAndDownload(command)
     },
     //提交并下载
@@ -1090,8 +1171,30 @@ export default {
         fileName
       )
     },
+    // 装运前校验
+    async checkPreShipment() {
+      let res = await addContainerCheck({
+        billOfLadingNo: this.form.billOfLadingNo,
+        bookingNo: this.form.bookingNo,
+        shipmentId: this.form.shipmentId
+      })
+      if (!res.data.checkShipmentTip) {
+        return true
+      }
+      let result = await MessageBox.confirm(res.data.checkShipmentTip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).catch((err) => err)
+      return result === 'confirm'
+    },
     /** 提交按钮 */
-    submitForm() {
+    async submitForm() {
+      // 装运前校验
+      let resOK = await this.checkPreShipment()
+      if (!resOK) {
+        return
+      }
       this.$refs['form'].validate((valid) => {
         if (valid) {
           let loadingInstance = Loading.service({
@@ -1128,6 +1231,8 @@ export default {
                 loadingInstance.close()
               })
           } else {
+            loadingInstance.close()
+            this.open = false
             this.$emit('openGenerateLive', { ...this.form, quoteType: this.contract.quoteType })
           }
         }