Browse Source

1.海运进出口 主单列表弹窗调整单选样式 并加列表名称
2.海运进出口 新加中转港字段
3.海运进出口 费用明细 优化列宽
4.首页 联调接口 对字段 换传参参数 完善跳转功能
5.业务配置 币别以汇率 新加字段 编号用字典获取
6.封装币别和汇率公共方法
7.海运进口 打不开页面

Qukatie 9 months ago
parent
commit
e5b06056a2

+ 11 - 0
src/main.js

@@ -80,6 +80,12 @@ import {
   saveColumnData,
   delColumnData
 } from "@/util/columnSetting"
+import {
+  setRateData,
+  getRateData,
+  localCurrency,
+  checkRate
+} from "@/util/exchangeRate"
 //查看是否有锁
 import {
   checkLocks
@@ -168,6 +174,11 @@ Vue.prototype.getWorkDicts = getWorkDicts
 iconfontVersion.forEach(ele => {
   loadStyle(iconfontUrl.replace('$key', ele));
 });
+//汇率信息
+Vue.prototype.setRateData = setRateData
+Vue.prototype.getRateData=getRateData
+Vue.prototype.localCurrency=localCurrency
+Vue.prototype.checkRate=checkRate
 //枚举列设置名称管理
 Vue.prototype.getColumnName = getColumnName
 Vue.prototype.getColumnData = getColumnData

+ 51 - 0
src/util/exchangeRate.js

@@ -0,0 +1,51 @@
+import { getRateList, bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
+import { getCurrentDate } from "@/util/date";
+//本地存储币别信息
+export async function setRateData() {
+    let obj = {
+        current: 1,
+        size: 20
+    }
+    let res = await getRateList(obj)
+    localStorage.setItem("币别信息", JSON.stringify(res.data.data.records));
+    return res
+}
+//本地获取币别信息
+export function getRateData() {
+    if (localStorage.getItem("币别信息")) {
+        return JSON.parse(localStorage.getItem("币别信息"))
+    } else {
+        this.$confirm('本地暂无汇率信息,请刷新页面?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'error'
+        }).then(() => {
+           this.setRateData()
+        })
+    }
+}
+//获取本币币别
+export function localCurrency() {
+    if (getRateData()) {
+        let data = getRateData()
+        for (let item of data) {
+            if (item.isLocal == 1) {
+                return item.code
+            }
+        }
+    }
+}
+//查汇率
+export async function checkRate(curCode, date, dc, type) {
+    let obj = {
+        date: date ? date : getCurrentDate('yyyy-MM-dd'),
+        dc: dc ? dc : 'D',
+        type: type ? type : 1
+    }
+    let res = await bcurrencyGetExrate(obj)
+    for (let item of res.data.data) {
+        if (item.code == curCode) {
+            return item.exrate
+        }
+    }
+}

+ 4 - 1
src/views/boxManagement/boxAdjustment/index.vue

@@ -294,6 +294,9 @@ export default {
   },
   activated() {
     setTimeout(() => {
+          if (this.$route.query.home) {
+        this.addButton();
+      }
     }, 100);
   },
   methods: {
@@ -374,7 +377,7 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/boxManagement/buyContainer/index"
+          path: "/boxManagement/boxAdjustment/index"
         });
       }
       this.detailData = {}

+ 7 - 4
src/views/boxManagement/boxCost/index.vue

@@ -12,7 +12,7 @@
           </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
           </el-button>
-          <el-button type="warning" size="small"  disabled @click="outExport">导 出
+          <el-button type="warning" size="small" disabled @click="outExport">导 出
           </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
@@ -189,6 +189,9 @@ export default {
   },
   activated() {
     setTimeout(() => {
+      if (this.$route.query.home) {
+        this.addButton();
+      }
     }, 100);
   },
   methods: {
@@ -269,7 +272,7 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/boxManagement/buyContainer/index"
+          path: "/boxManagement/boxCost/index"
         });
       }
       this.detailData = {}
@@ -313,7 +316,7 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
+        this.selectionList = []
         this.searchReset()
       }
     },
@@ -324,7 +327,7 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
+        this.selectionList = []
         this.searchReset()
       }
     },

+ 12 - 9
src/views/boxManagement/boxExit/index.vue

@@ -64,7 +64,7 @@ export default {
         searchLabelWidth: 90,
         tip: false,
         searchShow: true,
-        searchMenuSpan:18 ,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         addBtn: false,
@@ -90,9 +90,9 @@ export default {
             prop: 'type',
             disabled: true,
             type: 'select',
-            dicData:[{
-              label:'申请',
-              value:'CCSQ'
+            dicData: [{
+              label: '申请',
+              value: 'CCSQ'
             }],
             width: 150,
             overHidden: true,
@@ -134,7 +134,7 @@ export default {
           {
             label: '起运港提/送箱场站',
             prop: 'polStationCname',
-            overHidden: true,            
+            overHidden: true,
             search: true,
             searchOrder: 5,
             searchLabelWidth: 120,
@@ -171,7 +171,7 @@ export default {
           {
             label: '目的港提/送箱场站',
             prop: 'podStationCname',
-            overHidden: true,           
+            overHidden: true,
             search: true,
             searchOrder: 7,
             searchLabelWidth: 120,
@@ -256,6 +256,9 @@ export default {
   },
   activated() {
     setTimeout(() => {
+      if (this.$route.query.home) {
+        this.addButton();
+      }
     }, 100);
   },
   methods: {
@@ -336,7 +339,7 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/boxManagement/buyContainer/index"
+          path: "/boxManagement/boxExit/index"
         });
       }
       this.detailData = {}
@@ -380,7 +383,7 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
+        this.selectionList = []
         this.searchReset()
       }
     },
@@ -391,7 +394,7 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
+        this.selectionList = []
         this.searchReset()
       }
     },

+ 3 - 2
src/views/boxManagement/containerNumber/index.vue

@@ -12,7 +12,8 @@
                     </el-button> -->
                     <!-- <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button> -->
-                    <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
+                    <el-button type="success" size="small" :disabled="selectionList.length != 1"
+                        @click="copyButton">复制单据
                     </el-button>
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
@@ -502,7 +503,7 @@ export default {
             if (JSON.stringify(this.$route.query) != "{}") {
                 this.$router.$avueRouter.closeTag();
                 this.$router.push({
-                    path: "/boxManagement/buyContainer/index"
+                    path: "/boxManagement/containerNumber/index"
                 });
             }
             this.detailData = {}

+ 31 - 59
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -677,25 +677,25 @@ export default {
                     {
                         label: "结算单位",
                         prop: "corpCnName",
-                        width: "160",
+                        width: "120",
                         overHidden: true,
                     },
                     {
                         label: "费用简称",
                         prop: "feeCnName",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "预付/到付",
                         prop: "paymode",
-                        width: "120",
+                        width: "90",
                         overHidden: true,
                     },
                     {
                         label: "收/付",
                         prop: "dc",
-                        width: "120",
+                        width: "60",
                         dicData: [
                             {
                                 label: '收',
@@ -711,43 +711,43 @@ export default {
                     {
                         label: "计量单位",
                         prop: "unitNo",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "币种",
                         prop: "curCode",
-                        width: "120",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "汇率",
                         prop: "exrate",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "单价",
                         prop: "price",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "数量",
                         prop: "quantity",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "CNY",
                         prop: "rmbAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "外币",
                         prop: "usdAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     // {
@@ -772,25 +772,25 @@ export default {
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "发票申请金额",
                         prop: "appliedInvoiceAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已开票金额",
                         prop: "uninvoicedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已结算金额",
                         prop: "stlTtlAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
@@ -812,7 +812,7 @@ export default {
                     {
                         label: "单价是否含税",
                         prop: "isTax",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     }
                 ]
@@ -961,20 +961,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '账单状态',
-                        prop: 'accStatus',
-                        overHidden: true,
-                        width: 80,
-                        type: 'select',
-                        dicData: [{
-                            label: '未生成',
-                            value: 0,
-                        }, {
-                            label: '已生成',
-                            value: 1,
-                        }],
-                    },
-                    {
                         label: '审核状态',
                         prop: 'auditStatus',
                         overHidden: true,
@@ -997,67 +983,67 @@ export default {
                     {
                         label: "类别",
                         prop: "corpType",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "结算单位",
                         prop: "corpCnName",
-                        width: "160",
+                        width: "120",
                         overHidden: true,
                     },
                     {
                         label: "费用简称",
                         prop: "feeCnName",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "预付/到付",
                         prop: "paymode",
-                        width: "120",
+                        width: "90",
                         overHidden: true,
                     },
                     {
                         label: "计量单位",
                         prop: "unitNo",
-                        width: "120",
+                        width: "90",
                         overHidden: true,
                     },
                     {
                         label: "币种",
                         prop: "curCode",
-                        width: "120",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "汇率",
                         prop: "exrate",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "单价",
                         prop: "price",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "数量",
                         prop: "quantity",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "CNY",
                         prop: "rmbAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "外币",
                         prop: "usdAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     // {
@@ -1082,25 +1068,25 @@ export default {
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "发票申请金额",
                         prop: "appliedInvoiceAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已开票金额",
                         prop: "uninvoicedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已结算金额",
                         prop: "stlTtlAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
@@ -1160,20 +1146,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '账单状态',
-                        prop: 'accStatus',
-                        overHidden: true,
-                        width: 80,
-                        type: 'select',
-                        dicData: [{
-                            label: '未生成',
-                            value: 0,
-                        }, {
-                            label: '已生成',
-                            value: 1,
-                        }],
-                    },
-                    {
                         label: '审核状态',
                         prop: 'auditStatus',
                         overHidden: true,

+ 327 - 331
src/views/iosBasicData/OceanFreightImport/bills/assembly/mbinformation.vue

@@ -3,185 +3,181 @@
         <el-form :model="assemblyForm" ref="form" label-width="90px" class="demo-ruleForm">
             <el-row :gutter="20">
                 <el-col :span="12">
-                    <el-form-item label="提单号" prop="mblno" >
+                    <el-form-item label="提单号" prop="mblno">
                         <span slot="label">
                             <span style="color: #1e9fff">提单号</span>
                         </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.mblno"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请填写提单号" ></el-input>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.mblno" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            placeholder="请填写提单号"></el-input>
                     </el-form-item>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="船名" prop="vesselCnName" >
+                            <el-form-item label="船名" prop="vesselCnName">
                                 <span slot="label">
                                     <span style="color: #1e9fff">船名</span>
                                 </span>
-                                <search-query :datalist="vesselData"
-                                              :selectValue="assemblyForm.vesselCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'vessel')"
-                                              @corpChange="corpChange($event,'vessel')"
-                                              @corpFocus="remoteMethod($event,'vessel')" >
+                                <search-query :datalist="vesselData" :selectValue="assemblyForm.vesselCnName"
+                                    :filterable="true" :clearable="true" :remote="true"
+                                    :disabled="detailData.seeDisabled" :buttonIf="false"
+                                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                    @remoteMethod="remoteMethod($event, 'vessel')"
+                                    @corpChange="corpChange($event, 'vessel')"
+                                    @corpFocus="remoteMethod($event, 'vessel')">
                                 </search-query>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="航次" prop="voyageNo" >
+                            <el-form-item label="航次" prop="voyageNo">
                                 <span slot="label">
                                     <span style="color: #1e9fff">航次</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请填写航次" ></el-input>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
+                                    autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请填写航次"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-form-item label="船公司" prop="carrierCnName" >
+                    <el-form-item label="船公司" prop="carrierCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">船公司</span>
                         </span>
-                        <search-query :datalist="carrierData"
-                                      :selectValue="assemblyForm.carrierCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'carrier')"
-                                      @corpChange="corpChange($event,'carrier')"
-                                      @corpFocus="remoteMethod($event,'carrier')" >
+                        <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'carrier')" @corpChange="corpChange($event, 'carrier')"
+                            @corpFocus="remoteMethod($event, 'carrier')">
                         </search-query>
                     </el-form-item>
-                    <el-form-item label="订舱代理" prop="bookingAgentCnName" >
+                    <el-form-item label="订舱代理" prop="bookingAgentCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">订舱代理</span>
                         </span>
-                        <search-query :datalist="bookingAgentData"
-                                      :selectValue="assemblyForm.bookingAgentCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'bookingAgent')"
-                                      @corpChange="corpChange($event,'bookingAgent')"
-                                      @corpFocus="remoteMethod($event,'bookingAgent')" >
+                        <search-query :datalist="bookingAgentData" :selectValue="assemblyForm.bookingAgentCnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'bookingAgent')"
+                            @corpChange="corpChange($event, 'bookingAgent')"
+                            @corpFocus="remoteMethod($event, 'bookingAgent')">
                         </search-query>
                     </el-form-item>
-                    <el-form-item label="订舱备注" prop="bookingRemarks" >
+                    <el-form-item label="订舱备注" prop="bookingRemarks">
                         <span slot="label">
                             <span style="color: #1e9fff">订舱备注</span>
                         </span>
                         <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="请输入订舱备注" ></el-input>
+                            size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
+                            placeholder="请输入订舱备注"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="REF MBLNO" prop="refno" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">REF MBLNO</span>
-                        </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.refno"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请填写REF MBLNO" ></el-input>
-                    </el-form-item>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="ETD" prop="etd" >
+                            <el-form-item label="REF MBLNO" prop="refno">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">REF MBLNO</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.refno" size="small"
+                                    autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入REF MBLNOs"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="中转港" prop="potEnName">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">中转港</span>
+                                </span>
+                                <el-row>
+                                    <el-col :span="10">
+                                        <search-query :datalist="potData" :selectValue="assemblyForm.potEnName"
+                                            :filterable="true" :clearable="true" :remote="true" :joinData="true"
+                                            :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择中转港"
+                                            :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                            @remoteMethod="remoteMethod($event, 'pot')"
+                                            @corpChange="corpChange($event, 'pot')"
+                                            @corpFocus="remoteMethod($event, 'pot')">
+                                        </search-query>
+                                    </el-col>
+                                    <el-col :span="13">
+                                        <span style="padding-left: 20px"></span>
+                                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.potNamePrint"
+                                            size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                            placeholder="中转港" @change="textareaBlur('potNamePrint')"></el-input>
+                                    </el-col>
+                                </el-row>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="ETD" prop="etd">
                                 <span slot="label">
                                     <span style="color: #1e9fff">ETD</span>
                                 </span>
-                                <el-date-picker v-model="assemblyForm.etd"
-                                                clearable type="date" size="small"
-                                                :disabled="detailData.seeDisabled"
-                                                value-format="yyyy-MM-dd HH:mm:ss"
-                                                :picker-options="etdPickerOptions"
-                                                placeholder="选择日期">
+                                <el-date-picker v-model="assemblyForm.etd" clearable type="date" size="small"
+                                    :disabled="detailData.seeDisabled" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :picker-options="etdPickerOptions" placeholder="选择日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="ETA" prop="eta" >
+                            <el-form-item label="ETA" prop="eta">
                                 <span slot="label">
                                     <span style="color: #1e9fff">ETA</span>
                                 </span>
-                                <el-date-picker v-model="assemblyForm.eta"
-                                                clearable type="date" size="small"
-                                                :disabled="detailData.seeDisabled"
-                                                value-format="yyyy-MM-dd HH:mm:ss"
-                                                placeholder="选择日期">
+                                <el-date-picker v-model="assemblyForm.eta" clearable type="date" size="small"
+                                    :disabled="detailData.seeDisabled" value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="订舱日期" prop="bookingDate" >
+                            <el-form-item label="订舱日期" prop="bookingDate">
                                 <span slot="label">
                                     <span style="color: #1e9fff">订舱日期</span>
                                 </span>
-                                <el-date-picker v-model="assemblyForm.bookingDate"
-                                                clearable type="date" size="small"
-                                                :disabled="detailData.seeDisabled"
-                                                value-format="yyyy-MM-dd HH:mm:ss"
-                                                placeholder="选择日期">
+                                <el-date-picker v-model="assemblyForm.bookingDate" clearable type="date" size="small"
+                                    :disabled="detailData.seeDisabled" value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="航线" prop="lineCnName" >
+                            <el-form-item label="航线" prop="lineCnName">
                                 <span slot="label">
                                     <span style="color: #1e9fff">航线</span>
                                 </span>
-                                <search-query :datalist="lineData"
-                                              :selectValue="assemblyForm.lineCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'line')"
-                                              @corpChange="corpChange($event,'line')"
-                                              @corpFocus="remoteMethod($event,'line')" >
+                                <search-query :datalist="lineData" :selectValue="assemblyForm.lineCnName"
+                                    :filterable="true" :clearable="true" :remote="true"
+                                    :disabled="detailData.seeDisabled" :buttonIf="false"
+                                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                    @remoteMethod="remoteMethod($event, 'line')"
+                                    @corpChange="corpChange($event, 'line')" @corpFocus="remoteMethod($event, 'line')">
                                 </search-query>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="船司约号" prop="carrierArgreementNo" >
+                            <el-form-item label="船司约号" prop="carrierArgreementNo">
                                 <span slot="label">
                                     <span style="color: #1e9fff">船司约号</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierArgreementNo"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="船公司约号" ></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="船公司约号"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-form-item label="SI备注" prop="siRemarks" >
+                    <el-form-item label="SI备注" prop="siRemarks">
                         <span slot="label">
                             <span style="color: #1e9fff">SI备注</span>
                         </span>
-                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.siRemarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="SI备注" ></el-input>
+                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.siRemarks" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
+                            placeholder="SI备注"></el-input>
                     </el-form-item>
 
                 </el-col>
@@ -189,110 +185,83 @@
 
             <el-row>
                 <el-col :span="6">
-                    <el-form-item label="MB/L 发货人" prop="mshipperCnName" >
+                    <el-form-item label="MB/L 发货人" prop="mshipperCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 发货人</span>
                         </span>
-                        <search-query :datalist="mshipperData"
-                                      :selectValue="assemblyForm.detail.mshipperCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mshipper')"
-                                      @corpChange="corpChange($event,'mshipper')"
-                                      @corpFocus="remoteMethod($event,'mshipper')" >
+                        <search-query :datalist="mshipperData" :selectValue="assemblyForm.detail.mshipperCnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mshipper')"
+                            @corpChange="corpChange($event, 'mshipper')" @corpFocus="remoteMethod($event, 'mshipper')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mshipperDetails" >
+                        <el-form-item label="" prop="mshipperDetails">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mshipperDetails"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="发货人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="发货人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="MB/L 收货人" prop="mconsigneeCnName" >
+                    <el-form-item label="MB/L 收货人" prop="mconsigneeCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 收货人</span>
                         </span>
-                        <search-query :datalist="mconsigneeData"
-                                      :selectValue="assemblyForm.detail.mconsigneeCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mconsignee')"
-                                      @corpChange="corpChange($event,'mconsignee')"
-                                      @corpFocus="remoteMethod($event,'mconsignee')" >
+                        <search-query :datalist="mconsigneeData" :selectValue="assemblyForm.detail.mconsigneeCnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mconsignee')"
+                            @corpChange="corpChange($event, 'mconsignee')"
+                            @corpFocus="remoteMethod($event, 'mconsignee')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mconsigneeCntyName" >
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mconsigneeCntyName"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="发货人提单描述" ></el-input>
+                        <el-form-item label="" prop="mconsigneeCntyName">
+                            <el-input type="textarea" style="width: 100%;"
+                                v-model="assemblyForm.detail.mconsigneeCntyName" size="small" autocomplete="off"
+                                :disabled="detailData.seeDisabled" rows="4" clearable placeholder="发货人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="MB/L 通知人" prop="mnotifyCnName" >
+                    <el-form-item label="MB/L 通知人" prop="mnotifyCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 通知人</span>
                         </span>
-                        <search-query :datalist="mnotifyData"
-                                      :selectValue="assemblyForm.detail.mnotifyCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mnotify')"
-                                      @corpChange="corpChange($event,'mnotify')"
-                                      @corpFocus="remoteMethod($event,'mnotify')" >
+                        <search-query :datalist="mnotifyData" :selectValue="assemblyForm.detail.mnotifyCnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mnotify')" @corpChange="corpChange($event, 'mnotify')"
+                            @corpFocus="remoteMethod($event, 'mnotify')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mnotifyCntyName" >
+                        <el-form-item label="" prop="mnotifyCntyName">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotifyCntyName"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="通知人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="通知人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="第二通知人" prop="mnotify2CnName" >
+                    <el-form-item label="第二通知人" prop="mnotify2CnName">
                         <span slot="label">
                             <span style="color: #1e9fff">第二通知人</span>
                         </span>
-                        <search-query :datalist="mnotify2Data"
-                                      :selectValue="assemblyForm.detail.mnotify2CnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mnotify2')"
-                                      @corpChange="corpChange($event,'mnotify2')"
-                                      @corpFocus="remoteMethod($event,'mnotify2')" >
+                        <search-query :datalist="mnotify2Data" :selectValue="assemblyForm.detail.mnotify2CnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mnotify2')"
+                            @corpChange="corpChange($event, 'mnotify2')" @corpFocus="remoteMethod($event, 'mnotify2')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mnotify2Details" >
+                        <el-form-item label="" prop="mnotify2Details">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotify2Details"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="第二通知人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="第二通知人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
@@ -302,193 +271,220 @@
 </template>
 
 <script>
-    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBvesselsList} from "@/api/iosBasicData/bvessels";
-    import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
-    import {blinesList} from "@/api/iosBasicData/blines";
-    import {NdayDate} from "@/util/date";
-
-    export default {
-        components: {SearchQuery},
-        props:{
-            assemblyForm:{
-                type:Object
-            },
-            detailData:{
-                type:Object,
-            }
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { getBvesselsList } from "@/api/iosBasicData/bvessels";
+import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+import { blinesList } from "@/api/iosBasicData/blines";
+import { NdayDate } from "@/util/date";
+import { bportsList } from "@/api/iosBasicData/bports";
+export default {
+    components: { SearchQuery },
+    props: {
+        assemblyForm: {
+            type: Object
         },
-        data(){
-            return {
-                // 设置当前时间选择的范围
-                etdPickerOptions:{
-                    disabledDate(time) {
-                        // 获取当前后45天 Date.parse(NdayDate(45))
-                        return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
-                    }
-                },
-                vesselData:[], // 船名数据
-                carrierData:[], // 船公司
-                lineData:[], // 航线
-                bookingAgentData:[], // 订舱代理
+        detailData: {
+            type: Object,
+        }
+    },
+    data() {
+        return {
+            // 设置当前时间选择的范围
+            etdPickerOptions: {
+                disabledDate(time) {
+                    // 获取当前后45天 Date.parse(NdayDate(45))
+                    return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
+                }
+            },
+            vesselData: [], // 船名数据
+            carrierData: [], // 船公司
+            lineData: [], // 航线
+            bookingAgentData: [], // 订舱代理
 
-                // MB/L 发货人
-                mshipperData:[],
-                // MB/L 收货人
-                mconsigneeData:[],
-                // MB/L 通知人
-                mnotifyData:[],
-                // MB/L 第二通知人
-                mnotify2Data:[],
+            // MB/L 发货人
+            mshipperData: [],
+            // MB/L 收货人
+            mconsigneeData: [],
+            // MB/L 通知人
+            mnotifyData: [],
+            // MB/L 第二通知人
+            mnotify2Data: [],
+        }
+    },
+    created() {
+        this.potBportsListfun()
+    },
+    methods: {
+        /* 远程模糊查询操作用户 */
+        remoteMethod(value, name) {
+            let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            let portArr = ['pot']
+            if (name == 'vessel') {
+                this.vesselBvesselsListfun(value)
             }
-        },
-        created() {
+            else if (portArr.indexOf(name) != -1) {
+                this[name + 'BportsListfun'](value)
+            }
+            else if (name == 'carrier') {
+                this.carrierBcorpsListfun(value)
+            }
+            else if (name == 'line') {
+                this.lineblinesListfun(value)
+            }
+            else if (name == 'bookingAgent') {
+                this.bookingAgentBcorpsListfun(value)
+            }
+            else if (arr.indexOf(name) != -1) {
+                this[name + 'BcorpsListfun'](value)
+            }
+            else { }
 
         },
-        methods:{
-            /* 远程模糊查询操作用户 */
-            remoteMethod(value,name){
-                let arr = ['mshipper','mconsignee','mnotify','mnotify2']
-                if (name == 'vessel'){
-                    this.vesselBvesselsListfun(value)
-                }
-                else if (name == 'carrier'){
-                    this.carrierBcorpsListfun(value)
-                }
-                else if (name == 'line'){
-                    this.lineblinesListfun(value)
-                }
-                else if (name == 'bookingAgent'){
-                    this.bookingAgentBcorpsListfun(value)
+        // 下拉的监听事件
+        corpChange(value, name) {
+            let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            let cnPorArr = ['pot']
+            if (name == 'vessel') {
+                for (let item of this[name + 'Data']) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, 'vesselId', item.id)
+                        this.$set(this.assemblyForm, 'vesselCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'vesselEnName', item.enName)
+                    }
                 }
-                else if (arr.indexOf(name) != -1) {
-                    this[name + 'BcorpsListfun'](value)
+            }
+            // 有中文名称的港口
+            else if (cnPorArr.indexOf(name) != -1) {
+                if (!value) {
+                    this.$set(this.assemblyForm, name + 'Id', '')
+                    this.$set(this.assemblyForm, name + 'CnName', '')
+                    this.$set(this.assemblyForm, name + 'EnName', '')
+                    this.$set(this.assemblyForm, name + 'Code', '')
+                    this.$set(this.assemblyForm, name + 'NamePrint', '')
                 }
-                else {}
-
-            },
-            // 下拉的监听事件
-            corpChange(value,name){
-                let arr = ['mshipper','mconsignee','mnotify','mnotify2']
-                if (name == 'vessel') {
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'vesselId',item.id)
-                            this.$set(this.assemblyForm,'vesselCnName',item.cnName)
-                            this.$set(this.assemblyForm,'vesselEnName',item.enName)
-                        }
+                for (let item of this[name + 'Data']) {
+                    if (item.enName == value) {
+                        this.$set(this.assemblyForm, name + 'Id', item.id)
+                        this.$set(this.assemblyForm, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm, name + 'Code', item.code)
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                     }
                 }
-                else if (name == 'carrier') {
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'carrierId',item.id)
-                            this.$set(this.assemblyForm,'carrierCnName',item.cnName)
-                            this.$set(this.assemblyForm,'carrierEnName',item.enName)
-                            this.$set(this.assemblyForm,'carrierArgreementNo',item.agreementNo)
-                        }
+            }
+            else if (name == 'carrier') {
+                for (let item of this[name + 'Data']) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, 'carrierId', item.id)
+                        this.$set(this.assemblyForm, 'carrierCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'carrierEnName', item.enName)
+                        this.$set(this.assemblyForm, 'carrierArgreementNo', item.agreementNo)
                     }
                 }
-                // 订舱代理
-                else if (name == 'bookingAgent') {
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'bookingAgentId',item.id)
-                            this.$set(this.assemblyForm,'bookingAgentCnName',item.cnName)
-                            this.$set(this.assemblyForm,'bookingAgentEnName',item.enName)
-                            this.$set(this.assemblyForm,'bookingRemarks',item.remarks)
-                        }
+            }
+            // 订舱代理
+            else if (name == 'bookingAgent') {
+                for (let item of this[name + 'Data']) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, 'bookingAgentId', item.id)
+                        this.$set(this.assemblyForm, 'bookingAgentCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'bookingAgentEnName', item.enName)
+                        this.$set(this.assemblyForm, 'bookingRemarks', item.remarks)
                     }
                 }
-                // 航线
-                else if (name == 'line') {
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'lineId',item.id)
-                            this.$set(this.assemblyForm,'lineCnName',item.cnName)
-                            this.$set(this.assemblyForm,'lineEnName',item.enName)
-                        }
+            }
+            // 航线
+            else if (name == 'line') {
+                for (let item of this[name + 'Data']) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, 'lineId', item.id)
+                        this.$set(this.assemblyForm, 'lineCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'lineEnName', item.enName)
                     }
                 }
-                // 四个主表
-                else if (arr.indexOf(name) != -1) {
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm.detail,name + 'Id',item.id)
-                            this.$set(this.assemblyForm.detail,name + 'CnName',item.cnName)
-                            this.$set(this.assemblyForm.detail,name + 'EnName',item.enName)
-                            this.$set(this.assemblyForm.detail,name + 'Code',item.code)
-                            this.$set(this.assemblyForm.detail,name + 'Details',item.details)
-                            // 国家名称
-                            this.$set(this.assemblyForm.detail,name + 'CntyName',item.cntyName)
-                            // 国家代码
-                            this.$set(this.assemblyForm.detail,name + 'CntyCode',item.cntyCode)
-                        }
+            }
+            // 四个主表
+            else if (arr.indexOf(name) != -1) {
+                for (let item of this[name + 'Data']) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm.detail, name + 'Id', item.id)
+                        this.$set(this.assemblyForm.detail, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm.detail, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm.detail, name + 'Code', item.code)
+                        this.$set(this.assemblyForm.detail, name + 'Details', item.details)
+                        // 国家名称
+                        this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
+                        // 国家代码
+                        this.$set(this.assemblyForm.detail, name + 'CntyCode', item.cntyCode)
                     }
                 }
-                else {}
-            },
-
-
-            // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
-            // 获取船名数据
-            vesselBvesselsListfun(cnName){
-                getBvesselsList(1,10,{cnName}).then(res=>{
-                    this.vesselData = res.data.data.records
-                })
-            },
-            // 获取船公司数据
-            carrierBcorpsListfun(cnName){
-                let corpTypeName = '船公司'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.carrierData = res.data.data.records
-                })
-            },
+            }
+        },
+        // 中转港
+        potBportsListfun(enName) {
+            bportsList(1, 10, { enName, status: 0 }).then(res => {
+                this.potData = res.data.data.records
+            })
+        },
+        // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
+        // 获取船名数据
+        vesselBvesselsListfun(cnName) {
+            getBvesselsList(1, 10, { cnName }).then(res => {
+                this.vesselData = res.data.data.records
+            })
+        },
+        // 获取船公司数据
+        carrierBcorpsListfun(cnName) {
+            let corpTypeName = '船公司'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.carrierData = res.data.data.records
+            })
+        },
 
-            // 获取航线数据
-            lineblinesListfun(cnName){
-                blinesList(1,10,{cnName}).then(res=>{
-                    this.lineData = res.data.data.records
-                })
-            },
-            // 获取订舱代理数据
-            bookingAgentBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.bookingAgentData = res.data.data.records
-                })
-            },
-            // 获取MB/L 发货人数据 (往来单位 前四个代理)
-            mshipperBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mshipperData = res.data.data.records
-                })
-            },
-            // 获取收货人数据 (往来单位 前四个代理)
-            mconsigneeBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mconsigneeData = res.data.data.records
-                })
-            },
-            // 获取通知人数据 (往来单位 前四个代理)
-            mnotifyBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mnotifyData = res.data.data.records
-                })
-            },
-            // 获取第二通知人数据 (往来单位 前四个代理)
-            mnotify2BcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mnotify2Data = res.data.data.records
-                })
-            },
+        // 获取航线数据
+        lineblinesListfun(cnName) {
+            blinesList(1, 10, { cnName }).then(res => {
+                this.lineData = res.data.data.records
+            })
+        },
+        // 获取订舱代理数据
+        bookingAgentBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.bookingAgentData = res.data.data.records
+            })
+        },
+        // 获取MB/L 发货人数据 (往来单位 前四个代理)
+        mshipperBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mshipperData = res.data.data.records
+            })
+        },
+        // 获取收货人数据 (往来单位 前四个代理)
+        mconsigneeBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mconsigneeData = res.data.data.records
+            })
+        },
+        // 获取通知人数据 (往来单位 前四个代理)
+        mnotifyBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mnotifyData = res.data.data.records
+            })
+        },
+        // 获取第二通知人数据 (往来单位 前四个代理)
+        mnotify2BcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mnotify2Data = res.data.data.records
+            })
+        },
 
-        }
     }
+}
 </script>
 
 <style scoped>

+ 8 - 6
src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -126,7 +126,7 @@
                 <template slot="eta" slot-scope="scope">
                     <span>{{
                         scope.row.eta ? scope.row.eta.slice(0, 10) : ""
-                    }}</span>
+                        }}</span>
                 </template>
                 <template slot="updateTime" slot-scope="scope">
                     <span>{{
@@ -161,7 +161,8 @@
                         )
                         ">
                 <template slot="radio" slot-scope="{ row }">
-                    <el-radio v-model="dialogRadio" :label="row.id" @input="radioInput(row)"></el-radio>
+                    <el-radio style="margin-left: 8px;" v-model="dialogRadio" :label="row.id"
+                        @input="radioInput(row)">&nbsp;</el-radio>
                 </template>
             </avue-crud>
             <span slot="footer" class="dialog-footer">
@@ -1244,7 +1245,7 @@ export default {
                 menuWidth: "auto",
                 column: [
                     {
-                        label: "",
+                        label: "行号",
                         prop: "radio",
                         width: 35,
                         hide: false
@@ -1374,6 +1375,7 @@ export default {
         this.saberUserInfo = JSON.parse(
             localStorage.getItem("saber-userInfo")
         ).content;
+        this.roleName = localStorage.getItem('roleName').split(',') // 获取角色数据
         // 首页快捷跳转进来的
         if (this.$route.query.home) {
             this.addbtnfun();
@@ -1426,7 +1428,7 @@ export default {
         }
     },
     methods: {
-                costSubmit() {
+        costSubmit() {
             let podId = []
             let destinationId = []
             let airlineId = []
@@ -1434,7 +1436,7 @@ export default {
             let shippingCompanyId = []
             let voyag = []
             let obj = {}
-            let billsIds=[]
+            let billsIds = []
             for (let item of this.selectionList) {
                 if (item.polId) podId.push(item.polId)
                 if (item.podId) destinationId.push(item.podId)
@@ -1469,7 +1471,7 @@ export default {
                 destinationId: destinationId[0],
                 shippingCompanyId: shippingCompanyId[0],
             }
-            this.$refs.extractionCost.inTemplate(obj,billsIds.join(','))
+            this.$refs.extractionCost.inTemplate(obj, billsIds.join(','))
         },
         checkBills() {
             for (let item of this.selectionList) {

+ 45 - 46
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -617,7 +617,6 @@ import { dateFormat } from "@/util/date";
 import { regularBurdenfloating } from "@/util/regularJudgment";
 import { isProcurement } from "@/api/basicData/configuration";
 import { getToken } from "@/util/auth";
-
 import extractionCost from "@/components/extractionCost/main.vue";
 import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
@@ -678,25 +677,25 @@ export default {
                     {
                         label: "结算单位",
                         prop: "corpCnName",
-                        width: "160",
+                        width: "140",
                         overHidden: true,
                     },
                     {
                         label: "费用简称",
                         prop: "feeCnName",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "预付/到付",
                         prop: "paymode",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "收/付",
                         prop: "dc",
-                        width: "120",
+                        width: "60",
                         dicData: [
                             {
                                 label: '收',
@@ -712,43 +711,43 @@ export default {
                     {
                         label: "计量单位",
                         prop: "unitNo",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "币种",
                         prop: "curCode",
-                        width: "120",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "汇率",
                         prop: "exrate",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "单价",
                         prop: "price",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "数量",
                         prop: "quantity",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "CNY",
                         prop: "rmbAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "外币",
                         prop: "usdAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     // {
@@ -773,25 +772,25 @@ export default {
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "发票申请金额",
                         prop: "appliedInvoiceAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已开票金额",
                         prop: "uninvoicedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已结算金额",
                         prop: "stlTtlAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
@@ -984,67 +983,67 @@ export default {
                     {
                         label: "类别",
                         prop: "corpType",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "结算单位",
                         prop: "corpCnName",
-                        width: "160",
+                        width: "120",
                         overHidden: true,
                     },
                     {
                         label: "费用简称",
                         prop: "feeCnName",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "预付/到付",
                         prop: "paymode",
-                        width: "120",
+                        width: "90",
                         overHidden: true,
                     },
                     {
                         label: "计量单位",
                         prop: "unitNo",
-                        width: "120",
+                        width: "90",
                         overHidden: true,
                     },
                     {
                         label: "币种",
                         prop: "curCode",
-                        width: "120",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "汇率",
                         prop: "exrate",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "单价",
                         prop: "price",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "数量",
                         prop: "quantity",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "CNY",
                         prop: "rmbAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "外币",
                         prop: "usdAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     // {
@@ -1069,25 +1068,25 @@ export default {
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "发票申请金额",
                         prop: "appliedInvoiceAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已开票金额",
                         prop: "uninvoicedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已结算金额",
                         prop: "stlTtlAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
@@ -1169,67 +1168,67 @@ export default {
                     {
                         label: "类别",
                         prop: "corpType",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "结算单位",
                         prop: "corpCnName",
-                        width: "160",
+                        width: "120",
                         overHidden: true,
                     },
                     {
                         label: "费用简称",
                         prop: "feeCnName",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "预付/到付",
                         prop: "paymode",
-                        width: "120",
+                        width: "90",
                         overHidden: true,
                     },
                     {
                         label: "计量单位",
                         prop: "unitNo",
-                        width: "120",
+                        width: "90",
                         overHidden: true,
                     },
                     {
                         label: "币种",
                         prop: "curCode",
-                        width: "120",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "汇率",
                         prop: "exrate",
-                        width: "100",
+                        width: "60",
                         overHidden: true,
                     },
                     {
                         label: "单价",
                         prop: "price",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "数量",
                         prop: "quantity",
-                        width: "120",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "CNY",
                         prop: "rmbAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     {
                         label: "外币",
                         prop: "usdAmount",
-                        width: "100",
+                        width: "80",
                         overHidden: true,
                     },
                     // {
@@ -1254,25 +1253,25 @@ export default {
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "发票申请金额",
                         prop: "appliedInvoiceAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已开票金额",
                         prop: "uninvoicedAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {
                         label: "已结算金额",
                         prop: "stlTtlAmount",
-                        width: "120",
+                        width: "100",
                         overHidden: true,
                     },
                     {

+ 81 - 22
src/views/iosBasicData/SeafreightExportF/bills/assembly/mbinformation.vue

@@ -71,16 +71,46 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="REF MBLNO" prop="refno">
-                        <span slot="label">
-                            <span style="color: #1e9fff">REF MBLNO</span>
-                        </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.refno" size="small"
-                            autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                            placeholder="请输入REF MBLNOs"></el-input>
-                    </el-form-item>
                     <el-row>
                         <el-col :span="12">
+                            <el-form-item label="REF MBLNO" prop="refno">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">REF MBLNO</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.refno" size="small"
+                                    autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入REF MBLNOs"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="中转港" prop="potEnName">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">中转港</span>
+                                </span>
+                                <el-row>
+                                    <el-col :span="10">
+                                        <search-query :datalist="potData" :selectValue="assemblyForm.potEnName"
+                                            :filterable="true" :clearable="true" :remote="true" :joinData="true"
+                                            :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择中转港"
+                                            :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                            @remoteMethod="remoteMethod($event, 'pot')"
+                                            @corpChange="corpChange($event, 'pot')"
+                                            @corpFocus="remoteMethod($event, 'pot')">
+                                        </search-query>
+                                    </el-col>
+                                    <el-col :span="13">
+                                        <span style="padding-left: 20px"></span>
+                                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.potNamePrint"
+                                            size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                            placeholder="中转港" @change="textareaBlur('potNamePrint')"></el-input>
+                                    </el-col>
+                                </el-row>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+
+                        <el-col :span="12">
                             <el-form-item label="ETD" prop="etd">
                                 <span slot="label">
                                     <span style="color: #1e9fff">ETD</span>
@@ -129,7 +159,7 @@
                                 </search-query>
                             </el-form-item>
                         </el-col>
-                        
+
                     </el-row>
                     <el-row>
                         <el-col :span="12">
@@ -249,6 +279,7 @@ import { getBvesselsList } from "@/api/iosBasicData/bvessels";
 import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
 import { blinesList } from "@/api/iosBasicData/blines";
 import { NdayDate } from "@/util/date";
+import { bportsList } from "@/api/iosBasicData/bports";
 import _ from "lodash";
 export default {
     components: { SearchQuery },
@@ -286,10 +317,12 @@ export default {
             mnotifyData: [],
             // MB/L 第二通知人
             mnotify2Data: [],
+            // 中转港
+            potData: [],
         }
     },
     created() {
-
+        this.potBportsListfun()
     },
     methods: {
         // text文本框input
@@ -316,9 +349,13 @@ export default {
         /* 远程模糊查询操作用户 */
         remoteMethod(value, name) {
             let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            let portArr = ['pot']
             if (name == 'vessel') {
                 this.vesselBvesselsListfun(value)
             }
+            else if (portArr.indexOf(name) != -1) {
+                this[name + 'BportsListfun'](value)
+            }
             else if (name == 'carrier') {
                 this.carrierBcorpsListfun(value)
             }
@@ -331,12 +368,12 @@ export default {
             else if (arr.indexOf(name) != -1) {
                 this[name + 'BcorpsListfun'](value)
             }
-            else { }
 
         },
         // 下拉的监听事件
         corpChange(value, name) {
             let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            let cnPorArr = ['pot']
             if (name == 'vessel') {
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
@@ -346,6 +383,25 @@ export default {
                     }
                 }
             }
+            // 有中文名称的港口
+            else if (cnPorArr.indexOf(name) != -1) {
+                if (!value) {
+                    this.$set(this.assemblyForm, name + 'Id', '')
+                    this.$set(this.assemblyForm, name + 'CnName', '')
+                    this.$set(this.assemblyForm, name + 'EnName', '')
+                    this.$set(this.assemblyForm, name + 'Code', '')
+                    this.$set(this.assemblyForm, name + 'NamePrint', '')
+                }
+                for (let item of this[name + 'Data']) {
+                    if (item.enName == value) {
+                        this.$set(this.assemblyForm, name + 'Id', item.id)
+                        this.$set(this.assemblyForm, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm, name + 'Code', item.code)
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                    }
+                }
+            }
             else if (name == 'carrier') {
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
@@ -393,25 +449,28 @@ export default {
                         this.$set(this.assemblyForm.detail, name + 'CntyCode', item.cntyCode)
 
                         var details = typeof item.details == "string" ? item.details.trim() : ""
-                        if(!details && name == 'mconsignee'){
+                        if (!details && name == 'mconsignee') {
                             var s = typeof item.enName == "string" && item.enName.trim().toUpperCase() ? item.enName.trim() : ""
-                            if(s) details += `${s}\r\n`
-                            s = typeof item.enAddr == "string" && item.enAddr.trim()? item.enAddr.trim().toUpperCase() : ""
-                            if(s) details += `${s}\r\n`
-                            s = typeof item.tel == "string" && item.tel.trim() ? ('TEL:'+item.tel.trim().toUpperCase()) : ""
-                            s += typeof item.fax == "string" && item.fax.trim() ? ((s ? " / " : "")+'FAX:'+item.fax.trim().toUpperCase()) : ""
-                            if(s) details += `${s}\r\n`
+                            if (s) details += `${s}\r\n`
+                            s = typeof item.enAddr == "string" && item.enAddr.trim() ? item.enAddr.trim().toUpperCase() : ""
+                            if (s) details += `${s}\r\n`
+                            s = typeof item.tel == "string" && item.tel.trim() ? ('TEL:' + item.tel.trim().toUpperCase()) : ""
+                            s += typeof item.fax == "string" && item.fax.trim() ? ((s ? " / " : "") + 'FAX:' + item.fax.trim().toUpperCase()) : ""
+                            if (s) details += `${s}\r\n`
                             s = typeof item.email == "string" && item.email.trim() ? ('EMAIL:' + item.email.trim().toUpperCase()) : ""
-                            if(s) details += `${s}\r\n`
+                            if (s) details += `${s}\r\n`
                         }
                         this.$set(this.assemblyForm.detail, name + 'Details', details)
                     }
                 }
             }
-            else { }
         },
-
-
+        // 中转港
+        potBportsListfun(enName) {
+            bportsList(1, 10, { enName, status: 0 }).then(res => {
+                this.potData = res.data.data.records
+            })
+        },
         // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
         // 获取船名数据
         vesselBvesselsListfun(cnName) {

+ 4 - 4
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -269,7 +269,7 @@
                     saveColumnTwo('mawbOptionCrud', mawbOptionBack, 309.7)
                     ">
                 <template slot="radio" slot-scope="{ row }">
-                    <el-radio v-model="dialogRadio" :label="row.id" @input="radioInput(row)"></el-radio>
+                    <el-radio style="margin-left: 8px;" v-model="dialogRadio" :label="row.id" @input="radioInput(row)">&nbsp;</el-radio>
                 </template>
             </avue-crud>
             <span slot="footer" class="dialog-footer">
@@ -1400,9 +1400,9 @@ export default {
                 menuWidth: "auto",
                 column: [
                     {
-                        label: "",
+                        label: "行号",
                         prop: "radio",
-                        width: 35,
+                        width: 50,
                         hide: false
                     },
                     {
@@ -1525,7 +1525,7 @@ export default {
             return ids.join(",");
         }
     },
-    created() {
+    async created() {
         this.roleName = localStorage.getItem('roleName').split(',') // 获取角色数据
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(

+ 9 - 6
src/views/iosBasicData/costcenter/coc/index.vue

@@ -42,7 +42,7 @@ import { getList, remove } from "@/api/iosBasicData/costcenter/coc";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
-import {dateFormat} from "@/util/date";
+import { dateFormat } from "@/util/date";
 import _ from "lodash";
 export default {
     data() {
@@ -52,7 +52,7 @@ export default {
             query: {
                 businessType: 'COC',
                 sort: 0,
-                effectiveStartDate:dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
+                effectiveStartDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
             },
             loading: false,
             page: {
@@ -228,7 +228,7 @@ export default {
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
-                        searchValue:dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
+                        searchValue: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
                     },
                     {
                         label: "有效期止",
@@ -314,6 +314,9 @@ export default {
     },
     activated() {
         setTimeout(() => {
+            if (this.$route.query.home) {
+                this.addButton();
+            }
         }, 100);
     },
     methods: {
@@ -394,7 +397,7 @@ export default {
             if (JSON.stringify(this.$route.query) != "{}") {
                 this.$router.$avueRouter.closeTag();
                 this.$router.push({
-                    path: "/tradeAgency/tradeAgency/index"
+                    path: "/iosBasicData/costcenter/coc/index"
                 });
             }
             this.detailData = {}
@@ -438,7 +441,7 @@ export default {
                 this.$message.success("保存成功");
                 //关闭窗口
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.selectionList=[]
+                this.selectionList = []
                 this.searchReset()
             }
         },
@@ -449,7 +452,7 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.selectionList=[]
+                this.selectionList = []
                 this.searchReset()
             }
         },

+ 11 - 8
src/views/iosBasicData/costcenter/soc/index.vue

@@ -42,7 +42,7 @@ import { getList, remove } from "@/api/iosBasicData/costcenter/soc";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
-import {dateFormat} from "@/util/date";
+import { dateFormat } from "@/util/date";
 import _ from "lodash";
 export default {
     data() {
@@ -53,7 +53,7 @@ export default {
             query: {
                 businessType: 'SOC',
                 sort: 0,
-                effectiveStartDate:dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
+                effectiveStartDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
             },
             loading: false,
             page: {
@@ -230,7 +230,7 @@ export default {
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
-                        searchValue:dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
+                        searchValue: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
                     },
                     {
                         label: "有效期止",
@@ -328,13 +328,16 @@ export default {
     },
     activated() {
         setTimeout(() => {
+            if (this.$route.query.home) {
+                this.addButton();
+            }
         }, 100);
     },
     methods: {
         addButton() {
             this.isShow = false
-            this.detailData={
-                type:'new'
+            this.detailData = {
+                type: 'new'
             }
         },
         copyButton() {
@@ -411,7 +414,7 @@ export default {
             if (JSON.stringify(this.$route.query) != "{}") {
                 this.$router.$avueRouter.closeTag();
                 this.$router.push({
-                    path: "/tradeAgency/tradeAgency/index"
+                    path: "/iosBasicData/costcenter/soc/index"
                 });
             }
             this.detailData = {}
@@ -455,7 +458,7 @@ export default {
                 this.$message.success("保存成功");
                 //关闭窗口
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.selectionList=[]
+                this.selectionList = []
                 this.searchReset()
             }
         },
@@ -466,7 +469,7 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.selectionList=[]
+                this.selectionList = []
                 this.searchReset()
             }
         },

+ 18 - 8
src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -37,7 +37,7 @@
               @change="annualChange" valueFormat="yyyy"></avue-date>
           </template>
           <template v-if="form.paritiesType == '日汇率'" slot="moon">
-            <avue-select  v-model="form.moon" placeholder="请选择月份" :disabled="detailData.status == 1" :dic="MoonData"
+            <avue-select v-model="form.moon" placeholder="请选择月份" :disabled="detailData.status == 1" :dic="MoonData"
               @change="MoonChange"></avue-select>
           </template>
           <template slot="button">
@@ -53,7 +53,6 @@
           :header-cell-class-name="headerClassName" :data="dataList" :table-loading="loading" :cell-style="cellStyle"
           @row-save="rowSave" @row-update="rowUpdate" @search-change="searchChange" @search-reset="resetChange"
           @selection-change="selectionChange">
-
           <template slot="menuLeft">
             <el-button type="danger" size="small" @click.stop="BatchDelete"
               :disabled="detailData.status == 1 || dataList.length == 0">一键删除</el-button>
@@ -162,10 +161,16 @@ export default {
           {
             label: "货币代码",
             prop: "code",
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             span: 6,
             rules: [{
               required: true,
-              message: "请输入代码",
+              message: "请选择货币代码",
               trigger: "blur"
             }]
           },
@@ -282,11 +287,17 @@ export default {
             value: 0
           },
           {
+            label: "所属公司",
+            prop: "branchName",
+            span: 6,
+            disabled: true,
+          },
+          {
             label: "备注",
             prop: "remarks",
             type: 'textarea',
             width: "180",
-            span: 24,
+            span: 18,
             minRows: 3,
             slot: true
           },
@@ -294,7 +305,6 @@ export default {
             prop: "button",
             span: 6
           }
-
         ]
       },
       optionList: optionList,
@@ -706,7 +716,7 @@ export default {
           this.findObject(this.option.column, "moon").display = false;
           this.search.annual = this.form.annual
           this.search.moon = null
-          this.form.moon=null
+          this.form.moon = null
           this.search.paritiesType = row
           // this.searchChange(this.search)
           // console.log("月汇率", this.search)
@@ -715,7 +725,7 @@ export default {
           // this.findObject(this.option.column, "moon").display = false;
           this.search.annual = this.form.annual
           this.search.moon = null
-          this.form.moon=null
+          this.form.moon = null
           this.search.paritiesType = row
           // this.searchChange(this.search)
           // console.log("年汇率", this.search)
@@ -724,7 +734,7 @@ export default {
 
         if (this.form.code) {
           // 查明细信息
-          obj={...obj,...this.search}
+          obj = { ...obj, ...this.search }
           this.searchChange(obj)
         }
       },

+ 13 - 8
src/views/iosBasicData/rateManagement/index.vue

@@ -27,17 +27,17 @@
           <span>{{ row.updateUserName }}</span>
         </template>
         <template slot="menuLeft">
-          <!--<el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除-->
-          <!--</el-button>-->
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据
+          </el-button>
         </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-button icon="el-icon-edit" type="text" size="small" @click.stop="editOpen(row, 1)">
             编辑
           </el-button>
-          <!--<el-button icon="el-icon-delete" type="text" size="small" @click.stop="rowDel(row, index)">-->
-          <!--  删除-->
-          <!--</el-button>-->
-
+          <el-button :disabled="row.status == 0" icon="el-icon-delete" type="text" size="small"
+            @click.stop="rowDel(row, index)">
+            删除
+          </el-button>
           <el-button v-if="row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
             @click.stop="statusfun(row.id, 0)">
             启用
@@ -94,7 +94,7 @@ export default {
         addBtnText: "新建币别及汇率",
         addBtn: false,
         stripe: true,
-        menuWidth: 140,
+        menuWidth: 180,
         column: [
           {
             label: "编码",
@@ -158,6 +158,11 @@ export default {
             overHidden: true
           },
           {
+            label: "所属公司",
+            prop: "branchName",
+            overHidden: true
+          },
+          {
             label: "状态",
             prop: "status",
             type: "select",
@@ -271,7 +276,7 @@ export default {
         });
     },
     //新增跳转页面
-    beforeOpen() {
+    addButton() {
       this.isShow = false;
     },
     editOpen(row, status) {

+ 9 - 6
src/views/ow/owPut/index.vue

@@ -12,13 +12,13 @@
           </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
           </el-button>
-          <el-button type="warning" size="small"  disabled @click="outExport">导 出
+          <el-button type="warning" size="small" disabled @click="outExport">导 出
           </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="row.count > 0||row.whetherEnable=='是'">删 除</el-button>
+            :disabled="row.count > 0 || row.whetherEnable == '是'">删 除</el-button>
         </template>
         <template slot="sysNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
@@ -139,7 +139,7 @@ export default {
             overHidden: true,
             search: true,
             searchOrder: 2,
-            index:3,
+            index: 3,
           },
           {
             label: '内部放箱号',
@@ -208,7 +208,7 @@ export default {
             width: 140,
             overHidden: true,
             search: true,
-            searchOrder:6,
+            searchOrder: 6,
             searchLabelWidth: 120,
             type: "select",
             filterable: true,
@@ -423,7 +423,7 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, 
+          },
           {
             label: "打印人",
             prop: "printingPersonName",
@@ -457,6 +457,9 @@ export default {
         };
         this.isShow = false
       }
+      if (this.$route.query.home) {
+        this.addButton();
+      }
     }, 100);
   },
   methods: {
@@ -541,7 +544,7 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/boxManagement/buyContainer/index"
+          path: "/ow/owPut/index"
         });
       }
       this.detailData = {}

+ 7 - 4
src/views/ow/owTask/index.vue

@@ -12,13 +12,13 @@
           </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
           </el-button>
-          <el-button type="warning" size="small"  disabled @click="outExport">导 出
+          <el-button type="warning" size="small" disabled @click="outExport">导 出
           </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="row.count > 0||row.whetherEnable=='是'">删 除</el-button>
+            :disabled="row.count > 0 || row.whetherEnable == '是'">删 除</el-button>
         </template>
         <template slot="sysNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
@@ -425,7 +425,7 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-          }, 
+          },
           {
             label: "打印人",
             prop: "printingPersonName",
@@ -459,6 +459,9 @@ export default {
         };
         this.isShow = false
       }
+      if (this.$route.query.home) {
+        this.addButton();
+      }
     }, 100);
   },
   methods: {
@@ -543,7 +546,7 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/boxManagement/buyContainer/index"
+          path: "/ow/owTask/index"
         });
       }
       this.detailData = {}

+ 9 - 5
src/views/wel/components/losAssembly/losleftform.vue

@@ -3,11 +3,15 @@
     <div class="home-container">
       <el-card class="home-container__card">
         <div class="title">
-          <span></span>
           <div class="right">
-            <el-radio v-model="type" label="1" @input="init">海运</el-radio>
-            <el-radio v-model="type" label="2" @input="init">OW(拿)</el-radio>
-            <el-radio v-model="type" label="3" @input="init">OW(放)</el-radio>
+            <div>
+              <el-radio v-model="type" label="SE" @input="init">海运出口</el-radio>
+              <el-radio v-model="type" label="SI" @input="init">海运进口</el-radio>
+            </div>
+            <div>
+              <el-radio v-model="type" label="OW-N" @input="init">OW(拿)</el-radio>
+              <el-radio v-model="type" label="OW-F" @input="init">OW(放)</el-radio>
+            </div>
             <div class="right_but">
               <div class="right_but_left" :class="{ right_but_active: isActive == 1 }" @click="inDay">本日
               </div>
@@ -70,7 +74,7 @@ export default {
       isActive: 1, // 本日/本月按钮是否选中状态
       realDate: [], // 时间
       saberTenantId: '',
-      type: JSON.parse(localStorage.getItem('saber-tenantId')).content == '263057' ? '3' : '1',
+      type:"SE",
     };
   },
   created() {

+ 2 - 2
src/views/wel/components/losAssembly/losrealtime.vue

@@ -61,7 +61,7 @@
                 </span>
               </div>
               <div class="card-content">
-                <span class="card-content-num">{{ data.KYCK?data.KYCK:0 }}</span>
+                <span class="card-content-num">{{ data.OWN?data.OWN:0 }}</span>
                 <span class="card-content-text">OW(拿)</span>
               </div>
             </div>
@@ -75,7 +75,7 @@
                 </span>
               </div>
               <div class="card-content">
-                <span class="card-content-num">{{ data.KYJK?data.KYJK:0 }}</span>
+                <span class="card-content-num">{{ data.OWF?data.OWF:0 }}</span>
                 <span class="card-content-text">OW(放)</span>
               </div>
             </div>

+ 12 - 5
src/views/wel/components/losAssembly/losrightform.vue

@@ -2,11 +2,18 @@
     <div class="home-container">
         <el-card class="home-container__card">
             <div class="title">
-                <span>{{ (businessType == 1 || businessType == 3) ? 'TEU' : '尺码' }}</span>
+                <span style="width: 60px;">尺码</span>
                 <div class="right">
-                    <el-radio v-model="businessType" label="1" @input="init">海运</el-radio>
-                    <el-radio v-model="businessType" label="2" @input="init">OW(拿)</el-radio>
-                    <el-radio v-model="businessType" label="3" @input="init">OW(放)</el-radio>
+                    <div>
+                        <el-radio v-model="businessType" label="SE" @input="init">海运出口</el-radio>
+                        <el-radio v-model="businessType" label="SI" @input="init">海运进口</el-radio>
+                    </div>
+                    <div>
+                        <el-radio v-model="businessType" label="OW-N" @input="init">OW(拿)</el-radio>
+                        <el-radio v-model="businessType" label="OW-F" @input="init">OW(放)</el-radio>
+                    </div>
+
+
                     <div class="content-year">
                         <el-date-picker v-model="annual" type="year" size="mini" placeholder="选择年" value-format="yyyy"
                             style="margin-right:10px" :clearable="false" @change="init" />
@@ -34,7 +41,7 @@ export default {
         return {
             loading: false,
             annual: "", // 时间
-            businessType: JSON.parse(localStorage.getItem('saber-tenantId')).content == '263057' ? '3' : '1', // 业务类型
+            businessType:'SE', // 业务类型
             moneyList: [], // 获取的数据
             saberTenantId: '',
         }

+ 1 - 0
src/views/wel/index.vue

@@ -99,6 +99,7 @@ export default {
                 localStorage.setItem('areaTypeTree', JSON.stringify(res.data.data));
             })
         }
+        this.setRateData()
 
     },
     components: {