Browse Source

货代修改客户往来接口传参 2024-3-11

caojunjie 1 year ago
parent
commit
87caac598f
34 changed files with 172 additions and 145 deletions
  1. 5 0
      src/views/basicData/landTransportation/driverInformation/index.vue
  2. 2 2
      src/views/iosBasicData/AirtransportExport/bills/approvalDetails.vue
  3. 14 14
      src/views/iosBasicData/AirtransportExport/bills/assembly/EntrustmentLnformation.vue
  4. 2 2
      src/views/iosBasicData/AirtransportExport/bills/assembly/formbottom.vue
  5. 14 14
      src/views/iosBasicData/AirtransportExport/bills/assembly/mbinformation.vue
  6. 7 7
      src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue
  7. 6 6
      src/views/iosBasicData/AirtransportExport/bills/index.vue
  8. 2 2
      src/views/iosBasicData/AirtransportImport/bills/approvalDetails.vue
  9. 14 14
      src/views/iosBasicData/AirtransportImport/bills/assembly/EntrustmentLnformation.vue
  10. 2 2
      src/views/iosBasicData/AirtransportImport/bills/assembly/formbottom.vue
  11. 14 14
      src/views/iosBasicData/AirtransportImport/bills/assembly/mbinformation.vue
  12. 7 7
      src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue
  13. 6 6
      src/views/iosBasicData/AirtransportImport/bills/index.vue
  14. 2 2
      src/views/iosBasicData/OceanFreightImport/bills/approvalDetails.vue
  15. 2 2
      src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue
  16. 12 12
      src/views/iosBasicData/OceanFreightImport/bills/assembly/mbinformation.vue
  17. 1 1
      src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue
  18. 2 2
      src/views/iosBasicData/SeafreightExportF/bills/approvalDetails.vue
  19. 4 0
      src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue
  20. 9 0
      src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue
  21. 1 1
      src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue
  22. 1 1
      src/views/iosBasicData/aeamends/amendsDetails.vue
  23. 0 1
      src/views/iosBasicData/agingAnalysis/index.vue
  24. 1 1
      src/views/iosBasicData/aiamends/amendsDetails.vue
  25. 2 2
      src/views/iosBasicData/bcorps/detailsPage.vue
  26. 11 1
      src/views/iosBasicData/bports/portsTerms.vue
  27. 2 2
      src/views/iosBasicData/finstlbills/finstlbillsDetails.vue
  28. 6 6
      src/views/iosBasicData/reportClose/AEreportClose/bgdetails.vue
  29. 6 6
      src/views/iosBasicData/reportClose/AIreportClose/bgdetails.vue
  30. 6 6
      src/views/iosBasicData/reportClose/SEreportClose/bgdetails.vue
  31. 6 6
      src/views/iosBasicData/reportClose/SIreportClose/bgdetails.vue
  32. 1 1
      src/views/iosBasicData/seamends/amendsDetails.vue
  33. 1 1
      src/views/iosBasicData/siamends/amendsDetails.vue
  34. 1 1
      vue.config.js

+ 5 - 0
src/views/basicData/landTransportation/driverInformation/index.vue

@@ -289,6 +289,11 @@ export default {
           cell: true,
           overHidden: true,
           search:true,
+          rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+          }]
         },{
           label: '性别',
           prop: 'sex',

+ 2 - 2
src/views/iosBasicData/AirtransportExport/bills/approvalDetails.vue

@@ -791,8 +791,8 @@ export default {
         },
         // 获取业务来源代理数据
         agentBcorpsListfun(cnName){
-            let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-            getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                 this.columnforfun('srcCnName').dicData = res.data.data.records
             })
         },

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

@@ -1266,7 +1266,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 添加跳转
             addJump(name){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
                 if (this.$store.getters.CorrespondenceUnitslos) {
                     this.$alert("往来单位已存在,请保存关闭再进行操作", "温馨提示", {
                         confirmButtonText: "确定",
@@ -1281,7 +1281,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 this.$router.push({
                     path: "/iosBasicData/bcorps/index",
                     query: {
-                        corpType:corpType
+                        corpType:corpTypeName
                     },
                 })
             },
@@ -1289,8 +1289,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
             // 获取发货人数据 (往来单位 前四个代理)
             hshipperBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.hshipperData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1299,8 +1299,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取收货人数据 (往来单位 前四个代理)
             hconsigneeBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.hconsigneeData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1309,8 +1309,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取通知人数据 (往来单位 前四个代理)
             hnotifyBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.hnotifyData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1356,8 +1356,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
 
             // 获取类别 COLOADER 数据
             bcorpstypedefineListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.coloaderCnNameData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1378,8 +1378,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取航空公司数据
             carrierBcorpslistByTypefun(cnName){
-                let corpType = '1712286570540703745'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '船公司'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.carrierData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1397,8 +1397,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 订舱代理
             bookingAgentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.bookingAgentData = res.data.data.records
                 })
             },

+ 2 - 2
src/views/iosBasicData/AirtransportExport/bills/assembly/formbottom.vue

@@ -632,8 +632,8 @@
             // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
             // 获取场站数据
             cyBcorpslistByType(cnName){
-                let corpType = '1712286771737272322'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '场站'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.cyData = res.data.data.records
                 })
             },

+ 14 - 14
src/views/iosBasicData/AirtransportExport/bills/assembly/mbinformation.vue

@@ -751,15 +751,15 @@
             },
             // 获取航空公司数据
             carrierBcorpsListfun(cnName){
-                let corpType = '1712286652421906433'
-                getBcorpsList(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '航空公司'
+                getBcorpsList(1,10,{cnName,corpTypeName}).then(res=>{
                     this.carrierData = res.data.data.records
                 })
             },
             // 获取航站数据
             cyBcorpslistByType(cnName){
-                let corpType = '1712286872304099330'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '航站'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.cyData = res.data.data.records
                 })
             },
@@ -796,36 +796,36 @@
             },
             // 获取订舱代理数据
             bookingAgentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.bookingAgentData = res.data.data.records
                 })
             },
             // 获取MB/L 发货人数据 (往来单位 前四个代理)
             mshipperBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mshipperData = res.data.data.records
                 })
             },
             // 获取收货人数据 (往来单位 前四个代理)
             mconsigneeBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mconsigneeData = res.data.data.records
                 })
             },
             // 获取通知人数据 (往来单位 前四个代理)
             mnotifyBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mnotifyData = res.data.data.records
                 })
             },
             // 获取第二通知人数据 (往来单位 前四个代理)
             mnotify2BcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mnotify2Data = res.data.data.records
                 })
             },

+ 7 - 7
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -211,7 +211,7 @@
                                                    :detailData="detailData">
                                     </mbinformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1"  >
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false"  >
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="KYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
@@ -837,8 +837,8 @@ import {
             },
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.columnforfun('srcCnName').dicData = res.data.data.records
                 })
             },
@@ -1759,15 +1759,15 @@ import {
                 }
                 // COLOADER
                 if (this.form.coloaderCnName) {
-                    let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                    getBcorpslistByType(1,10,{cnName:this.form.coloaderCnName,corpType}).then(res=>{
+                    let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                    getBcorpslistByType(1,10,{cnName:this.form.coloaderCnName,corpTypeName}).then(res=>{
                         this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
                     })
                 }
                 // 船公司
                 if (this.form.carrierCnName) {
-                    let corpType = '1712286570540703745'
-                    getBcorpslistByType(1,10,{cnName:this.form.carrierCnName,corpType}).then(res=>{
+                    let corpTypeName = '船公司'
+                    getBcorpslistByType(1,10,{cnName:this.form.carrierCnName,corpTypeName}).then(res=>{
                         this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
                     })
                     // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode

+ 6 - 6
src/views/iosBasicData/AirtransportExport/bills/index.vue

@@ -1426,8 +1426,8 @@ import { getDeptTree } from "@/api/system/dept";
           },
           // 获取船公司数据
           carrierBcorpslistByTypefun(cnName){
-              let corpType = '1712286570540703745'
-              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+              let corpTypeName = '船公司'
+              getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                   this.carrierData = res.data.data.records
                   this.findObject(this.option.column, "carrierCnName").dicData = res.data.data.records
               })
@@ -1448,16 +1448,16 @@ import { getDeptTree } from "@/api/system/dept";
           },
           // 获取场站数据
           cyBcorpslistByType(cnName){
-              let corpType = '1712286771737272322'
-              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+              let corpTypeName = '场站'
+              getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                   this.cyData = res.data.data.records
                   this.findObject(this.option.column, "cyCnName").dicData = res.data.data.records
               })
           },
           // 订舱代理
           bookingAgentBcorpsListfun(cnName){
-              let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+              let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+              getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                   this.bookingAgentData = res.data.data.records
                   this.findObject(this.option.column, "bookingAgentCnName").dicData = res.data.data.records
               })

+ 2 - 2
src/views/iosBasicData/AirtransportImport/bills/approvalDetails.vue

@@ -791,8 +791,8 @@ export default {
         },
         // 获取业务来源代理数据
         agentBcorpsListfun(cnName){
-            let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-            getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                 this.columnforfun('srcCnName').dicData = res.data.data.records
             })
         },

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

@@ -1270,7 +1270,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 添加跳转
             addJump(name){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
                 if (this.$store.getters.CorrespondenceUnitslos) {
                     this.$alert("往来单位已存在,请保存关闭再进行操作", "温馨提示", {
                         confirmButtonText: "确定",
@@ -1285,7 +1285,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 this.$router.push({
                     path: "/iosBasicData/bcorps/index",
                     query: {
-                        corpType:corpType
+                        corpType:corpTypeName
                     },
                 })
             },
@@ -1293,8 +1293,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
             // 获取发货人数据 (往来单位 前四个代理)
             hshipperBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.hshipperData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1303,8 +1303,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取收货人数据 (往来单位 前四个代理)
             hconsigneeBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.hconsigneeData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1313,8 +1313,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取通知人数据 (往来单位 前四个代理)
             hnotifyBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.hnotifyData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1360,8 +1360,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
 
             // 获取类别 COLOADER 数据
             bcorpstypedefineListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.coloaderCnNameData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1382,8 +1382,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取航空公司数据
             carrierBcorpslistByTypefun(cnName){
-                let corpType = '1712286570540703745'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '船公司'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.carrierData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1401,8 +1401,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 订舱代理
             bookingAgentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.bookingAgentData = res.data.data.records
                 })
             },

+ 2 - 2
src/views/iosBasicData/AirtransportImport/bills/assembly/formbottom.vue

@@ -632,8 +632,8 @@
             // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
             // 获取场站数据
             cyBcorpslistByType(cnName){
-                let corpType = '1712286771737272322'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '场站'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.cyData = res.data.data.records
                 })
             },

+ 14 - 14
src/views/iosBasicData/AirtransportImport/bills/assembly/mbinformation.vue

@@ -751,15 +751,15 @@
             },
             // 获取航空公司数据
             carrierBcorpsListfun(cnName){
-                let corpType = '1712286652421906433'
-                getBcorpsList(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '航空公司'
+                getBcorpsList(1,10,{cnName,corpTypeName}).then(res=>{
                     this.carrierData = res.data.data.records
                 })
             },
             // 获取航站数据
             cyBcorpslistByType(cnName){
-                let corpType = '1712286872304099330'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '航站'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.cyData = res.data.data.records
                 })
             },
@@ -796,36 +796,36 @@
             },
             // 获取订舱代理数据
             bookingAgentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.bookingAgentData = res.data.data.records
                 })
             },
             // 获取MB/L 发货人数据 (往来单位 前四个代理)
             mshipperBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mshipperData = res.data.data.records
                 })
             },
             // 获取收货人数据 (往来单位 前四个代理)
             mconsigneeBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mconsigneeData = res.data.data.records
                 })
             },
             // 获取通知人数据 (往来单位 前四个代理)
             mnotifyBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mnotifyData = res.data.data.records
                 })
             },
             // 获取第二通知人数据 (往来单位 前四个代理)
             mnotify2BcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mnotify2Data = res.data.data.records
                 })
             },

+ 7 - 7
src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -211,7 +211,7 @@
                                                    :detailData="detailData">
                                     </mbinformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1" >
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false" >
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="KYJK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
@@ -837,8 +837,8 @@ import {
             },
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.columnforfun('srcCnName').dicData = res.data.data.records
                 })
             },
@@ -1754,15 +1754,15 @@ import {
                 }
                 // COLOADER
                 if (this.form.coloaderCnName) {
-                    let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                    getBcorpslistByType(1,10,{cnName:this.form.coloaderCnName,corpType}).then(res=>{
+                    let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                    getBcorpslistByType(1,10,{cnName:this.form.coloaderCnName,corpTypeName}).then(res=>{
                         this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
                     })
                 }
                 // 船公司
                 if (this.form.carrierCnName) {
-                    let corpType = '1712286570540703745'
-                    getBcorpslistByType(1,10,{cnName:this.form.carrierCnName,corpType}).then(res=>{
+                    let corpTypeName = '船公司'
+                    getBcorpslistByType(1,10,{cnName:this.form.carrierCnName,corpTypeName}).then(res=>{
                         this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
                     })
                     // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode

+ 6 - 6
src/views/iosBasicData/AirtransportImport/bills/index.vue

@@ -1426,8 +1426,8 @@ import { getDeptTree } from "@/api/system/dept";
           },
           // 获取船公司数据
           carrierBcorpslistByTypefun(cnName){
-              let corpType = '1712286570540703745'
-              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+              let corpTypeName = '船公司'
+              getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                   this.carrierData = res.data.data.records
                   this.findObject(this.option.column, "carrierCnName").dicData = res.data.data.records
               })
@@ -1448,16 +1448,16 @@ import { getDeptTree } from "@/api/system/dept";
           },
           // 获取场站数据
           cyBcorpslistByType(cnName){
-              let corpType = '1712286771737272322'
-              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+              let corpTypeName = '场站'
+              getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                   this.cyData = res.data.data.records
                   this.findObject(this.option.column, "cyCnName").dicData = res.data.data.records
               })
           },
           // 订舱代理
           bookingAgentBcorpsListfun(cnName){
-              let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+              let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+              getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                   this.bookingAgentData = res.data.data.records
                   this.findObject(this.option.column, "bookingAgentCnName").dicData = res.data.data.records
               })

+ 2 - 2
src/views/iosBasicData/OceanFreightImport/bills/approvalDetails.vue

@@ -791,8 +791,8 @@ export default {
         },
         // 获取业务来源代理数据
         agentBcorpsListfun(cnName){
-            let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-            getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                 this.columnforfun('srcCnName').dicData = res.data.data.records
             })
         },

+ 2 - 2
src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -1126,7 +1126,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 添加跳转
             addJump(name){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
                 if (this.$store.getters.CorrespondenceUnitslos) {
                     this.$alert("往来单位已存在,请保存关闭再进行操作", "温馨提示", {
                         confirmButtonText: "确定",
@@ -1141,7 +1141,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 this.$router.push({
                     path: "/iosBasicData/bcorps/index",
                     query: {
-                        corpType:corpType
+                        corpType:corpTypeName
                     },
                 })
             },

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

@@ -439,8 +439,8 @@
             },
             // 获取船公司数据
             carrierBcorpsListfun(cnName){
-                let corpType = '1712286570540703745'
-                getBcorpsList(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '船公司'
+                getBcorpsList(1,10,{cnName,corpTypeName}).then(res=>{
                     this.carrierData = res.data.data.records
                 })
             },
@@ -453,36 +453,36 @@
             },
             // 获取订舱代理数据
             bookingAgentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.bookingAgentData = res.data.data.records
                 })
             },
             // 获取MB/L 发货人数据 (往来单位 前四个代理)
             mshipperBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mshipperData = res.data.data.records
                 })
             },
             // 获取收货人数据 (往来单位 前四个代理)
             mconsigneeBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mconsigneeData = res.data.data.records
                 })
             },
             // 获取通知人数据 (往来单位 前四个代理)
             mnotifyBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mnotifyData = res.data.data.records
                 })
             },
             // 获取第二通知人数据 (往来单位 前四个代理)
             mnotify2BcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.mnotify2Data = res.data.data.records
                 })
             },

+ 1 - 1
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -237,7 +237,7 @@
                                 <!--<el-tab-pane label="MB/L信息" name="third">-->
                                 <!--    <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>-->
                                 <!--</el-tab-pane>-->
-                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1" >
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false" >
                                     <reports :id="form.id" :assemblyForm="form"
                                              :disabled="detailData.seeDisabled"
                                              businessValue="HYJK"></reports>

+ 2 - 2
src/views/iosBasicData/SeafreightExportF/bills/approvalDetails.vue

@@ -791,8 +791,8 @@ export default {
         },
         // 获取业务来源代理数据
         agentBcorpsListfun(cnName){
-            let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-            getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                 this.columnforfun('srcCnName').dicData = res.data.data.records
             })
         },

+ 4 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -50,6 +50,7 @@
                                      @click="excelBox = true" >导入箱号铅封号
                           </el-button>
                           <el-button type="success" size="small"
+                                     :loading="loadingButton"
                                      :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType"
                                      @click="extractBoxInformation" >提取箱信息
                           </el-button>
@@ -222,6 +223,7 @@ export default {
         form: {},
         query: {},
         loading: false,
+        loadingButton:false,
         // page: {
         //   pageSize: 10,
         //   currentPage: 1,
@@ -345,10 +347,12 @@ export default {
               if (this.assemblyForm.containersList.length == 0) {
                   return this.$message.warning('请先进行配箱')
               }
+              this.loadingButton = true
               luHaiTongApiDetail({
                   billNo:this.assemblyForm.mblno,
                   station:this.assemblyForm.cyCode
               }).then(res=>{
+                  this.loadingButton = false
                   this.luHaiTongData = decryptLhtData(JSON.parse(res.data.data).data)
                   console.log(this.luHaiTongData,348)
                   if (this.luHaiTongData.containerCargoInfos.length == 0) {

+ 9 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -633,6 +633,15 @@
                         }
                     }
                 }
+                // 签单地点
+                else if (name == 'issueAt') {
+                    for (let item of this.issueAtData) {
+                        if (item.enName == value) {
+                            this.$set(this.assemblyForm,'issueAt',item.enName)
+                            this.$set(this.assemblyForm,'issueAtId',item.id)
+                        }
+                    }
+                }
                 else {
                     this.assemblyForm[name] = value?value:''
                 }

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

@@ -240,7 +240,7 @@
                                 <el-tab-pane label="MB/L信息" name="third">
                                     <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1" >
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false" >
                                     <reports :id="form.id" :assemblyForm="form"
                                              :disabled="detailData.seeDisabled" businessValue="HYCK"></reports>
                                 </el-tab-pane>

+ 1 - 1
src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"

+ 0 - 1
src/views/iosBasicData/agingAnalysis/index.vue

@@ -96,7 +96,6 @@
                 <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0" @change="dateChange('isBusinessDate')" >按业务日期</el-checkbox>
                 <el-checkbox v-model="query.isToExamineDate" :true-label="1" :false-label="0" @change="dateChange('isToExamineDate')" >按审核日期</el-checkbox>
             </template>
-
         </avue-crud>
     </basic-container>
 </template>

+ 1 - 1
src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"

+ 2 - 2
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -1406,8 +1406,8 @@ export default {
       },
       // 获取业务来源代理数据
       agentBcorpsListfun(cnName){
-          let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-          getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+          let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+          getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
               this.srcData = res.data.data.records
           })
       },

+ 11 - 1
src/views/iosBasicData/bports/portsTerms.vue

@@ -412,6 +412,10 @@ import {getBservicetermsList} from "@/api/iosBasicData/bserviceterms";
                 this.pageLoading = true
                 bportsDetail(id).then(res => {
                     this.form = res.data.data;
+                    this.form.extendedDataArr.map(item=>{
+                        item.edit = false
+                        return item
+                    })
                     this.pageLoading = false
                 });
             },
@@ -494,7 +498,13 @@ import {getBservicetermsList} from "@/api/iosBasicData/bserviceterms";
             },
             // 扩展数据编辑
             extendedDataEdit(index,row) {
-                row.edit = !row.edit
+                if (row.edit) {
+                    this.$delete(row, 'edit')
+                    this.$set(row,'edit',false)
+                }else {
+                    this.$delete(row, 'edit')
+                    this.$set(row,'edit',true)
+                }
             },
             // 扩展数据删除
             extendedDataDelete(index,row) {

+ 2 - 2
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -1388,8 +1388,8 @@
             },
             // 获取业务来源代理数据
             srcBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.srcData = res.data.data.records
                 })
             },

+ 6 - 6
src/views/iosBasicData/reportClose/AEreportClose/bgdetails.vue

@@ -1234,8 +1234,8 @@
             },
             // 获取代理公司数据
             agencyCompanytBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.agencyCompanytData = res.data.data.records
                 })
             },
@@ -1247,8 +1247,8 @@
             },
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.srcData = res.data.data.records
                 })
             },
@@ -1272,8 +1272,8 @@
             },
             // 获取企业数据
             enterpriseCnNameBcorpsListfun(cnName){
-                let corpType = '1752603229734072321'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '企业'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.enterpriseData = res.data.data.records
                 })
             },

+ 6 - 6
src/views/iosBasicData/reportClose/AIreportClose/bgdetails.vue

@@ -1234,8 +1234,8 @@
             },
             // 获取代理公司数据
             agencyCompanytBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.agencyCompanytData = res.data.data.records
                 })
             },
@@ -1247,8 +1247,8 @@
             },
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.srcData = res.data.data.records
                 })
             },
@@ -1272,8 +1272,8 @@
             },
             // 获取企业数据
             enterpriseCnNameBcorpsListfun(cnName){
-                let corpType = '1752603229734072321'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '企业'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.enterpriseData = res.data.data.records
                 })
             },

+ 6 - 6
src/views/iosBasicData/reportClose/SEreportClose/bgdetails.vue

@@ -1241,8 +1241,8 @@
             },
             // 获取代理公司数据
             agencyCompanytBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.agencyCompanytData = res.data.data.records
                 })
             },
@@ -1254,8 +1254,8 @@
             },
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.srcData = res.data.data.records
                 })
             },
@@ -1279,8 +1279,8 @@
             },
             // 获取企业数据
             enterpriseCnNameBcorpsListfun(cnName){
-                let corpType = '1752603229734072321'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '企业'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.enterpriseData = res.data.data.records
                 })
             },

+ 6 - 6
src/views/iosBasicData/reportClose/SIreportClose/bgdetails.vue

@@ -1237,8 +1237,8 @@
             },
             // 获取代理公司数据
             agencyCompanytBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.agencyCompanytData = res.data.data.records
                 })
             },
@@ -1250,8 +1250,8 @@
             },
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.srcData = res.data.data.records
                 })
             },
@@ -1275,8 +1275,8 @@
             },
             // 获取企业数据
             enterpriseCnNameBcorpsListfun(cnName){
-                let corpType = '1752603229734072321'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '企业'
+                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
                     this.enterpriseData = res.data.data.records
                 })
             },

+ 1 - 1
src/views/iosBasicData/seamends/amendsDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"

+ 1 - 1
src/views/iosBasicData/siamends/amendsDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"

+ 1 - 1
vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.8.102:1080',
+        // target: 'http://192.168.8.106:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
         target: 'http://121.37.83.47:10004',//服务器ip