货代 2024-3-6

src/api/iosBasicData/bills.js

@@ -91,6 +91,14 @@ export const billsSubmit = (row) => {
     data: row
   })
 }
+// 配箱专用大保存
+export const billsAdd = (row) => {
+  return request({
+    url: '/api/blade-los/bills/add',
+    method: 'post',
+    data: row
+  })
+}
 // 添加到主单
 export const billsIncreaseReinsurancePolicy = (ids,id) => {
   return request({

src/api/iosBasicData/paymentSummary.js

@@ -0,0 +1,25 @@
+import request from '@/router/axios';
+
+export const financeStatisticsFeeSummary = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/financeStatistics/feeSummary',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+// 明细
+export const financeStatisticsFeeSummaryDetail = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/financeStatistics/feeSummaryDetail',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/enums/column-name.js

@@ -1555,6 +1555,14 @@ const columnName = [{
     code: 331,
     name: '货运代理-财务管理-科目明细帐'
   },
+  {
+    code: 332,
+    name: '货运代理-决策分析-收付汇总'
+  },
+  {
+    code: 333,
+    name: '货运代理-决策分析-收付明细'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/router/views/index.js

@@ -3108,19 +3108,34 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/ComputationCenter/index')
     }]
   },
-  // 决策分析
+  // 收付汇总
   {
-    path: '/iosBasicData/decisionAnalysis/index',
+    path: '/iosBasicData/paymentSummary/index',
     component: Layout,
     hidden: true,
     children: [{
-      path: '/iosBasicData/decisionAnalysis/index',
-      name: '决策分析',
+      path: '/iosBasicData/paymentSummary/index',
+      name: '收付汇总(F)',
       meta: {
-        i18n: '/iosBasicData/decisionAnalysis/index',
+        i18n: '/iosBasicData/paymentSummary/index',
         keepAlive: true,
       },
-      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/decisionAnalysis/index')
+      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/paymentSummary/index')
+    }]
+  },
+  // 收付明细
+  {
+    path: '/iosBasicData/paymentDetail/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/iosBasicData/paymentDetail/index',
+      name: '收付明细(F)',
+      meta: {
+        i18n: '/iosBasicData/paymentDetail/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/paymentDetail/index')
     }]
   },
   // 海运出口报关

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -684,7 +684,7 @@
                     delBtn: false,
                     editBtn: false,
                     menuWidth: '100',
-                    menu:false,
+                    // menu:false,
                     column: [
                         {
                             label: "客户名称",

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

@@ -7,6 +7,7 @@
                         @selectionChange="selectionChange"
                         @rowSavefun="containersSubmitfun"
                         @billsDetailfun="billsDetailfun"
+                        @billsAddfun="billsAddfun"
                         @equalDistribution="containersEqualDistributionfun"></containers>
         </div>
 
@@ -65,6 +66,10 @@ export default {
                     this.billsDetailfun()
                 })
             },
+            // 保存接口
+            billsAddfun(){
+                this.$emit('billsAddfun')
+            },
             // 详情接口
             billsDetailfun(){
                 this.$emit('billsDetailfun')

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

@@ -35,7 +35,15 @@
                           </el-button>
                           <el-button type="primary" size="small"
                                      :disabled="detailData.seeDisabled || pleasereviewType"
-                                     @click="containersSubmitListfun" >批量保存
+                                     @click="rootEditfun" >一键编辑
+                          </el-button>
+                          <el-button type="primary" size="small"
+                                     :disabled="detailData.seeDisabled || pleasereviewType"
+                                     @click="containersSubmitListfun" >一键保存
+                          </el-button>
+                          <el-button type="danger" size="small"
+                                     :disabled="detailData.seeDisabled || pleasereviewType"
+                                     @click="handleDelete">一键删除
                           </el-button>
                           <el-button type="success" size="small"
                                      :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType"
@@ -127,8 +135,19 @@
               温馨提示 第一次导入时请先下载模板
           </p>
       </el-dialog>
-  </div>
 
+      <!--提取的数据展示框-->
+      <el-dialog append-to-body title="预览数据" class="el-dialogDeep" :visible.sync="extractDialogvisible" width="80%"
+                 :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+          <extract-box-information :luHaiTongData="luHaiTongData"></extract-box-information>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="extractDialogvisible = false">取 消</el-button>
+            <el-button type="primary" @click="extractDialogfun">导 入</el-button>
+          </span>
+      </el-dialog>
+
+
+  </div>
 </template>
 
 <script>
@@ -148,9 +167,12 @@ import {
   import {bportsList} from "@/api/iosBasicData/bports";
 import {getToken} from "@/util/auth";
 import { decryptLhtData } from "@/util/lhtDataDesc";
+import extractBoxInformation
+    from "@/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/extractBoxInformation.vue";
+import {billsAdd} from "@/api/iosBasicData/bills";
 
 export default {
-      components: {SearchQuery,bports},
+      components: {SearchQuery,bports,extractBoxInformation},
       props:{
           assemblyForm:{},
           detailData:{},
@@ -282,7 +304,10 @@ export default {
             },
           ]
         },
-        data: []
+        data: [],
+          luHaiTongData:[], // 提取请求到解析的数据
+          extractDialogvisible:false, // 提取请求到的数据展示
+
       };
     },
     computed: {
@@ -307,61 +332,153 @@ export default {
       },
       methods: {
           // 提取箱信息
-          extractBoxInformation(){
+           extractBoxInformation(){
+              if (!this.assemblyForm.id) {
+                  return this.$message.warning('请先保存数据')
+              }
               if (!this.assemblyForm.mblno) {
                   return this.$message.warning('请先填写MB/L NO')
               }
               if (!this.assemblyForm.cyCode) {
                   return this.$message.warning('请先选择场站')
               }
+              if (this.assemblyForm.containersList.length == 0) {
+                  return this.$message.warning('请先进行配箱')
+              }
               luHaiTongApiDetail({
                   billNo:this.assemblyForm.mblno,
                   station:this.assemblyForm.cyCode
               }).then(res=>{
-                  let luHaiTongData = decryptLhtData(JSON.parse(res.data.data).data)
-                  let arr = this.assemblyForm.containersList.map(item=>{
-                      return item.id
-                  })
-                  this.$confirm('此操作将会覆盖, 是否继续?', '提示', {
+                  this.luHaiTongData = decryptLhtData(JSON.parse(res.data.data).data)
+                  console.log(this.luHaiTongData,348)
+                  if (this.luHaiTongData.containerCargoInfos.length == 0) {
+                      return this.$message.warning('提取到的数据为空')
+                  }
+                  this.extractDialogvisible = true
+              })
+          },
+          // 提取箱信息弹窗里的导入
+          extractDialogfun(){
+              // if (this.assemblyForm.containersList.length != this.luHaiTongData.containerCargoInfos.length) {
+              //     this.$confirm(`箱量不相等,委托数量为${this.assemblyForm.containersList.length},场站数量为${this.luHaiTongData.containerCargoInfos.length}?是否继续`, '提示', {
+              //         confirmButtonText: '确定',
+              //         cancelButtonText: '取消',
+              //         type: 'warning'
+              //     }).then(()=>{
+              //         this.extractionProcessing()
+              //     }).catch(()=>{
+              //         return
+              //     })
+              // }else {
+              //     this.extractionProcessing()
+              // }
+              this.extractionProcessing()
+          },
+          // 数据处理
+          extractionProcessing(){
+               let returnType = 0 // 判断是否需要合计
+              // 把请求到的箱号和封号赋值
+              this.luHaiTongData.containerCargoInfos.map((luHaiTongItem,luHaiTongIndex)=>{
+                  if ((luHaiTongItem.size + '' + luHaiTongItem.property) == this.assemblyForm.containersList[luHaiTongIndex].cyCntrCode) {
+                      this.assemblyForm.containersList[luHaiTongIndex].cntrNo = luHaiTongItem.containerNo
+                      this.assemblyForm.containersList[luHaiTongIndex].sealNo = luHaiTongItem.sealNo
+                      // 判断没有没有返厂时间，如果没有不合计前面的
+                      if (!luHaiTongItem.returnDate) {
+                          returnType++
+                      }
+                  }
+              })
+              // 统计提取同一箱号的好件重尺合计赋值
+              let quantitySum = 0
+              let grossWeightSum = 0
+              let measurementSum = 0
+              this.assemblyForm.containersList.map((containersItem,containersIndex)=>{
+                  let numberSum = 0
+                  let weightSum = 0
+                  let volSum = 0
+                  for (let loadingItem of this.luHaiTongData.loadingInfos) {
+                      if (loadingItem.containerNo == containersItem.cntrNo) {
+                          numberSum += loadingItem.number
+                          weightSum += loadingItem.weight
+                          volSum += loadingItem.vol
+                      }
+                  }
+                  containersItem.quantity = numberSum
+                  containersItem.grossWeight = weightSum
+                  containersItem.measurement = volSum
+                  // 把件重尺进行合计判断主表件重尺是否相等
+                  quantitySum += containersItem.quantity
+                  grossWeightSum += containersItem.grossWeight
+                  measurementSum += containersItem.measurement
+              })
+              console.log(quantitySum,grossWeightSum,measurementSum,366)
+              // 判断合计的件重尺是否等于朱标的件重尺
+              if (this.assemblyForm.containersList.length == this.luHaiTongData.containerCargoInfos.length && this.assemblyForm.quantity == quantitySum && this.assemblyForm.grossWeight == grossWeightSum && this.assemblyForm.measurement == measurementSum) {
+                  this.extractDialogvisible = false
+                  this.$emit('billsAddfun') // 全都相等直接走大保存
+              }else {
+                  this.$alert('<div>委托:箱数,件重尺 场站:箱数,件重尺不相等</div>' +
+                      '<table border="1" width="100%">\n' +
+                      '  <thead>\n' +
+                      '    <tr>\n' +
+                      '      <th></th>\n' +
+                      '      <th>箱数</th>\n' +
+                      '      <th>件数</th>\n' +
+                      '      <th>毛重</th>\n' +
+                      '      <th>尺码</th>\n' +
+                      '    </tr>\n' +
+                      '  </thead>\n' +
+                      '  <tbody>\n' +
+                      '    <tr>\n' +
+                      '      <td>委托</td>\n' +
+                      '      <td>'+ this.assemblyForm.containersList.length +'</td>\n' +
+                      '      <td>'+ this.assemblyForm.quantity +'</td>\n' +
+                      '      <td>'+ this.assemblyForm.grossWeight +'</td>\n' +
+                      '      <td>'+ this.assemblyForm.measurement +'</td>\n' +
+                      '    </tr>\n' +
+                      '    <tr>\n' +
+                      '      <td>场站</td>\n' +
+                      '      <td>'+ this.luHaiTongData.containerCargoInfos.length +'</td>\n' +
+                      '      <td>'+ quantitySum +'</td>\n' +
+                      '      <td>'+ grossWeightSum +'</td>\n' +
+                      '      <td>'+ measurementSum +'</td>\n' +
+                      '    </tr>\n' +
+                      '  </tbody>\n' +
+                      '</table>', '提示', {
+                      dangerouslyUseHTMLString: true,
                       confirmButtonText: '确定',
-                      cancelButtonText: '取消',
+                      cancelButtonText: '关闭',
+                      // showCancelButton:true,
                       type: 'warning'
-                  }).then(() => {
-                      // 删除箱号接口
-                      containersRemove(arr.join(',')).then(()=>{
-                          this.assemblyForm.containersList = []
-                          for (let item of luHaiTongData.loadingInfos) {
-                              this.assemblyForm.containersList.push({
-                                  pid:this.assemblyForm.id,
-                                  cntrTypeCode:item.size + '' + item.property,
-                                  cntrNo:item.containerNo,
-                                  sealNo:item.sealNo,
-                                  quantity:item.number,
-                                  grossWeight:item.weight,
-                                  measurement:item.vol
-                              })
+                  }).then(()=>{
+                      console.log('确认')
+                      // 箱数不等 不更新前面的
+                      if (this.assemblyForm.containersList.length == this.luHaiTongData.containerCargoInfos.length) {
+                          for (let item of this.assemblyForm.preContainersList) {
+                              let pieceSum = 0
+                              let weightSum = 0
+                              let chiSum = 0
+                              for (let ite of this.assemblyForm.containersList) {
+                                  if (item.cntrTypeCode == ite.cyCntrCode) {
+                                      pieceSum += ite.quantity
+                                      weightSum += ite.grossWeight
+                                      chiSum += ite.measurement
+                                  }
+                              }
+                              item.number = pieceSum
+                              item.grossWeight = weightSum
+                              item.measurement = chiSum
                           }
-                          containersSubmitList(this.assemblyForm.containersList).then(()=>{
-                              this.$emit('billsDetailfun')
-                          })
-                      })
-                  }).catch(() => {
-                      for (let item of luHaiTongData.loadingInfos) {
-                          this.assemblyForm.containersList.push({
-                              pid:this.assemblyForm.id,
-                              cntrTypeCode:item.size + '' + item.property,
-                              cntrNo:item.containerNo,
-                              sealNo:item.sealNo,
-                              quantity:item.number,
-                              grossWeight:item.weight,
-                              measurement:item.vol
-                          })
-                      }
-                      containersSubmitList(this.assemblyForm.containersList).then(()=>{
-                          this.$emit('billsDetailfun')
-                      })
-                  });
-              })
+                          this.assemblyForm.quantity = quantitySum
+                          this.assemblyForm.grossWeight = grossWeightSum
+                          this.assemblyForm.measurement = measurementSum
+                      }else {}
+                      this.extractDialogvisible = false
+                      this.$emit('billsAddfun') // 全都相等直接走大保存
+                  }).catch(()=>{
+                      console.log('取消')
+                  })
+              }
           },
           // 输入自动大写
           cntrNoInput(row,name){
@@ -422,6 +539,13 @@ export default {
                   this.$emit('equalDistribution')
               })
           },
+          // 一键编辑
+          rootEditfun(){
+              for(let item of this.assemblyForm.containersList) {
+                  this.$delete(item, 'edit')
+                  this.$set(item, 'edit', true)
+              }
+          },
           // 编辑
           rowCellfun(row,index){
               this.$delete(row, 'edit')
@@ -555,27 +679,26 @@ export default {
             this.$emit('billsDetailfun')
           });
       },
+      // 一键删除
       handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将全部数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
+        }).then(() => {
+            let arrids = this.assemblyForm.containersList.map(item=>{
+                return item.id
+            })
+             containersRemove(arrids.join(',')).then(() => {
+                 // this.onLoad(this.page);
+                 this.$message({
+                     type: "success",
+                     message: "操作成功!"
+                 });
+                 this.$emit('billsDetailfun')
+                 this.$refs.crud.toggleSelection();
+             });
         })
-          .then(() => {
-            return containersRemove(this.ids);
-          })
-          .then(() => {
-            // this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
       },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {

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

@@ -0,0 +1,80 @@
+<template>
+    <div>
+        <div>
+            <div style="display: flex;align-items: center;margin-bottom: 10px;">
+                <div style="width: 5px;height: 20px;background: #2d8cf0;margin-right: 8px;border-radius: 2px;"></div>
+                <span style="font-size: 18px;color: #2d8cf0;">箱货动态</span>
+            </div>
+            <el-table
+                :data="luHaiTongData.containerCargoInfos"
+                border
+                size="mini"
+                :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                :cell-style="{padding:'0px',fontSize:'12px'}"
+                style="width: 100%">
+                <el-table-column prop="containerNo" label="箱号" width="110" />
+                <el-table-column label="尺寸/箱型" width="100" >
+                    <template slot-scope="{ row }">{{row.size}}{{row.property}}</template>
+                </el-table-column>
+                <el-table-column prop="sealNo" label="封号" width="90" />
+                <el-table-column prop="inOrOut" label="内/外点" width="70" />
+                <el-table-column prop="getContainerDate" label="提箱时间" />
+                <el-table-column prop="returnDate" label="返场时间" />
+                <el-table-column prop="portDate" label="集港时间" />
+                <el-table-column prop="containerWeight" label="箱皮重" width="80" />
+                <el-table-column prop="payload" label="最大载荷" width="80" />
+                <el-table-column prop="carNo" label="车号"/>
+                <el-table-column prop="billNo" label="提单号"/>
+                <el-table-column prop="vgmWeight" label="VGM重量" width="80" />
+                <!--<el-table-column prop="containerCheckNo" label="箱检划拨号" width="90" />-->
+                <!--<el-table-column prop="containerCheckDate" label="箱检有效期" width="90"/>-->
+                <!--<el-table-column prop="stampNo" label="封条号"/>-->
+            </el-table>
+        </div>
+
+        <div style="margin-top: 10px;">
+            <div style="display: flex;align-items: center;margin-bottom: 10px;">
+                <div style="width: 5px;height: 20px;background: #2d8cf0;margin-right: 8px;border-radius: 2px;"></div>
+                <span style="font-size: 18px;color: #2d8cf0;">实际装货信息</span>
+            </div>
+            <el-table
+                :data="luHaiTongData.loadingInfos"
+                border
+                size="mini"
+                :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                :cell-style="{padding:'0px',fontSize:'12px'}"
+                style="width: 100%">
+                <el-table-column prop="billNo" label="分提单号"/>
+                <el-table-column prop="containerNo" label="箱号" />
+                <el-table-column prop="size" label="尺寸" />
+                <el-table-column prop="property" label="箱型" />
+                <el-table-column prop="sealNo" label="铅封" />
+                <el-table-column prop="number" label="实装件数" />
+                <el-table-column prop="pack" label="包装方式"  />
+                <el-table-column prop="weight" label="实装重量" />
+                <el-table-column prop="vol" label="实装尺码" />
+            </el-table>
+        </div>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        props:{
+            luHaiTongData:{
+                type:Object,
+                default: {}
+            },
+        },
+        data(){
+            return {
+
+            }
+        },
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -47,9 +47,10 @@
             <BillofLadingDetails v-else-if="businesstypeData.reportsType == 'TDXQ'" :documentForm="documentForm"></BillofLadingDetails>
             <span v-else>啥也不是</span>
             <span slot="footer" class="dialog-footer">
-                <el-button type="success" @click="documentSubmit(true)" >保存并打印</el-button>
+                <!--<el-button type="success" @click="documentSubmit(true)" >保存并打印</el-button>-->
+                <el-button type="success" :disabled="!documentForm.id" @click="dialogPreviewfun(editData)" >打印</el-button>
                 <el-button @click="printingCanceling">取 消</el-button>
-                <el-button type="primary" @click="documentSubmit(false)">确 定</el-button>
+                <el-button type="primary" @click="documentSubmit(false)">保 存</el-button>
             </span>
         </el-dialog>
 
@@ -247,6 +248,11 @@ import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assemb
                             overHidden:true,
                         },
                         {
+                            label: "单据类型",
+                            prop: "groupCode",
+                            overHidden:true,
+                        },
+                        {
                             label: "创建人",
                             prop: "createUserName",
                             overHidden:true,
@@ -289,16 +295,22 @@ import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assemb
         },
         methods:{
             // 打印预览按钮
-            dialogPreviewfun(row){
+            async dialogPreviewfun(row){
                 this.editData = row
                 this.documentForm = JSON.parse(row.printContent).data
-                this.previewDialog = true
                 this.PreviewPage.currentPage = 1;
-                this.PreviewOnLoad(this.PreviewPage, {
+                const data = await this.PreviewOnLoad(this.PreviewPage, {
                     businessType:'HYCK',
                     classifyCode:'单证',
                     groupCode:row.groupCode
                 });
+                this.$nextTick(()=>{
+                    if (data.length == 1) {
+                        this.handleReportPreview(data[0].url,this.documentForm)
+                    }else {
+                        this.previewDialog = true
+                    }
+                })
                 // let obj = {businessType:'HYCK',classifyCode:'单证',groupCode:row.groupCode}
                 // let documentaa = null // 暂存url数据
                 // reportsList(1,20,{
@@ -379,12 +391,12 @@ import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assemb
                 });
             },
             // 打印预览弹窗数据
-            PreviewOnLoad(page, params = {}){
-                reportsList(page.currentPage, page.pageSize, Object.assign(params, this.PreviewQuery)).then(res => {
-                    const data = res.data.data;
-                    this.PreviewPage.total = data.total;
-                    this.PreviewData = data.records;
-                });
+            async PreviewOnLoad(page, params = {}){
+                const res = await reportsList(page.currentPage, page.pageSize, Object.assign(params, this.PreviewQuery))
+                const data = res.data.data;
+                this.PreviewPage.total = data.total;
+                this.PreviewData = data.records;
+                return data.records
             },
             // 新建单证按钮
             addbtnfun(){

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

@@ -1381,7 +1381,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: "确定",
@@ -1396,7 +1396,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 this.$router.push({
                     path: "/iosBasicData/bcorps/index",
                     query: {
-                        corpType:corpType
+                        corpType:corpTypeName
                     },
                 })
             },
@@ -1404,8 +1404,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,status: 0,corpTypeName}).then(res=>{
                     this.hshipperData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1414,8 +1414,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,status: 0,corpTypeName}).then(res=>{
                     this.hconsigneeData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1424,8 +1424,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,status: 0,corpTypeName}).then(res=>{
                     this.hnotifyData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1434,8 +1434,8 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取第二通知人数据 （往来单位 前四个代理）
             hnotify2BcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
                     this.hnotify2Data = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1444,7 +1444,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 收货地数据 （港口表）
             placeReceiptBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
+                bportsList(1,10,{enName,status: 0}).then(res=>{
                     this.placeReceiptData = res.data.data.records.map(item=>{
                         item.enName = item.enName + ' - ' + item.code
                         return item
@@ -1453,7 +1453,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 装货港数据
             polBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
+                bportsList(1,10,{enName,status: 0}).then(res=>{
                     this.polData = res.data.data.records.map(item=>{
                         item.enName = item.enName + ' - ' + item.code
                         return item
@@ -1462,7 +1462,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 卸货港数据
             podBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
+                bportsList(1,10,{enName,status: 0}).then(res=>{
                     this.podData = res.data.data.records.map(item=>{
                         item.enName = item.enName + ' - ' + item.code
                         return item
@@ -1471,7 +1471,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 目的地
             destinationBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
+                bportsList(1,10,{enName,status: 0}).then(res=>{
                     this.destinationData = res.data.data.records.map(item=>{
                         item.enName = item.enName + ' - ' + item.code
                         return item
@@ -1480,7 +1480,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 交货地
             placeDeliveryBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
+                bportsList(1,10,{enName,status: 0}).then(res=>{
                     this.placeDeliveryData = res.data.data.records.map(item=>{
                         item.enName = item.enName + ' - ' + item.code
                         return item
@@ -1489,7 +1489,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 中转港
             potBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
+                bportsList(1,10,{enName,status: 0}).then(res=>{
                     this.potData = res.data.data.records.map(item=>{
                         item.enName = item.enName + ' - ' + item.code
                         return item
@@ -1498,8 +1498,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,status: 0,corpTypeName}).then(res=>{
                     this.coloaderCnNameData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1508,20 +1508,20 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 包装数据
             packingUnitBpackagesListfun(cnName) {
-                bpackagesList(1,10,{cnName}).then(res=>{
+                bpackagesList(1,10,{cnName,status: 0}).then(res=>{
                     this.packingUnitData = res.data.data.records
                 })
             },
             // 商品 HS-CODE （货物列表）
             commodityBcommodityListfun(cnName){
-                bcommodityList(1,10,{cnName}).then(res=>{
+                bcommodityList(1,10,{cnName,status: 0}).then(res=>{
                     this.commodityData = res.data.data.records
                 })
             },
             // 获取船公司数据
             carrierBcorpslistByTypefun(cnName){
-                let corpType = '1712286570540703745'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '船公司'
+                getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
                     this.carrierData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1530,7 +1530,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 船名
             vesselBvesselsListfun(cnName){
-                getBvesselsList(1,10,{cnName}).then(res=>{
+                getBvesselsList(1,10,{cnName,status: 0}).then(res=>{
                     this.vesselData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.code
                         return item
@@ -1539,14 +1539,14 @@ 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,status: 0,corpTypeName}).then(res=>{
                     this.bookingAgentData = res.data.data.records
                 })
             },
             // 航线数据
             lineBlinesListfun(cnName){
-                blinesList(1,10,{cnName}).then(res=>{
+                blinesList(1,10,{cnName,status: 0}).then(res=>{
                     this.lineData = res.data.data.records
                 })
             },

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

@@ -57,7 +57,7 @@
                           :clearable="true"
                           :remote="true"
                           :buttonIf="false"
-                          :forParameter="{key:'id',label:'cntrType',value:'cntrType'}"
+                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                           placeholder="请选择尺码箱型"
                           @remoteMethod="remoteMethod($event,'cntrTypeCode')"
                           @corpChange="corpChange($event,row)"
@@ -471,8 +471,8 @@ import {
         // 选择框的回调
         corpChange(value,row) {
             for (let item of this.cntrTypeCodeData) {
-                if (item.cntrType == value) {
-                    this.$set(row,'cntrTypeCode',item.cntrType)
+                if (item.cnName == value) {
+                    this.$set(row,'cntrTypeCode',item.cnName)
                     this.$set(row,'teu',item.teu)
                 }
             }

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

@@ -233,6 +233,7 @@
                                 <el-tab-pane label="配箱信息" name="second">
                                     <DistributionBox :assemblyForm="form" :detailData="detailData"
                                                      :pleasereviewType="pleasereviewType"
+                                                     @billsAddfun="billsAddfun"
                                                      @billsDetailfun="billsDetailfun(form.id)">
                                     </DistributionBox>
                                 </el-tab-pane>
@@ -313,6 +314,7 @@ import {
     billsGetBillNo,
     billsListAll, billsRevokeCheckBills, editypesSendingEdi,
     billsSubmit,
+    billsAdd,
     deptGetDetailPol, postSelectByUser,
 } from '@/api/iosBasicData/bills'
 import {dateFormat} from "@/util/date";
@@ -846,7 +848,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 获取客户名称数据 往来单位数据
             getBcorpsListfun(cnName){
-                getBcorpsList(1,10,{cnName}).then(res=>{
+                getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
                     this.columnforfun('corpCnName').dicData = res.data.data.records.map(item=>{
                         item.cnName = item.cnName + ' - ' + item.shortName
                         return item
@@ -884,8 +886,8 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
                     this.columnforfun('srcCnName').dicData = res.data.data.records
                 })
             },
@@ -1510,6 +1512,20 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.pageLoading = false
                 })
             },
+            // 提取箱专用的保存
+            billsAddfun(){
+                billsAdd(this.form).then(res=>{
+                    this.pageLoading = false
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    });
+                    // this.detailData.seeDisabled = true
+                    this.billsDetailfun(res.data.data.id)
+                }).catch(err=>{
+                    this.pageLoading = false
+                })
+            },
             // 复制单据接口
             billsCopyBillsfun(id){
                 billsCopyBills({id}).then(res=>{
@@ -1786,15 +1802,15 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 }
                 // 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,status: 0,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,status: 0,corpTypeName}).then(res=>{
                         this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
                     })
                     // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -1440,9 +1440,17 @@ export default {
       },
 
     corpTypeChange(ids) {
-      // console.log(ids);
+        let arr = []
+        for (let item of ids) {
+            for (let ite of this.customTypeData) {
+                if (item == ite.id) {
+                    arr.push(ite.cnName)
+                }
+            }
+        }
       this.formData.corpType = ids.join(",")
-      // console.log(this.formData.corpType);
+      this.formData.corpTypeName = arr.join(",")
+      // console.log(this.formData.corpTypeName);
     },
     salesChange(id) {
       if (id == null) {

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -1,22 +0,0 @@
-<template>
-    <basic-container>
-        <div>决策分析</div>
-    </basic-container>
-</template>
-
-<script>
-    export default {
-        data(){
-            return {
-
-            }
-        },
-        methods:{
-
-        }
-    }
-</script>
-
-<style scoped>
-
-</style>

src/views/iosBasicData/paymentDetail/index.vue

@@ -0,0 +1,597 @@
+<template>
+    <basic-container>
+        <avue-crud :option="option"
+                   :table-loading="loading"
+                   :data="data"
+                   :page.sync="page"
+                   :search.sync="query"
+                   v-model="form"
+                   ref="crud"
+                   id="out-table"
+                   :header-cell-class-name="headerClassName"
+                   @search-change="searchChange"
+                   @search-reset="searchReset"
+                   @current-change="currentChange"
+                   @size-change="sizeChange"
+                   @refresh-change="refreshChange"
+                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 333)"
+                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 333)"
+                   @on-load="onLoad" >
+            <template slot="menuLeft">
+                <el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
+            </template>
+            <template slot-scope="{disabled,size}" slot="dcSearch">
+                <el-radio v-model="query.dc" label="D" @input="dcInput" >应收</el-radio>
+                <el-radio v-model="query.dc" label="C" @input="dcInput" >应付</el-radio>
+            </template>
+            <template slot-scope="{disabled,size}" slot="typeSearch">
+                <search-query :datalist="typeData"
+                              :selectValue="query.type"
+                              :buttonIf="false"
+                              @corpChange="corpChange($event,'type')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="businessTypeSearch">
+                <search-query :datalist="businessTypeData"
+                              :selectValue="query.businessType"
+                              :clearable="true"
+                              :buttonIf="false"
+                              @corpChange="corpChange($event,'businessType')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="clientIdSearch">
+                <search-query :datalist="clientIdData"
+                              :selectValue="query.clientName"
+                              :filterable="true"
+                              :remote="true"
+                              :clearable="true"
+                              :disabled="query.type != 2"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                              @remoteMethod="clientIdListfun"
+                              @corpFocus="clientIdListfun"
+                              @corpChange="corpChange($event,'clientName')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="corpIdSearch">
+                <search-query :datalist="corpIdData"
+                              :selectValue="query.corpName"
+                              :disabled="query.type != 1"
+                              :filterable="true"
+                              :remote="true"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                              @remoteMethod="getBcorpsListfun"
+                              @corpFocus="getBcorpsListfun"
+                              @corpChange="corpChange($event,'corpName')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="srcTypeSearch">
+                <search-query :datalist="srcTypeData"
+                              :selectValue="query.srcType"
+                              :disabled="query.type != 3"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                              @corpFocus="srcTypeWorkDictsfun"
+                              @corpChange="corpChange($event,'srcType')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="srcIdSearch">
+                <search-query :datalist="srcIdData"
+                              :selectValue="query.srcName"
+                              :disabled="query.type != 3"
+                              :filterable="true"
+                              :remote="true"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="srcforParameter"
+                              @remoteMethod="srcCorpFocus"
+                              @corpFocus="srcCorpFocus"
+                              @corpChange="corpChange($event,'srcName')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="isBusinessDateSearch">
+                <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>
+
+<script>
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
+import { financeStatisticsFeeSummaryDetail} from "@/api/iosBasicData/paymentSummary"
+import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
+import {getWorkDicts} from "@/api/system/dictbiz";
+import {getDeptLazyTree} from "@/api/system/dept";
+import {getList as userGetList} from '@/api/system/user'
+import {getToken} from "@/util/auth";
+
+export default {
+    components: {SearchQuery},
+    data(){
+        return {
+            form: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
+            },
+            query: {
+                dc:'D',
+                isBusinessDate:1,
+                type:'1',
+                etdStart:defaultDate3()[0],
+                etdEnd:defaultDate3()[1],
+            },
+            option:{},
+            optionBack:{
+                height:'auto',
+                calcHeight: 30,
+                tip: false,
+                searchShow: true,
+                searchMenuSpan: 6,
+                border: true,
+                index: false,
+                selection: true,
+                dialogClickModal: false,
+                menu:false,
+                addBtn:false,
+                viewBtn:false,
+                delBtn:false,
+                editBtn:false,
+                column:[
+                    {
+                        label: "结算单位",
+                        prop: "corpName",
+                        overHidden:true,
+                    },
+                    {
+                        label: "BILLNO",
+                        prop: "billNo",
+                        overHidden:true,
+                    },
+                    {
+                        label: "MBLNO",
+                        prop: "mblNo",
+                        overHidden:true,
+                    },
+                    {
+                        label: "ETD",
+                        prop: "etdDate",
+                        overHidden:true,
+                    },
+                    {
+                        label: "应收美金",
+                        prop: "amountUsd",
+                        overHidden:true,
+                    },
+                    {
+                        label: "应收人民币",
+                        prop: "amount",
+                        overHidden:true,
+                    },
+                    {
+                        label: "已收款美金",
+                        prop: "amountUsdAlready",
+                        overHidden:true,
+                    },
+                    {
+                        label: "已收款人民币",
+                        prop: "amountAlready",
+                        overHidden:true,
+                    },
+                    {
+                        label: "未收款美金",
+                        prop: "amountUsdNot",
+                        overHidden:true,
+                    },
+                    {
+                        label: "未收款人民币",
+                        prop: "amountNot",
+                        overHidden:true,
+                    },
+                    {
+                        label: "开票美金",
+                        prop: "amountInvoicingUsd",
+                        overHidden:true,
+                    },
+                    {
+                        label: "开票人民币",
+                        prop: "amountInvoicing",
+                        overHidden:true,
+                    },
+                    {
+                        label: "未开美金",
+                        prop: "amountInvoicingUsdNot",
+                        overHidden:true,
+                    },
+                    {
+                        label: "未开人民币",
+                        prop: "amountInvoicingNot",
+                        overHidden:true,
+                    },
+
+                    {
+                        label: "查询方式",
+                        prop: "type",
+                        hide:true,
+                        search:true,
+                        type: 'select',
+                        searchslot:true,
+                    },
+                    {
+                        label: "业务类型",
+                        prop: "businessType",
+                        hide:true,
+                        search:true,
+                        searchslot:true,
+                    },
+                    {
+                        label: "委托人",
+                        prop: "clientId",
+                        hide:true,
+                        search:true,
+                        searchslot:true,
+                    },
+                    {
+                        label: "结算单位",
+                        prop: "corpId",
+                        hide:true,
+                        search:true,
+                        searchslot:true,
+                    },
+                    {
+                        label: "业务来源",
+                        prop: "srcType",
+                        hide:true,
+                        search:true,
+                        searchslot:true,
+                    },
+                    {
+                        label: "业务员",
+                        prop: "srcId",
+                        hide:true,
+                        search:true,
+                        searchslot:true,
+                    },
+                    {
+                        label: "开始日期",
+                        prop: "etdStart",
+                        search:true,
+                        overHidden:true,
+                        hide:true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd",
+                    },
+                    {
+                        label: "结束日期",
+                        prop: "etdEnd",
+                        search:true,
+                        overHidden:true,
+                        hide:true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd",
+                    },
+                    {
+                        label: "",
+                        prop: "dc",
+                        hide:true,
+                        search:true,
+                        searchslot:true,
+                        searchLabelWidth:'0'
+                    },
+                    {
+                        label: "",
+                        prop: "isBusinessDate",
+                        hide:true,
+                        search:true,
+                        searchslot:true,
+                        searchLabelWidth:'0'
+                    },
+                    {
+                        label: "",
+                        prop: "isToExamineDate",
+                        hide:true,
+                        searchLabelWidth:'0',
+                    },
+
+                ]
+            },
+            data:[],
+            // 查询方式
+            typeData:[
+                {
+                    label:'结算单位',
+                    value:'1'
+                },{
+                    label:'委托人',
+                    value:'2'
+                },{
+                    label:'业务来源',
+                    value:'3'
+                }
+            ],
+            // 业务类型
+            businessTypeData:[
+                {
+                    label:'海运出口',
+                    value:'HYCK'
+                },{
+                    label:'海运进口',
+                    value:'HYJK'
+                },{
+                    label:'空运出口',
+                    value:'KYCK'
+                },{
+                    label:'空运进口',
+                    value:'KYJK'
+                }
+            ],
+            clientIdData:[], // 委托人
+            corpIdData:[], // 结算单位
+            srcTypeData:[], // 业务来源
+            srcIdData:[], // 业务员
+            srcforParameter:{key:'id', label:'cnName', value:'cnName'},
+
+        }
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(333), this.optionBack);
+    },
+    methods:{
+        // 导出
+        exportfun(){
+            const routeData = this.$router.resolve({
+                path: '/api/blade-los/financeStatistics/feeSummaryDetailExport',//跳转目标窗口的地址
+                query: {
+                    ...this.query
+                }
+            })
+            window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+        },
+        // 下拉监听
+        corpChange(value,name){
+            if (name == 'type') {
+                if (value == 1) {
+                    this.$set(this.query,'clientId',null)
+                    this.$set(this.query,'clientName',null)
+                    this.$set(this.query,'srcType',null)
+                    this.$set(this.query,'srcId',null)
+                    this.$set(this.query,'srcName',null)
+                    this.findObject(this.option.column, "corpName").label = '结算单位'
+                }else if (value == 2) {
+                    this.$set(this.query,'corpId',null)
+                    this.$set(this.query,'corpName',null)
+                    this.$set(this.query,'srcType',null)
+                    this.$set(this.query,'srcId',null)
+                    this.$set(this.query,'srcName',null)
+                    this.findObject(this.option.column, "corpName").label = '委托人'
+                }else if (value == 3) {
+                    this.$set(this.query,'corpId',null)
+                    this.$set(this.query,'corpName',null)
+                    this.$set(this.query,'clientId',null)
+                    this.$set(this.query,'clientName',null)
+                    this.findObject(this.option.column, "corpName").label = '业务来源'
+                }
+                this.$set(this.query,name,value)
+            }else if (name == 'corpName') {
+                for (let item of this.corpIdData) {
+                    if (item.cnName == value) {
+                        this.$set(this.query,'corpId',item.corpId)
+                        this.$set(this.query,'corpName',item.corpName)
+                    }
+                }
+            } else if (name == 'clientName') {
+                for (let item of this.clientIdData) {
+                    if (item.cnName == value) {
+                        this.$set(this.query,'clientId',item.corpId)
+                        this.$set(this.query,'clientName',item.corpName)
+                    }
+                }
+            }else if (name == 'srcType') {
+                if (value == 'OWN') {
+                    // 公司
+                    this.srcforParameter = { key:'id', label:'title', value:'title'}
+                    this.ownDeptLazyTreefun()
+                }else if (value == 'AGENT') {
+                    // 代理
+                    this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                    this.agentBcorpsListfun()
+                }else if (value == 'SALES') {
+                    // 业务员
+                    this.srcforParameter = { key:'id', label:'name', value:'name'}
+                    this.salesUserGetListfun()
+                }else {}
+                this.$set(this.query,name,value)
+            }else if (name == 'srcName') {
+                for (let item of this.srcIdData) {
+                    if (item[this.srcforParameter.value] == value) {
+                        if (this.query.srcType == 'SALES') {
+                            // 业务员
+                            this.$set(this.query,'srcId',item.id)
+                            this.$set(this.query,'srcName',item.name)
+                        }else if (this.form.srcType == 'AGENT') {
+                            // 代理
+                            this.$set(this.query,'srcId',item.id)
+                            this.$set(this.query,'srcName',item.cnName)
+                        }else {
+                            this.$set(this.query,'srcId',item.id)
+                            this.$set(this.query,'srcName',item.title)
+                        }
+                    }
+                }
+            }
+            this.$set(this.query,name,value)
+        },
+        // 业务员下拉
+        srcCorpFocus(value,name){
+            if (this.query.srcType == 'SALES') {
+                // 业务员
+                this.srcforParameter = { key:'id', label:'name', value:'name'}
+                this.salesUserGetListfun(value)
+            }else if (this.form.srcType == 'AGENT') {
+                // 代理
+                this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                this.agentBcorpsListfun(value)
+            }else if (this.form.srcType == 'OWN') {
+                // 公司
+                this.srcforParameter = { key:'id', label:'title', value:'title'}
+                this.ownDeptLazyTreefun()
+            }else {}
+        },
+        // 多选切换
+        dateChange(name) {
+            if (name == 'isBusinessDate') {
+                this.$set(this.query,'isToExamineDate',0)
+                this.$set(this.query,'isBusinessDate',1)
+            }
+            if (name == 'isToExamineDate') {
+                this.$set(this.query,'isBusinessDate',0)
+                this.$set(this.query,'isToExamineDate',1)
+            }
+        },
+        // 收付单选
+        dcInput(){
+            let dcName = ''
+            if (this.query.dc == 'D') {
+                dcName = '收'
+            }else {
+                dcName = '付'
+            }
+            this.findObject(this.option.column, "amountUsd").label = `应${dcName}美金`
+            this.findObject(this.option.column, "amount").label = `应${dcName}人民币`
+            this.findObject(this.option.column, "amountUsdAlready").label = `已${dcName}款美金`
+            this.findObject(this.option.column, "amountAlready").label = `已${dcName}款人民币`
+            this.findObject(this.option.column, "amountUsdNot").label = `未${dcName}款美金`
+            this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`
+        },
+        // 接口获取数据
+        // 结算单位
+        getBcorpsListfun(cnName){
+            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+                this.corpIdData = res.data.data.records
+            })
+        },
+        // 委托人
+        clientIdListfun(cnName){
+            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+                this.clientIdData = res.data.data.records
+            })
+        },
+        // 获取业务来源数据
+        srcTypeWorkDictsfun(){
+            getWorkDicts('src_type_los').then(res=>{
+                this.srcTypeData = res.data.data
+            })
+        },
+        // 获取公司名称 用户管理左侧
+        ownDeptLazyTreefun(){
+            getDeptLazyTree(0).then(res=>{
+                this.srcIdData = res.data.data
+            })
+        },
+        // 获取业务来源代理数据
+        agentBcorpsListfun(cnName){
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
+                this.srcIdData = res.data.data.records
+            })
+        },
+        // 获取业务来源业务员数据
+        salesUserGetListfun(account){
+            userGetList(1,10,{account}).then(res=>{
+                this.srcIdData = res.data.data.records
+            })
+        },
+        // 清空搜索回调方法
+        searchReset() {
+            this.query = {};
+            this.onLoad(this.page);
+        },
+        // 搜索
+        searchChange(params, done) {
+            this.query = params;
+            this.page.currentPage = 1;
+            this.onLoad(this.page, params);
+            done();
+        },
+        currentChange(currentPage){
+            this.page.currentPage = currentPage;
+        },
+        sizeChange(pageSize){
+            this.page.pageSize = pageSize;
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.query);
+        },
+        onLoad(page, params = {}) {
+            this.loading = true;
+            financeStatisticsFeeSummaryDetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+                const data = res.data.data;
+                this.page.total = data.total;
+                this.data = data.records;
+                this.loading = false;
+                this.selectionClear();
+            });
+        },
+        selectionClear() {
+            this.$refs.crud.toggleSelection();
+        },
+        //自定义列保存
+        async saveColumnTwo(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+             * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumnTwo(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        // 更改表格颜色
+        headerClassName(tab){
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+    }
+}
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+</style>

src/views/iosBasicData/paymentSummary/index.vue

@@ -0,0 +1,562 @@
+<template>
+    <basic-container>
+        <avue-crud :option="option"
+                   :table-loading="loading"
+                   :data="data"
+                   :page.sync="page"
+                   :search.sync="query"
+                   v-model="form"
+                   ref="crud"
+                   id="out-table"
+                   :header-cell-class-name="headerClassName"
+                   @search-change="searchChange"
+                   @search-reset="searchReset"
+                   @current-change="currentChange"
+                   @size-change="sizeChange"
+                   @refresh-change="refreshChange"
+                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 332)"
+                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 332)"
+                   @on-load="onLoad" >
+            <template slot="menuLeft">
+                <el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
+            </template>
+            <template slot-scope="{disabled,size}" slot="dcSearch">
+                <el-radio v-model="query.dc" label="D" @input="dcInput" >应收</el-radio>
+                <el-radio v-model="query.dc" label="C" @input="dcInput" >应付</el-radio>
+            </template>
+            <template slot-scope="{disabled,size}" slot="typeSearch">
+                <search-query :datalist="typeData"
+                              :selectValue="query.type"
+                              :buttonIf="false"
+                              @corpChange="corpChange($event,'type')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="businessTypeSearch">
+                <search-query :datalist="businessTypeData"
+                              :selectValue="query.businessType"
+                              :clearable="true"
+                              :buttonIf="false"
+                              @corpChange="corpChange($event,'businessType')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="clientIdSearch">
+                <search-query :datalist="clientIdData"
+                              :selectValue="query.clientName"
+                              :filterable="true"
+                              :remote="true"
+                              :clearable="true"
+                              :disabled="query.type != 2"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                              @remoteMethod="clientIdListfun"
+                              @corpFocus="clientIdListfun"
+                              @corpChange="corpChange($event,'clientName')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="corpIdSearch">
+                <search-query :datalist="corpIdData"
+                              :selectValue="query.corpName"
+                              :disabled="query.type != 1"
+                              :filterable="true"
+                              :remote="true"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                              @remoteMethod="getBcorpsListfun"
+                              @corpFocus="getBcorpsListfun"
+                              @corpChange="corpChange($event,'corpName')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="srcTypeSearch">
+                <search-query :datalist="srcTypeData"
+                              :selectValue="query.srcType"
+                              :disabled="query.type != 3"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                              @corpFocus="srcTypeWorkDictsfun"
+                              @corpChange="corpChange($event,'srcType')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="srcIdSearch">
+                <search-query :datalist="srcIdData"
+                              :selectValue="query.srcName"
+                              :disabled="query.type != 3"
+                              :filterable="true"
+                              :remote="true"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="srcforParameter"
+                              @remoteMethod="srcCorpFocus"
+                              @corpFocus="srcCorpFocus"
+                              @corpChange="corpChange($event,'srcName')">
+                </search-query>
+            </template>
+            <template slot-scope="{disabled,size}" slot="isBusinessDateSearch">
+                <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>
+
+<script>
+    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+    import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
+    import {financeStatisticsFeeSummary} from "@/api/iosBasicData/paymentSummary"
+    import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
+    import {getWorkDicts} from "@/api/system/dictbiz";
+    import {getDeptLazyTree} from "@/api/system/dept";
+    import {getList as userGetList} from '@/api/system/user'
+    import {getToken} from "@/util/auth";
+
+    export default {
+        components: {SearchQuery},
+        data(){
+            return {
+                form: {},
+                loading: true,
+                page: {
+                    pageSize: 10,
+                    currentPage: 1,
+                    total: 0
+                },
+                query: {
+                    dc:'D',
+                    isBusinessDate:1,
+                    type:'1',
+                    etdStart:defaultDate3()[0],
+                    etdEnd:defaultDate3()[1],
+                },
+                option:{},
+                optionBack:{
+                    height:'auto',
+                    calcHeight: 30,
+                    tip: false,
+                    searchShow: true,
+                    searchMenuSpan: 6,
+                    border: true,
+                    index: false,
+                    selection: true,
+                    dialogClickModal: false,
+                    menu:false,
+                    addBtn:false,
+                    viewBtn:false,
+                    delBtn:false,
+                    editBtn:false,
+                    column:[
+                        {
+                            label: "结算单位",
+                            prop: "corpName",
+                            overHidden:true,
+                        },
+                        {
+                            label: "应收美金",
+                            prop: "amountUsd",
+                            overHidden:true,
+                        },
+                        {
+                            label: "应收人民币",
+                            prop: "amount",
+                            overHidden:true,
+                        },
+                        {
+                            label: "已收款美金",
+                            prop: "amountUsdAlready",
+                            overHidden:true,
+                        },
+                        {
+                            label: "已收款人民币",
+                            prop: "amountAlready",
+                            overHidden:true,
+                        },
+                        {
+                            label: "未收款美金",
+                            prop: "amountUsdNot",
+                            overHidden:true,
+                        },
+                        {
+                            label: "未收款人民币",
+                            prop: "amountNot",
+                            overHidden:true,
+                        },
+
+                        {
+                            label: "查询方式",
+                            prop: "type",
+                            hide:true,
+                            search:true,
+                            type: 'select',
+                            searchslot:true,
+                        },
+                        {
+                            label: "业务类型",
+                            prop: "businessType",
+                            hide:true,
+                            search:true,
+                            searchslot:true,
+                        },
+                        {
+                            label: "委托人",
+                            prop: "clientId",
+                            hide:true,
+                            search:true,
+                            searchslot:true,
+                        },
+                        {
+                            label: "结算单位",
+                            prop: "corpId",
+                            hide:true,
+                            search:true,
+                            searchslot:true,
+                        },
+                        {
+                            label: "业务来源",
+                            prop: "srcType",
+                            hide:true,
+                            search:true,
+                            searchslot:true,
+                        },
+                        {
+                            label: "业务员",
+                            prop: "srcId",
+                            hide:true,
+                            search:true,
+                            searchslot:true,
+                        },
+                        {
+                            label: "开始日期",
+                            prop: "etdStart",
+                            search:true,
+                            overHidden:true,
+                            hide:true,
+                            type: "date",
+                            format: "yyyy-MM-dd",
+                            valueFormat: "yyyy-MM-dd",
+                        },
+                        {
+                            label: "结束日期",
+                            prop: "etdEnd",
+                            search:true,
+                            overHidden:true,
+                            hide:true,
+                            type: "date",
+                            format: "yyyy-MM-dd",
+                            valueFormat: "yyyy-MM-dd",
+                        },
+                        {
+                            label: "",
+                            prop: "dc",
+                            hide:true,
+                            search:true,
+                            searchslot:true,
+                            searchLabelWidth:'0'
+                        },
+                        {
+                            label: "",
+                            prop: "isBusinessDate",
+                            hide:true,
+                            search:true,
+                            searchslot:true,
+                            searchLabelWidth:'0'
+                        },
+                        {
+                            label: "",
+                            prop: "isToExamineDate",
+                            hide:true,
+                            searchLabelWidth:'0',
+                        },
+
+                    ]
+                },
+                data:[],
+                // 查询方式
+                typeData:[
+                    {
+                        label:'结算单位',
+                        value:'1'
+                    },{
+                        label:'委托人',
+                        value:'2'
+                    },{
+                        label:'业务来源',
+                        value:'3'
+                    }
+                ],
+                // 业务类型
+                businessTypeData:[
+                    {
+                        label:'海运出口',
+                        value:'HYCK'
+                    },{
+                        label:'海运进口',
+                        value:'HYJK'
+                    },{
+                        label:'空运出口',
+                        value:'KYCK'
+                    },{
+                        label:'空运进口',
+                        value:'KYJK'
+                    }
+                ],
+                clientIdData:[], // 委托人
+                corpIdData:[], // 结算单位
+                srcTypeData:[], // 业务来源
+                srcIdData:[], // 业务员
+                srcforParameter:{key:'id', label:'cnName', value:'cnName'},
+
+            }
+        },
+        async created() {
+            this.option = await this.getColumnData(this.getColumnName(332), this.optionBack);
+        },
+        methods:{
+            // 导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/financeStatistics/feeSummaryExport',//跳转目标窗口的地址
+                    query: {
+                        ...this.query
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
+            // 下拉监听
+            corpChange(value,name){
+                if (name == 'type') {
+                    if (value == 1) {
+                        this.$set(this.query,'clientId',null)
+                        this.$set(this.query,'clientName',null)
+                        this.$set(this.query,'srcType',null)
+                        this.$set(this.query,'srcId',null)
+                        this.$set(this.query,'srcName',null)
+                        this.findObject(this.option.column, "corpName").label = '结算单位'
+                    }else if (value == 2) {
+                        this.$set(this.query,'corpId',null)
+                        this.$set(this.query,'corpName',null)
+                        this.$set(this.query,'srcType',null)
+                        this.$set(this.query,'srcId',null)
+                        this.$set(this.query,'srcName',null)
+                        this.findObject(this.option.column, "corpName").label = '委托人'
+                    }else if (value == 3) {
+                        this.$set(this.query,'corpId',null)
+                        this.$set(this.query,'corpName',null)
+                        this.$set(this.query,'clientId',null)
+                        this.$set(this.query,'clientName',null)
+                        this.findObject(this.option.column, "corpName").label = '业务来源'
+                    }
+                    this.$set(this.query,name,value)
+                }else if (name == 'corpName') {
+                    for (let item of this.corpIdData) {
+                        if (item.cnName == value) {
+                            this.$set(this.query,'corpId',item.corpId)
+                            this.$set(this.query,'corpName',item.corpName)
+                        }
+                    }
+                } else if (name == 'clientName') {
+                    for (let item of this.clientIdData) {
+                        if (item.cnName == value) {
+                            this.$set(this.query,'clientId',item.corpId)
+                            this.$set(this.query,'clientName',item.corpName)
+                        }
+                    }
+                }else if (name == 'srcType') {
+                    if (value == 'OWN') {
+                        // 公司
+                        this.srcforParameter = { key:'id', label:'title', value:'title'}
+                        this.ownDeptLazyTreefun()
+                    }else if (value == 'AGENT') {
+                        // 代理
+                        this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                        this.agentBcorpsListfun()
+                    }else if (value == 'SALES') {
+                        // 业务员
+                        this.srcforParameter = { key:'id', label:'name', value:'name'}
+                        this.salesUserGetListfun()
+                    }else {}
+                    this.$set(this.query,name,value)
+                }else if (name == 'srcName') {
+                    for (let item of this.srcIdData) {
+                        if (item[this.srcforParameter.value] == value) {
+                            if (this.query.srcType == 'SALES') {
+                                // 业务员
+                                this.$set(this.query,'srcId',item.id)
+                                this.$set(this.query,'srcName',item.name)
+                            }else if (this.form.srcType == 'AGENT') {
+                                // 代理
+                                this.$set(this.query,'srcId',item.id)
+                                this.$set(this.query,'srcName',item.cnName)
+                            }else {
+                                this.$set(this.query,'srcId',item.id)
+                                this.$set(this.query,'srcName',item.title)
+                            }
+                        }
+                    }
+                }
+                this.$set(this.query,name,value)
+            },
+            // 业务员下拉
+            srcCorpFocus(value,name){
+                if (this.query.srcType == 'SALES') {
+                    // 业务员
+                    this.srcforParameter = { key:'id', label:'name', value:'name'}
+                    this.salesUserGetListfun(value)
+                }else if (this.form.srcType == 'AGENT') {
+                    // 代理
+                    this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                    this.agentBcorpsListfun(value)
+                }else if (this.form.srcType == 'OWN') {
+                    // 公司
+                    this.srcforParameter = { key:'id', label:'title', value:'title'}
+                    this.ownDeptLazyTreefun()
+                }else {}
+            },
+            // 多选切换
+            dateChange(name) {
+                if (name == 'isBusinessDate') {
+                    this.$set(this.query,'isToExamineDate',0)
+                    this.$set(this.query,'isBusinessDate',1)
+                }
+                if (name == 'isToExamineDate') {
+                    this.$set(this.query,'isBusinessDate',0)
+                    this.$set(this.query,'isToExamineDate',1)
+                }
+            },
+            // 收付单选
+            dcInput(){
+                let dcName = ''
+                if (this.query.dc == 'D') {
+                    dcName = '收'
+                }else {
+                    dcName = '付'
+                }
+                this.findObject(this.option.column, "amountUsd").label = `应${dcName}美金`
+                this.findObject(this.option.column, "amount").label = `应${dcName}人民币`
+                this.findObject(this.option.column, "amountUsdAlready").label = `已${dcName}款美金`
+                this.findObject(this.option.column, "amountAlready").label = `已${dcName}款人民币`
+                this.findObject(this.option.column, "amountUsdNot").label = `未${dcName}款美金`
+                this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`
+            },
+            // 接口获取数据
+            // 结算单位
+            getBcorpsListfun(cnName){
+                getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+                    this.corpIdData = res.data.data.records
+                })
+            },
+            // 委托人
+            clientIdListfun(cnName){
+                getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+                    this.clientIdData = res.data.data.records
+                })
+            },
+            // 获取业务来源数据
+            srcTypeWorkDictsfun(){
+                getWorkDicts('src_type_los').then(res=>{
+                    this.srcTypeData = res.data.data
+                })
+            },
+            // 获取公司名称 用户管理左侧
+            ownDeptLazyTreefun(){
+                getDeptLazyTree(0).then(res=>{
+                    this.srcIdData = res.data.data
+                })
+            },
+            // 获取业务来源代理数据
+            agentBcorpsListfun(cnName){
+                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+                getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
+                    this.srcIdData = res.data.data.records
+                })
+            },
+            // 获取业务来源业务员数据
+            salesUserGetListfun(account){
+                userGetList(1,10,{account}).then(res=>{
+                    this.srcIdData = res.data.data.records
+                })
+            },
+            // 清空搜索回调方法
+            searchReset() {
+                this.query = {};
+                this.onLoad(this.page);
+            },
+            // 搜索
+            searchChange(params, done) {
+                this.query = params;
+                this.page.currentPage = 1;
+                this.onLoad(this.page, params);
+                done();
+            },
+            currentChange(currentPage){
+                this.page.currentPage = currentPage;
+            },
+            sizeChange(pageSize){
+                this.page.pageSize = pageSize;
+            },
+            refreshChange() {
+                this.onLoad(this.page, this.query);
+            },
+            onLoad(page, params = {}) {
+                this.loading = true;
+                financeStatisticsFeeSummary(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+                    const data = res.data.data;
+                    this.page.total = data.total;
+                    this.data = data.records;
+                    this.loading = false;
+                    this.selectionClear();
+                });
+            },
+            selectionClear() {
+                this.$refs.crud.toggleSelection();
+            },
+            //自定义列保存
+            async saveColumnTwo(ref, option, optionBack, code) {
+                /**
+                 * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+                 * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+                 * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+                 */
+                const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+                if (inSave) {
+                    this.$message.success("保存成功");
+                    //关闭窗口
+                    this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                }
+            },
+            //自定义列重置
+            async resetColumnTwo(ref, option, optionBack, code) {
+                this[option] = this[optionBack];
+                const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+                if (inSave) {
+                    this.$message.success("重置成功");
+                    this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                }
+            },
+            // 更改表格颜色
+            headerClassName(tab){
+                //颜色间隔
+                let back = ""
+                if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                    if (tab.columnIndex % 2 === 0) {
+                        back = "back-one"
+                    } else if (tab.columnIndex % 2 === 1) {
+                        back = "back-two"
+                    }
+                }
+                return back;
+            },
+        }
+    }
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+</style>

src/views/iosBasicData/reportClose/AEreportClose/assembly/feecenter.vue

@@ -1138,7 +1138,7 @@
                     reportCode:this.reportformsObj.classifyCode,
                     groupCode:this.reportformsObj.groupCode,
                     corpIds:row.id,
-                    type:'HYCK'
+                    type:'BGAE'
                 }).then(res=>{
                     this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
                 })
@@ -1155,7 +1155,7 @@
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
-                    type:'HYCK'
+                    type:'BGAE'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                 })
@@ -1182,7 +1182,7 @@
                     }
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
-                            businessType:'HYCK',
+                            businessType:'BGAE',
                             classifyCode:'费用',
                             groupCode:groupCode
                         })
@@ -1193,13 +1193,13 @@
                     getFeeCenterCorpIds({
                         billId:this.assemblyForm.id,
                         dc:dc,
-                        type:'HYCK',
+                        type:'BGAE',
                     }).then(res=>{
                         this.printingLoading = false
                         this.PrintingData = res.data.data
                     })
                     this.reportsListfun({
-                        businessType:'HYCK',
+                        businessType:'BGAE',
                         classifyCode:'费用',
                         groupCode:groupCode
                     })

src/views/iosBasicData/reportClose/AIreportClose/assembly/feecenter.vue

@@ -1138,7 +1138,7 @@
                     reportCode:this.reportformsObj.classifyCode,
                     groupCode:this.reportformsObj.groupCode,
                     corpIds:row.id,
-                    type:'HYCK'
+                    type:'BGAI'
                 }).then(res=>{
                     this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
                 })
@@ -1155,7 +1155,7 @@
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
-                    type:'HYCK'
+                    type:'BGAI'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                 })
@@ -1182,7 +1182,7 @@
                     }
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
-                            businessType:'HYCK',
+                            businessType:'BGAI',
                             classifyCode:'费用',
                             groupCode:groupCode
                         })
@@ -1193,13 +1193,13 @@
                     getFeeCenterCorpIds({
                         billId:this.assemblyForm.id,
                         dc:dc,
-                        type:'HYCK',
+                        type:'BGAI',
                     }).then(res=>{
                         this.printingLoading = false
                         this.PrintingData = res.data.data
                     })
                     this.reportsListfun({
-                        businessType:'HYCK',
+                        businessType:'BGAI',
                         classifyCode:'费用',
                         groupCode:groupCode
                     })

src/views/iosBasicData/reportClose/SIreportClose/assembly/feecenter.vue

@@ -1138,7 +1138,7 @@
                     reportCode:this.reportformsObj.classifyCode,
                     groupCode:this.reportformsObj.groupCode,
                     corpIds:row.id,
-                    type:'HYCK'
+                    type:'BGSI'
                 }).then(res=>{
                     this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
                 })
@@ -1155,7 +1155,7 @@
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
-                    type:'HYCK'
+                    type:'BGSI'
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                 })
@@ -1182,7 +1182,7 @@
                     }
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
-                            businessType:'HYCK',
+                            businessType:'BGSI',
                             classifyCode:'费用',
                             groupCode:groupCode
                         })
@@ -1193,13 +1193,13 @@
                     getFeeCenterCorpIds({
                         billId:this.assemblyForm.id,
                         dc:dc,
-                        type:'HYCK',
+                        type:'BGSI',
                     }).then(res=>{
                         this.printingLoading = false
                         this.PrintingData = res.data.data
                     })
                     this.reportsListfun({
-                        businessType:'HYCK',
+                        businessType:'BGSI',
                         classifyCode:'费用',
                         groupCode:groupCode
                     })

src/views/system/dept.vue

@@ -335,7 +335,7 @@
           //     })
           // }
           // 判断是否显示装货港
-          if (content == 409341) {
+          if (localStorage.getItem('sysitemType') == 12) {
               this.$nextTick(()=>{
                   this.findObject(this.option.column, "polCnName").hide = false
                   this.findObject(this.option.column, "polCnName").addDisplay = true

vue.config.js

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