Browse Source

货代修改bug 2023-11-29

caojunjie 1 year ago
parent
commit
58e639f8a4

+ 26 - 0
src/api/iosBasicData/containers.js

@@ -70,4 +70,30 @@ export const containersEqualDistribution = (row) => {
   })
 }
 
+// 配箱批量保存
+export const containersSubmitList = (row) => {
+  return request({
+    url: '/api/blade-los/containers/submitList',
+    method: 'post',
+    data: row
+  })
+}
+// 导出导入模板
+export const containersExportContainers = (pid) => {
+  return request({
+    url: '/api/blade-los/containers/exportContainers',
+    method: 'get',
+    params: {
+      pid
+    }
+  })
+}
+// 导入箱号,铅封号
+export const containersImportBoxNo = (row) => {
+  return request({
+    url: '/api/blade-los/containers/importBoxNo',
+    method: 'post',
+    data: row
+  })
+}
 

+ 59 - 5
src/components/iosbasic-data/searchquery.vue

@@ -21,10 +21,15 @@
                 </el-select>
             </div>
             <div v-if="buttonIf" style="display: flex;align-items: center">
-                <el-button  :disabled="disabled" icon="el-icon-search" size="mini" @click="corpVisible = true"></el-button>
+                <!--<el-button  :disabled="disabled" icon="el-icon-search" size="mini" @click="corpVisible = true"></el-button>-->
+                <div class="bottonBox" v-if="tableIf" :class="disabled?'disabledBox':''" @click="disabled?'':corpVisible = true"><i class="el-icon-search"></i></div>
                 <el-tooltip effect="dark" content="获取最新资料" placement="top-start">
-                    <el-button :disabled="disabled" icon="el-icon-refresh" size="mini" @click="refreshData"
-                               style="margin-left:0px;"></el-button>
+                    <!--<el-button :disabled="true" icon="el-icon-refresh" size="mini"-->
+                    <!--           style="margin-left:0px;"></el-button>-->
+                    <div class="bottonBox" :class="disabled?'disabledBox':''" @click="refreshData"><i class="el-icon-refresh"></i></div>
+                </el-tooltip>
+                <el-tooltip v-if="addIf" effect="dark" content="新建数据" placement="top-start">
+                    <div class="bottonBox" :class="disabled?'disabledBox':''" @click="addJump"><i class="el-icon-plus"></i></div>
                 </el-tooltip>
             </div>
         </div>
@@ -135,8 +140,36 @@
                 type:String,
                 default:'请选择'
             },
+            // 表格按钮
+            tableIf:{
+                type:Boolean,
+                default:true
+            },
+            // 添加跳转按钮
+            addIf:{
+                type:Boolean,
+                default:false
+            },
+        },
+        watch:{
+            // // 监听
+            // selectValue:{
+            //     // 执行方法
+            //     handler(oldValue,newValue) {
+            //         console.log(oldValue,145)
+            //         console.log(newValue,146)
+            //     },
+            //     deep: true, // 深度监听
+            //     immediate: true  // 第一次改变就执行
+            // },
         },
         methods:{
+            addJump(){
+                if (this.disabled) {
+                    return
+                }
+                this.$emit('addJump')
+            },
             // 聚焦事件
             corpFocus(){
                 this.$emit('corpFocus')
@@ -154,6 +187,9 @@
             },
             // 获取最新数据
             refreshData(){
+                if (this.disabled) {
+                    return
+                }
                 this.$emit('remoteMethod')
             },
             // 弹窗确认事件
@@ -166,6 +202,24 @@
     }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+    .bottonBox {
+        height: 32px;
+        background: #FFF;
+        border: 1px solid #DCDFE6;
+        font-size: 12px;
+        border-radius: 3px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 0 10px;
+        box-sizing: border-box;
+    }
+    .disabledBox {
+        color: #C0C4CC;
+        cursor: not-allowed;
+        background-image: none;
+        background-color: #FFF;
+        border-color: #EBEEF5;
+    }
 </style>

+ 13 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -23,6 +23,10 @@
                 <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="revokefun">撤销</el-button>
                 <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="wholeRevokefun">全部撤销</el-button>
                 <el-button type="warning" size="small" :disabled="detailData.seeDisabled" @click="cleanCntrNofun">清除箱号</el-button>
+                <el-button type="primary" size="small" :disabled="detailData.seeDisabled"  >批量保存</el-button>
+                <el-button type="success" size="small" :disabled="detailData.seeDisabled"  >导出导入模板</el-button>
+                <el-button type="success" size="small" :disabled="detailData.seeDisabled"  >导入箱号,铅封号</el-button>
+
                 <el-button type="warning" size="small"
                            :disabled="numberfalsefun() || assemblyForm.id"
                            @click="equalDistribution">平均分配</el-button>
@@ -96,7 +100,7 @@ import {
     containersDetail,
     containersSubmit,
     containersRemove,
-    containersCleanBoxNo, containersRevoke, containersEqualDistribution
+    containersCleanBoxNo, containersRevoke, containersEqualDistribution, containersSubmitList
 } from "@/api/iosBasicData/containers";
   import {mapGetters} from "vuex";
   import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
@@ -316,6 +320,14 @@ import {
                   });
               }
           },
+          // 配箱批量保存
+          containersSubmitListfun(){
+              containersSubmitList({
+                  containers:[]
+              }).then(res=>{
+                  console.log(res,323)
+              })
+          },
 
       rowSave(row, done, loading) {
         containersSubmit(row).then(() => {

+ 97 - 14
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -15,9 +15,11 @@
                                                   :filterable="true"
                                                   :clearable="true"
                                                   :remote="true"
+                                                  :addIf="true"
+                                                  :tableIf="false"
                                                   :disabled="detailData.seeDisabled"
-                                                  :buttonIf="false"
                                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @addJump="addJump('hshipper')"
                                                   @remoteMethod="remoteMethod($event,'hshipper')"
                                                   @corpChange="corpChange($event,'hshipper')"
                                                   @corpFocus="remoteMethod($event,'hshipper')">
@@ -53,8 +55,10 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :disabled="detailData.seeDisabled"
-                                                  :buttonIf="false"
+                                                  :addIf="true"
+                                                  :tableIf="false"
                                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @addJump="addJump('hconsignee')"
                                                   @remoteMethod="remoteMethod($event,'hconsignee')"
                                                   @corpChange="corpChange($event,'hconsignee')"
                                                   @corpFocus="remoteMethod($event,'hconsignee')">
@@ -95,8 +99,10 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :disabled="detailData.seeDisabled"
-                                                  :buttonIf="false"
+                                                  :addIf="true"
+                                                  :tableIf="false"
                                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @addJump="addJump('hconsignee')"
                                                   @remoteMethod="remoteMethod($event,'hnotify')"
                                                   @corpChange="corpChange($event,'hnotify')"
                                                   @corpFocus="remoteMethod($event,'hnotify')">
@@ -260,7 +266,7 @@
                     </el-form-item>
                     <el-form-item label="船公司" prop="carrierCnName" >
                         <span slot="label">
-                            <span style="color: #1e9fff">船公司</span>
+                            <span style="color: #1e9fff" @click="emailJump('carrier')">船公司</span>
                         </span>
                         <search-query :datalist="carrierData"
                                       :selectValue="assemblyForm.carrierCnName"
@@ -526,7 +532,7 @@
                             </el-col>
                         </el-row>
                     </el-form-item>
-                    <el-form-item label="中转港" prop="placeDeliveryName" >
+                    <el-form-item label="中转港" prop="potEnName" >
                         <span slot="label">
                             <span style="color: #1e9fff">中转港</span>
                         </span>
@@ -795,6 +801,38 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
+                            <el-form-item label="危险品净重" prop="dgTel" >
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgNetWeight"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="危险品净重" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="危险品外包装" prop="dgTel" >
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgPackage"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="危险品外包装" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="危险品邮箱" prop="dgTel" >
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgMailbox"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="危险品邮箱" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="危险品备注" prop="dgTel" >
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgRemarks"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="危险品备注" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
                             <el-form-item label="是否海洋污染物" prop="dgIsMarinePollutant" >
                                 <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.dgIsMarinePollutant"></el-checkbox>
                             </el-form-item>
@@ -970,7 +1008,7 @@ import Vue from "vue";
                 let cnPorArr = ['pol','pod','pot']
                 if (arr.indexOf(name) != -1) {
                     for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
+                        if (item.id == 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)
@@ -1181,6 +1219,30 @@ import Vue from "vue";
                 this.$set(this.assemblyForm,'hnotifyCntyName',this.assemblyForm.hconsigneeCntyName)
                 this.$set(this.assemblyForm,'hnotifyCntyCode',this.assemblyForm.hconsigneeCntyCode)
             },
+            // 邮箱跳转
+            emailJump(name){
+                if (name == 'carrier') {
+                    if (!this.assemblyForm.carrierId) {
+                        this.$message({
+                            message: '请先选择船公司',
+                            type: 'warning'
+                        });
+                        return
+                    }
+                    // getBcorpslistByType().then(res=>{
+                    //
+                    // })
+                    // this.assemblyForm.carrierId
+                }
+            },
+            // 添加跳转
+            addJump(name){
+                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
+                this.$router.push({
+                    path: "/iosBasicData/bcorps/index?corpType=" + corpType
+                });
+            },
+
             // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
             // 获取发货人数据 (往来单位 前四个代理)
             hshipperBcorpsListfun(cnName){
@@ -1222,37 +1284,55 @@ import Vue from "vue";
             // 收货地数据 (港口表)
             placeReceiptBportsListfun(enName){
                 bportsList(1,10,{enName}).then(res=>{
-                    this.placeReceiptData = res.data.data.records
+                    this.placeReceiptData = res.data.data.records.map(item=>{
+                        item.enName = item.enName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
             // 装货港数据
             polBportsListfun(enName){
                 bportsList(1,10,{enName}).then(res=>{
-                    this.polData = res.data.data.records
+                    this.polData = res.data.data.records.map(item=>{
+                        item.enName = item.enName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
             // 卸货港数据
             podBportsListfun(enName){
                 bportsList(1,10,{enName}).then(res=>{
-                    this.podData = res.data.data.records
+                    this.podData = res.data.data.records.map(item=>{
+                        item.enName = item.enName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
             // 目的地
             destinationBportsListfun(enName){
                 bportsList(1,10,{enName}).then(res=>{
-                    this.destinationData = res.data.data.records
+                    this.destinationData = res.data.data.records.map(item=>{
+                        item.enName = item.enName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
             // 交货地
             placeDeliveryBportsListfun(enName){
                 bportsList(1,10,{enName}).then(res=>{
-                    this.placeDeliveryData = res.data.data.records
+                    this.placeDeliveryData = res.data.data.records.map(item=>{
+                        item.enName = item.enName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
-            // 交货地
+            // 中转港
             potBportsListfun(enName){
                 bportsList(1,10,{enName}).then(res=>{
-                    this.potData = res.data.data.records
+                    this.potData = res.data.data.records.map(item=>{
+                        item.enName = item.enName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
             // 获取类别 COLOADER 数据
@@ -1286,7 +1366,10 @@ import Vue from "vue";
             // 船名
             vesselBvesselsListfun(cnName){
                 getBvesselsList(1,10,{cnName}).then(res=>{
-                    this.vesselData = res.data.data.records
+                    this.vesselData = res.data.data.records.map(item=>{
+                        item.cnName = item.cnName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
             // 订舱代理

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

@@ -335,7 +335,7 @@
                         width="100">
                         <template slot-scope="scope">
                             <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.$index,'D')">保存</el-button>
-                            <el-button v-else type="text" size="small" @click="editDfun(scope.row,scope.$index)">编辑</el-button>
+                            <el-button v-else type="text" size="small" :disabled="scope.row.accStatus" @click="editDfun(scope.row,scope.$index)">编辑</el-button>
                             <el-button type="text" size="small" @click="deletefun(scope.row,scope.$index,'D')">删除</el-button>
                         </template>
                     </el-table-column>
@@ -580,7 +580,7 @@
                         width="100">
                         <template slot-scope="scope">
                             <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.$index,'C')">保存</el-button>
-                            <el-button v-else type="text" size="small" @click="editCfun(scope.row,scope.$index)">编辑</el-button>
+                            <el-button v-else type="text" size="small" :disabled="scope.row.accStatus" @click="editCfun(scope.row,scope.$index)">编辑</el-button>
                             <el-button type="text" size="small" @click="deletefun(scope.row,scope.$index,'C')">删除</el-button>
                         </template>
                     </el-table-column>

+ 121 - 36
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -20,10 +20,10 @@
                 <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"
-                            :loading="saveLoading" @click="editHandle">编 辑
-                </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-else
+                <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
+                <!--            :loading="saveLoading" @click="editHandle">编 辑-->
+                <!--</el-button>-->
+                <el-button  size="small" type="primary" style="margin-right: 8px"
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
@@ -275,6 +275,7 @@ import {
 } from '@/api/iosBasicData/bills'
 import {dateFormat} from "@/util/date";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
+import {getBvesselsList} from "@/api/iosBasicData/bvessels";
     export default {
         components:{
             checkSchedule,
@@ -398,20 +399,12 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                                 text:"业务来源",
                                 type:'select',
                                 disabled:true,
-                                dicData:[
-                                    {
-                                        label:'公司',
-                                        value:'OWN'
-                                    },
-                                    {
-                                        label:'代理',
-                                        value:'AGENT'
-                                    },
-                                    {
-                                        label:'业务员',
-                                        value:'SALES'
-                                    }
-                                ],
+                                forParameter:{
+                                    key:'dictKey',
+                                    label:'dictValue',
+                                    value:'dictKey',
+                                },
+                                dicData:[],
                             },
                             {
                                 label: "",
@@ -824,6 +817,13 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                     this.columnforfun('mPayplace').dicData = res.data.data.records
                 })
             },
+            // 获取业务来源数据
+            srcTypeWorkDictsfun(){
+                getWorkDicts('src_type_los').then(res=>{
+                    this.columnforfun('srcType').dicData = res.data.data
+                })
+            },
+
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
                 let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
@@ -882,7 +882,9 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                     this.getBlocationsListfun(value)
                 }else if (name == 'corpAttnName') {
                     this.getBcorpsattnListfun(value)
-                }else if (name == 'srcCnName') {
+                }else if (name == 'srcType') {
+                    this.srcTypeWorkDictsfun()
+                } else if (name == 'srcCnName') {
                     if (this.form.srcType == 'SALES') {
                         // 业务员
                         this.salesUserGetListfun(value)
@@ -1172,6 +1174,13 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
             async billsDetailfun(id){
                 const res = await billsDetail(id)
                 this.form = res.data.data;
+                // 如果已经请核就禁用按钮
+                // if (this.form.status == 1) {
+                //     this.detailData.seeDisabled = true
+                // }else {
+                //     this.detailData.seeDisabled = false
+                // }
+
                 this.pageLoading = false
                 this.searchMontage() // 下拉 中文名称和编号拼接
 
@@ -1222,6 +1231,27 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                 }
 
             },
+            // tbas切换
+            handleClick(tba,event) {
+
+            },
+            // 大tbas切换
+            bigHandleClick(){
+                if (this.bigtabs == 'fd') {
+                    if (this.form.id) {
+                        this.billsListAllfun(this.form.id)
+                    }
+                }
+            },
+            // 获取不分页的分单列表
+            billsListAllfun(masterId){
+                billsListAll({masterId}).then(res=>{
+                    this.billsListAllData = res.data.data
+
+                })
+            },
+
+
             // 下拉 把拼接的拆分
             searchSplit(){
                 // 发货人
@@ -1240,6 +1270,41 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                 if (this.form.carrierCnName) {
                     this.form.carrierCnName = this.form.carrierCnName.split(' - ')[0]
                 }
+                // 收货地
+                if (this.form.placeReceiptName) {
+                    this.form.placeReceiptName = this.form.placeReceiptName.split(' - ')[0]
+                    this.form.placeReceiptNamePrint = this.form.placeReceiptNamePrint.split(' - ')[0]
+                }
+                // 装货港
+                if (this.form.polEnName) {
+                    this.form.polEnName = this.form.polEnName.split(' - ')[0]
+                    this.form.polNamePrint = this.form.polNamePrint.split(' - ')[0]
+                }
+                // 卸货港
+                if (this.form.podEnName) {
+                    this.form.podEnName = this.form.podEnName.split(' - ')[0]
+                    this.form.podNamePrint = this.form.podNamePrint.split(' - ')[0]
+                }
+                // 目的地
+                if (this.form.destinationName) {
+                    this.form.destinationName = this.form.destinationName.split(' - ')[0]
+                    this.form.destinationNamePrint = this.form.destinationNamePrint.split(' - ')[0]
+                }
+                // 交货地
+                if (this.form.placeDeliveryName) {
+                    this.form.placeDeliveryName = this.form.placeDeliveryName.split(' - ')[0]
+                    this.form.placeDeliveryNamePrint = this.form.placeDeliveryNamePrint.split(' - ')[0]
+                }
+                // 中转港
+                if (this.form.potEnName) {
+                    this.form.potEnName = this.form.potEnName.split(' - ')[0]
+                    this.form.potNamePrint = this.form.potNamePrint.split(' - ')[0]
+                }
+                // 船名
+                if (this.form.vesselCnName) {
+                    this.form.vesselCnName = this.form.vesselCnName.split(' - ')[0]
+                }
+
             },
             // 下拉 中文名称和编号拼接
             searchMontage(){
@@ -1263,27 +1328,47 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                     })
                     // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode
                 }
-            },
-            // tbas切换
-            handleClick(tba,event) {
-
-            },
-            // 大tbas切换
-            bigHandleClick(){
-                if (this.bigtabs == 'fd') {
-                    if (this.form.id) {
-                        this.billsListAllfun(this.form.id)
-                    }
+                // 收货地
+                if (this.form.placeReceiptName) {
+                    this.form.placeReceiptName = this.form.placeReceiptName + ' - ' + this.form.placeReceiptCode
+                    this.form.placeReceiptNamePrint = this.form.placeReceiptNamePrint + ' - ' + this.form.placeReceiptCode
+                }
+                // 装货港
+                if (this.form.polEnName) {
+                    this.form.polEnName = this.form.polEnName + ' - ' + this.form.polCode
+                    this.form.polNamePrint = this.form.polNamePrint + ' - ' + this.form.polCode
+                }
+                // 卸货港
+                if (this.form.podEnName) {
+                    this.form.podEnName = this.form.podEnName + ' - ' + this.form.podCode
+                    this.form.podNamePrint = this.form.podNamePrint + ' - ' + this.form.podCode
+                }
+                // 目的地
+                if (this.form.destinationName) {
+                    this.form.destinationName = this.form.destinationName + ' - ' + this.form.destinationCode
+                    this.form.destinationNamePrint = this.form.destinationNamePrint + ' - ' + this.form.destinationCode
+                }
+                // 交货地
+                if (this.form.placeDeliveryName) {
+                    this.form.placeDeliveryName = this.form.placeDeliveryName + ' - ' + this.form.placeDeliveryCode
+                    this.form.placeDeliveryNamePrint = this.form.placeDeliveryNamePrint + ' - ' + this.form.placeDeliveryCode
+                }
+                // 中转港
+                if (this.form.potEnName) {
+                    this.form.potEnName = this.form.potEnName + ' - ' + this.form.potCode
+                    this.form.potNamePrint = this.form.potNamePrint + ' - ' + this.form.potCode
+                }
+                // 船名
+                if (this.form.vesselCnName) {
+                    getBvesselsList(1,10,{cnName:this.form.vesselCnName}).then(res=>{
+                        this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
+                    })
                 }
-            },
-            // 获取不分页的分单列表
-            billsListAllfun(masterId){
-                billsListAll({masterId}).then(res=>{
-                    this.billsListAllData = res.data.data
 
-                })
+
             },
 
+
         },
     }
 

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

@@ -1110,7 +1110,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
         // 编辑详情打开
         rowCellfun(id,index) {
             this.detailData = {
-                seeDisabled: true,
+                seeDisabled: false,
                 id: id
             };
             this.isShow = false

+ 5 - 1
src/views/iosBasicData/bcorps/index.vue

@@ -1059,7 +1059,11 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(304), this.optionBack);
-    this.bcorpstypedefineListfun()
+    // 这个是从海运出口跳进来的
+    if (this.$route.query.corpType) {
+        this.isShow = false
+    }
+    this.bcorpstypedefineListfun() // 获取客户类别
       this.ifInvoiceGetWorkDictsfun() // 字典状态
   },
   methods: {