货代bug修改 2023-11-30

src/api/iosBasicData/feecenter.js

@@ -55,4 +55,11 @@ export const finaccbillsRevokeBill = (row) => {
     data: row
   })
 }
-
+// 费用信息明细批量保存接口
+export const feecenterSubmitList = (row) => {
+  return request({
+    url: '/api/blade-los/feecenter/submitList',
+    method: 'post',
+    data: row
+  })
+}

src/api/iosBasicData/finstlbills.js

@@ -118,3 +118,11 @@ export const finstlbillsRevokeSettlement = (row) => {
     data: row
   })
 }
+// 费用信息明细接口
+export const feecenterSelectByAccNoList = (data) => {
+  return request({
+    url: '/api/blade-los/feecenter/selectByAccNoList',
+    method: 'get',
+    params: data
+  })
+}

src/enums/column-name.js

@@ -1378,6 +1378,14 @@ const columnName = [{
     name: '货运代理-海运出口-委托详情-箱类型'
   },
   {
+    code: 309.2,
+    name: '货运代理-海运出口-费用收'
+  },
+  {
+    code: 309.3,
+    name: '货运代理-海运出口-费用付'
+  },
+  {
     code: 310,
     name: '货运代理-账单管理-费用中心'
   },

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -130,7 +130,7 @@ import {
         // },
         selectionList: [],
         option: {
-            stripe:true,
+          stripe:true,
           height:'250',
           calcHeight: 30,
           tip: false,

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -266,7 +266,7 @@
                     </el-form-item>
                     <el-form-item label="船公司" prop="carrierCnName" >
                         <span slot="label">
-                            <span style="color: #1e9fff" @click="emailJump('carrier')">船公司</span>
+                            <span style="color: #4c9e44;cursor: pointer;text-decoration: underline" @click="emailJump()">船公司</span>
                         </span>
                         <search-query :datalist="carrierData"
                                       :selectValue="assemblyForm.carrierCnName"
@@ -853,7 +853,7 @@
 import precontainers
     from "@/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
+import {getBcorpslistByType,getBcorpsDetail} from "@/api/iosBasicData/bcorps";
 import {bportsList} from "@/api/iosBasicData/bports";
 import {bpackagesList} from "@/api/iosBasicData/bpackages";
 import {bcommodityList} from "@/api/iosBasicData/bcommodity";
@@ -862,7 +862,7 @@ import {blinesList} from "@/api/iosBasicData/blines";
 import {bcorpstypedefineList} from "@/api/iosBasicData/bcorpstypedefine";
 import bcorpstypedefine from "@/views/iosBasicData/bcorps/bcorpstypedefine.vue";
 import {textareaWrap} from "@/util/messageReminder";
-import Vue from "vue";
+import emailhash from '@/views/iosBasicData/SeafreightExportF/bills/assembly/Jsonfile/emailhash.json'
 
     export default {
         props:{
@@ -876,6 +876,7 @@ import Vue from "vue";
         components:{SearchQuery, precontainers,bcorpstypedefine},
         data(){
             return {
+                emailhash:emailhash, // 邮箱跳转地址
                 // 多选的数据
                 tabsMultipleChoice:[],
                 // 发货人数据
@@ -1070,6 +1071,13 @@ import Vue from "vue";
                 }
                 // 船公司
                 else if (name == 'carrier') {
+                    if (!value) {
+                        this.$set(this.assemblyForm,'carrierId','')
+                        this.$set(this.assemblyForm,'carrierCnName','')
+                        this.$set(this.assemblyForm,'carrierEnName','')
+                        this.$set(this.assemblyForm,'carrierCode','')
+                        this.$set(this.assemblyForm,'carrierArgreementNo','')
+                    }
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
                             this.$set(this.assemblyForm,'carrierId',item.id)
@@ -1220,20 +1228,24 @@ import Vue from "vue";
                 this.$set(this.assemblyForm,'hnotifyCntyCode',this.assemblyForm.hconsigneeCntyCode)
             },
             // 邮箱跳转
-            emailJump(name){
-                if (name == 'carrier') {
-                    if (!this.assemblyForm.carrierId) {
-                        this.$message({
-                            message: '请先选择船公司',
-                            type: 'warning'
-                        });
-                        return
-                    }
-                    // getBcorpslistByType().then(res=>{
-                    //
-                    // })
-                    // this.assemblyForm.carrierId
+            emailJump(){
+                if (!this.assemblyForm.carrierId) {
+                    this.$message({
+                        message: '请先选择船公司',
+                        type: 'warning'
+                    });
+                    return
                 }
+                // 调详情获取邮箱
+                getBcorpsDetail(this.assemblyForm.carrierId).then(res=>{
+                    let email = res.data.data.email.split('@')[1] // 取@符号后面的数据
+                    for (let i in this.emailhash) {
+                        if (email == i) {
+                            // 跳转打开一个新的页面
+                            window.open(this.emailhash[i],"_blank")
+                        }
+                    }
+                })
             },
             // 添加跳转
             addJump(name){

src/views/iosBasicData/SeafreightExportF/bills/assembly/Jsonfile/emailhash.json

@@ -0,0 +1,23 @@
+{
+  "qq.com": "http://mail.qq.com",
+  "gmail.com": "http://mail.google.com",
+  "sina.com": "http://mail.sina.com.cn",
+  "163.com": "http://mail.163.com",
+  "126.com": "http://mail.126.com",
+  "yeah.net": "http://www.yeah.net/",
+  "sohu.com": "http://mail.sohu.com/",
+  "tom.com": "http://mail.tom.com/",
+  "sogou.com": "http://mail.sogou.com/",
+  "139.com": "http://mail.10086.cn/",
+  "hotmail.com": "http://www.hotmail.com",
+  "live.com": "http://login.live.com/",
+  "live.cn": "http://login.live.cn/",
+  "live.com.cn": "http://login.live.com.cn",
+  "189.com": "http://webmail16.189.cn/webmail/",
+  "yahoo.com.cn": "http://mail.cn.yahoo.com/",
+  "yahoo.cn": "http://mail.cn.yahoo.com/",
+  "eyou.com": "http://www.eyou.com/",
+  "21cn.com": "http://mail.21cn.com/",
+  "188.com": "http://www.188.com/",
+  "foxmail.coom": "http://www.foxmail.com"
+}

src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -6,7 +6,7 @@
                     <el-col :span="12">
                         <el-form-item label="场站" prop="cyCnName" >
                             <span slot="label">
-                                <span style="color: #1e9fff">场站</span>
+                                <span style="color: #4c9e44;cursor: pointer;text-decoration: underline" @click="emailJump()">场站</span>
                             </span>
                             <search-query :datalist="cyData"
                                           :selectValue="assemblyForm.cyCnName"
@@ -403,9 +403,10 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
+    import {getBcorpslistByType,getBcorpsDetail} from "@/api/iosBasicData/bcorps";
     import {getWorkDicts} from "@/api/system/dictbiz";
     import {bportsList} from "@/api/iosBasicData/bports";
+    import emailhash from '@/views/iosBasicData/SeafreightExportF/bills/assembly/Jsonfile/emailhash.json'
 
     export default {
         components: {SearchQuery},
@@ -419,6 +420,7 @@
         },
         data(){
             return {
+                emailhash:emailhash, // 邮箱跳转地址
                 // 场站
                 cyData:[],
                 // 服务方式
@@ -591,7 +593,26 @@
                     })
                     .catch(_ => {});
             },
-
+            // 邮箱跳转
+            emailJump(){
+                if (!this.assemblyForm.cyId) {
+                    this.$message({
+                        message: '请先选择场站',
+                        type: 'warning'
+                    });
+                    return
+                }
+                // 调详情获取邮箱
+                getBcorpsDetail(this.assemblyForm.cyId).then(res=>{
+                    let email = res.data.data.email.split('@')[1] // 取@符号后面的数据
+                    for (let i in this.emailhash) {
+                        if (email == i) {
+                            // 跳转打开一个新的页面
+                            window.open(this.emailhash[i],"_blank")
+                        }
+                    }
+                })
+            },
             // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
             // 获取场站数据
             cyBcorpslistByType(cnName){

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -802,7 +802,10 @@ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
             // 获取客户名称数据 往来单位数据
             getBcorpsListfun(cnName){
                 getBcorpsList(1,10,{cnName}).then(res=>{
-                    this.columnforfun('corpCnName').dicData = res.data.data.records
+                    this.columnforfun('corpCnName').dicData = res.data.data.records.map(item=>{
+                        item.cnName = item.cnName + ' - ' + item.shortName
+                        return item
+                    })
                 })
             },
             // 获取客户联系人 客户OP
@@ -1304,6 +1307,10 @@ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
                 if (this.form.vesselCnName) {
                     this.form.vesselCnName = this.form.vesselCnName.split(' - ')[0]
                 }
+                // 客户名称
+                if (this.form.corpCnName) {
+                    this.form.corpCnName = this.form.corpCnName.split(' - ')[0]
+                }
 
             },
             // 下拉 中文名称和编号拼接
@@ -1364,6 +1371,12 @@ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
                         this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
                     })
                 }
+                // 客户名称
+                if (this.form.corpCnName) {
+                    getBcorpslistByType(1,10,{cnName:this.form.corpCnName}).then(res=>{
+                        this.form.corpCnName = this.form.corpCnName + ' - ' + res.data.data.records[0].shortName
+                    })
+                }
 
 
             },

src/views/iosBasicData/finstlbills/assembly/costDetails.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        测试
+    </div>
+</template>
+
+<script>
+    export default {
+
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -11,7 +11,8 @@
             @selection-change="handleSelectionChange"
             @row-click="rowClick"
             :row-style="rowStyle"
-            :row-class-name="rowClassName" >
+            :row-class-name="rowClassName"
+            @expand-change="expandChange" >
             <el-table-column
                 v-if="brfalse"
                 fixed="left"
@@ -24,6 +25,9 @@
                 <!--    </el-checkbox>-->
                 <!--</template>-->
             </el-table-column>
+            <el-table-column type="expand">
+                <costDetails></costDetails>
+            </el-table-column>
             <el-table-column
                 prop="lineNo"
                 label="行号" width="50px">
@@ -300,8 +304,6 @@
                     <span v-else>{{scope.row.remarkss}}</span>
                 </template>
             </el-table-column>
-
-
         </el-table>
     </div>
 </template>
@@ -309,10 +311,12 @@
 <script>
     import {getWorkDicts} from "@/api/system/dictbiz";
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+    import costDetails from "../assembly/costDetails.vue"
     import {getRateList} from "@/api/iosBasicData/rateManagement";
+    import {feecenterSelectByAccNoList} from "@/api/iosBasicData/finstlbills";
 
     export default {
-        components: {SearchQuery},
+        components: {SearchQuery,costDetails},
         props:{
             tableData:{
                 type:Array,
@@ -354,6 +358,13 @@
                     }
                 }
             },
+            // 展开行或者关闭
+            expandChange(row,expandedRows){
+                feecenterSelectByAccNoList({accBillId:row.id}).then(res=>{
+                    console.log(res,364)
+                })
+                console.log(row,expandedRows,361)
+            },
             // 接口请求
             // 是否接口
             isSignforWorkDicts(){