货代bug和报表 2023-12-22

src/views/approveDataH/index.vue

@@ -37,7 +37,7 @@
 <!--        </el-button>-->
         <el-button type="text" size="small" :disabled="scope.row.operate" @click.stop="jumpPage(scope.row)">查看
         </el-button>
-          <el-button type="text" size="small" v-if="scope.row.checkType == 'HYCK-DJ'" :disabled="scope.row.auditStatus != 'S'" @click.stop="handleReportPreview(scope.row.url,scope.row)">
+          <el-button type="text" size="small" v-if="scope.row.checkType == 'HYCK-DJ'" :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row)">
               审批
           </el-button>
           <el-button type="text" size="small" v-else :disabled="scope.row.auditStatus != 'S'" @click.stop="openCheck(scope.row)">
@@ -64,6 +64,21 @@
                @choceCheckFun="choceCheckFun">
         </check>
     </reportContainerlos>
+
+      <el-dialog
+          title="打印"
+          :visible.sync="selectPrintingDialog"
+          append-to-body
+          width="70%"
+          :before-close="handleClose">
+          <div>
+              <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
+          </div>
+          <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
+            </span>
+      </el-dialog>
+
   </basic-container>
 </template>
 
@@ -82,17 +97,21 @@ import {corpsDescListAll} from "../../api/tirePartsMall/salesManagement/saleOrde
 import reportContainerlos from "@/views/iosBasicData/report-container/report-container-los.vue"
 import {finstlbillsDetail} from "../../api/iosBasicData/finstlbills";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
+import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 
 let previousRouterName = "";
 let checkRefresh = "";
 export default {
   components: {
+      reportformsList,
     check,
     checkSchedule,
       reportContainerlos
   },
   data() {
     return {
+        selectPrintingDialog:false, // 打印弹窗
+        reportsData:{}, // 当前要审核数据
         reportlist:[], // 报表数据
       corpsList: [],
       loading: false,
@@ -171,21 +190,45 @@ export default {
     }
   },
   methods: {
+      // 点击审核弹出打印表格
+      printWindowfun(row){
+          // 当时选择的数据
+          this.reportsData = row
+          this.selectPrintingDialog = true
+          let page = {
+              pageSize: 10,
+              currentPage: 1,
+              total: 0
+          }
+          this.$nextTick(()=>{
+              this.$refs.reportformsList.onLoad(page,{
+                  businessType:'HYCK',
+                  classifyCode:'业务',
+                  groupCode:'销售报告'
+              })
+          })
+      },
+
+      reportRadio(val){
+          reportsGetReportData({
+              billId:this.reportsData.billId,
+              reportCode:val.classifyCode,
+              groupCode:val.cnName,
+          }).then(res=>{
+              this.handleReportPreview(val.url,res.data.data.data)
+          })
+      },
+      // 关闭弹窗
+      handleClose(done) {
+          this.$confirm('确认关闭？')
+              .then(_ => {
+                  done();
+              })
+              .catch(_ => {});
+      },
     // 预览报表
-    async handleReportPreview(url,row){
-        this.checkData = row
-        const res = await reportsGetReportData({
-            billId:row.billId,
-            reportCode:'FYSH',
-            groupCode:2,
-        })
-        var data = res.data.data.data.map((item,index)=>{
-            item.index = index
-            item.feeCenterList.forEach(ite=>{
-                ite.ppid = index
-            })
-            return item
-        })
+     handleReportPreview(url,data){
+        this.checkData = data
         this.reportlist = data // 存一下数据 打印的时候需要传
         console.log(data,220)
         // 报表取的是最后一项，把第一项的数据赋值给最后一项
@@ -199,7 +242,6 @@ export default {
         data[data.length - 1].rate = data[0].rate
         data[data.length - 1].grossMargin = data[0].grossMargin
 
-        console.log(row,203)
       Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
       // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='
       Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile( '/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')
@@ -231,7 +273,7 @@ export default {
       console.log("从url加载报表");
       // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
       // report.load(row.url)
-        report.load(res.data.data.url)
+        report.load(url)
 
       // 加载数据
         var dataSet = new Stimulsoft.System.Data.DataSet(

src/views/billM/billingCenter/index.vue

@@ -85,6 +85,7 @@
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/iosBasicData/finaccbills";
   import {mapGetters} from "vuex";
+  import {BcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
 
   export default {
     data() {
@@ -271,22 +272,34 @@
               prop: "corpCnName",
               search: true,
               width:"180",
-              rules: [{
-                required: true,
-                message: "请输入客户中文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
+              type:'select',
+              remote:true,
+              dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+              props: {
+                  label: 'cnName',
+                  value: 'cnName',
+              },
+              dicFormatter: (res => {
+                  return res.data.records
+              }),
             },
             {
               label: "客户中文名称",
               prop: "billCorpCnName",
               search: true,
               width:"180",
-              rules: [{
-                required: true,
-                message: "请输入主表客户中文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
+              type:'select',
+              remote:true,
+              dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+              props: {
+                  label: 'cnName',
+                  value: 'cnName',
+              },
+              dicFormatter: (res => {
+                  return res.data.records
+              }),
             },
             {
               label: "MB/L NO",

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

@@ -97,7 +97,8 @@
                 label="本次结算币种"
                 prop="currentStlCurCode" width="130px">
                 <template slot-scope="{row}">
-                    <search-query :datalist="curCodeData"
+                    <search-query v-if="brfalse"
+                                  :datalist="curCodeData"
                                   :selectValue="row.currentStlCurCode"
                                   :filterable="true"
                                   :clearable="true"
@@ -108,6 +109,7 @@
                                   @corpChange="corpChange($event,row)"
                                   @corpFocus="getRateListfun">
                     </search-query>
+                    <span v-else >{{row.currentStlCurCode}}</span>
                 </template>
             </el-table-column>
             <el-table-column label="本次结算金额(含税)">
@@ -302,6 +304,10 @@
                 type:Array,
                 default:[],
             },
+            editSave:{
+                type:Boolean,
+                default:false
+            }
         },
         data(){
             return {

src/views/iosBasicData/CollectionSettlement/finstlbillsDetails.vue

@@ -105,6 +105,7 @@
                                                   :clearable="true"
                                                   :disabled="editSave"
                                                   :buttonIf="false"
+                                                  :multiple="true"
                                                   @corpChange="corpChange($event,'businessTypes')">
                                     </search-query>
                                 </el-form-item>
@@ -401,6 +402,7 @@
                     <el-tab-pane label="核销明细" name="first">
                         <finstlbillsitems :tableData="tableData"
                                           :handleSelectionData="handleSelectionData"
+                                          :brfalse="!editSave"
                                           @handleSelectionChange="handleSelectionChange">
                         </finstlbillsitems>
                     </el-tab-pane>
@@ -547,6 +549,7 @@
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'STL' // 结算单
                 this.form.dc = 'D' // 收
+                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
 
                 if (!this.form.id) {
                     this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
@@ -583,6 +586,7 @@
                 this.pageLoading = true
                 finstlbillsDetail(id).then(res=>{
                     this.form = res.data.data
+                    this.form.businessTypes = this.form.businessTypes.split(',') // 业务类型转换成数组显示
                     this.tableData = this.form.finStlBillsItemsList.map(item=>{
                         item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
                         item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
@@ -636,14 +640,13 @@
                 obj.dc = 'D' // 收
                 obj.corpCnName = this.form.corpId // 结算单位
                 obj.curCode = this.form.curCode // 币别
-                // obj.dc = this.form.dc // 收付 D=收 C=付
                 obj.accBillNo = this.form.accountNo // 账单编号  ACCT NO
                 obj.billNo = this.form.businessNo // 单据编号  JOB NO
                 obj.checkBillNo = this.form.checkNo // CHK NO
                 obj.mblno = this.form.mblno // MB/L NO
                 obj.hblno = this.form.hblno // HB/L NO
                 obj.queryAmount = this.form.queryAmount // 查询金额
-                obj.businessType = this.form.businessTypes // 业务类型
+                obj.businessType = this.form.businessTypes.join(',') // 业务类型
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.voyageNo = this.form.voyageNo // 航次
@@ -684,6 +687,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     finstlbillsConfirmSettlement(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -701,6 +705,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     finstlbillsRevokeSettlement(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');

src/views/iosBasicData/CollectionSettlement/index.vue

@@ -50,26 +50,6 @@
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
-              <template slot-scope="scope" slot="billNo">
-                  <avue-text-ellipsis :text="scope.row.billNo" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpCnName">
-                  <avue-text-ellipsis :text="scope.row.corpCnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpEnName">
-                  <avue-text-ellipsis :text="scope.row.corpEnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpArgreementNo">
-                  <avue-text-ellipsis :text="scope.row.corpArgreementNo" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
 
           </avue-crud>
       </basic-container>
@@ -121,27 +101,38 @@
             {
               label: "业务类型",
               prop: "businessType",
+              overHidden:true,
+            },
+            {
+                label: "MB/L NO",
+                prop: "mblno",
+                search:true,
+                overHidden:true,
             },
             {
               label: "单据编号",
               prop: "billNo",
-                search:true,
+              search:true,
+              overHidden:true,
             },
             {
               label: "对账/结算日期",
               prop: "billDate",
               width:"150",
+              overHidden:true,
             },
             {
               label: "客户名称",
               prop: "corpCnName",
-                search:true,
+              search:true,
               width:"120",
+              overHidden:true,
             },
             {
               label: "客户英文名称",
               prop: "corpEnName",
               width:"120",
+              overHidden:true,
             },
             {
               label: "客户是否已签约",
@@ -156,87 +147,168 @@
             {
               label: "客户约号",
               prop: "corpArgreementNo",
+              overHidden:true,
             },
             {
               label: "客户账期备注",
               prop: "corpAccRemarks",
               width:"120",
+              overHidden:true,
             },
             {
               label: "业务类型",
               prop: "businessTypes",
               width:"120",
+              overHidden:true,
+              type:'select',
+              multiple:true,
+              dicData:[
+                  {
+                      label:'海运出口',
+                      value:'SE'
+                  },{
+                      label:'海运进口',
+                      value:'SI'
+                  }
+              ],
+            },
+            {
+                label: "本位币应收(CNY)",
+                prop: "amountDr",
+                width: "160"
+            },
+            {
+                label: "本位币应付(CNY)",
+                prop: "amountCr",
+                width: "160"
+            },
+            // {
+            //   label: "综合 USD 应收(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountDrUsd",
+            //     width: "160"
+            // },
+            // {
+            //   label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountCrUsd",
+            //     width: "160"
+            // },
+            {
+                label: "合计本位币应收(CNY )",
+                prop: "amountDrLoc",
+                width: "160"
+            },
+            {
+                label: "合计本位币应付(CNY)",
+                prop: "amountCrLoc",
+                width: "160"
+            },
+            {
+                label: "本位币税后应收(CNY)",
+                prop: "amountDrNet",
+                width: "160"
+            },
+            {
+                label: "本位币税后应付(CNY)",
+                prop: "amountCrNet",
+                width: "160"
+            },
+            // {
+            //   label: "综合 USD 税后应收(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountDrUsdNet",
+            //     width: "160"
+            // },
+            // {
+            //   label: "综合 USD 税后应付(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountCrUsdNet",
+            //     width: "160"
+            // },
+            {
+                label: "合计本位币税后应收(CNY)",
+                prop: "amountDrLocNet",
+                width: "170"
+            },
+            {
+                label: "合计本位币税后应付(CNY)",
+                prop: "amountCrLocNet",
+                width: "170"
             },
             {
               label: "业务单据编号",
               prop: "businessNo",
               width:"120",
+              overHidden:true,
             },
             {
               label: "账单编号",
               prop: "accountNo",
               width:"100",
+              overHidden:true,
             },
             {
               label: "对账单编号",
               prop: "checkNo",
               width:"100",
+              overHidden:true,
             },
             {
               label: "业务所在部门",
               prop: "deptName",
               width:"120",
+              overHidden:true,
             },
             {
               label: "业务操作",
               prop: "operatorName",
               width:"100",
+              overHidden:true,
             },
             {
               label: "业务员",
               prop: "salesName",
+              overHidden:true,
             },
             {
               label: "费用收付",
               prop: "dc",
-                // search:true,
-                type: 'select',
-                dicData:[
-                    {
-                        label:'Debit',
-                        value: 'D'
-                    },{
-                        label:'Credit',
-                        value: 'C'
-                    }
-                ]
+              // search:true,
+              type: 'select',
+              dicData:[
+                  {
+                      label:'Debit',
+                      value: 'D'
+                  },{
+                      label:'Credit',
+                      value: 'C'
+                  }
+              ],
+              overHidden:true,
             },
             {
               label: "币种",
               prop: "curCode",
-                search:true,
-                type: 'select',
-                dicData:[],
-                props: {
-                    label: "code",
-                    value: "id"
-                },
+              search:true,
+              type: 'select',
+              dicData:[],
+              props: {
+                  label: "code",
+                  value: "id"
+              },
+              overHidden:true,
             },
             {
               label: "中文船名",
               prop: "vesselCnName",
+              overHidden:true,
             },
             {
               label: "英文船名",
               prop: "vesselEnName",
+              overHidden:true,
             },
             {
               label: "航次",
               prop: "voyageNo",
-            },
-            {
-              label: "MB/L NO",
-              prop: "mblno",
+              overHidden:true,
             },
             {
               label: "HB/L NO",
@@ -355,66 +427,6 @@
               prop: "voucherDate",
             },
             {
-              label: "本位币应收(CNY)",
-              prop: "amountDr",
-                width: "160"
-            },
-            {
-              label: "本位币应付(CNY)",
-              prop: "amountCr",
-                width: "160"
-            },
-            {
-              label: "综合 USD 应收(USD) - 非 USD 外币转换为 USD",
-              prop: "amountDrUsd",
-                width: "160"
-            },
-            {
-              label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
-              prop: "amountCrUsd",
-                width: "160"
-            },
-            {
-              label: "合计本位币应收(CNY )",
-              prop: "amountDrLoc",
-                width: "160"
-            },
-            {
-              label: "合计本位币应付(CNY)",
-              prop: "amountCrLoc",
-                width: "160"
-            },
-            {
-              label: "本位币税后应收(CNY)",
-              prop: "amountDrNet",
-                width: "160"
-            },
-            {
-              label: "本位币税后应付(CNY)",
-              prop: "amountCrNet",
-                width: "160"
-            },
-            {
-              label: "综合 USD 税后应收(USD) - 非 USD 外币转换为 USD",
-              prop: "amountDrUsdNet",
-                width: "160"
-            },
-            {
-              label: "综合 USD 税后应付(USD) - 非 USD 外币转换为 USD",
-              prop: "amountCrUsdNet",
-                width: "160"
-            },
-            {
-              label: "合计本位币税后应收(CNY )",
-              prop: "amountDrLocNet",
-                width: "160"
-            },
-            {
-              label: "合计本位币税后应付(CNY)",
-              prop: "amountCrLocNet",
-                width: "160"
-            },
-            {
               label: "备注",
               prop: "remarks",
             },

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -105,6 +105,7 @@
                                                   :clearable="true"
                                                   :disabled="editSave"
                                                   :buttonIf="false"
+                                                  :multiple="true"
                                                   @corpChange="corpChange($event,'businessTypes')">
                                     </search-query>
                                 </el-form-item>
@@ -545,6 +546,7 @@
                 this.form.businessTypeCode = 'FFSQ'
                 this.form.businessType = 'FFSQ' // 结算单
                 this.form.dc = 'C' // 付
+                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                 if (!this.form.id) {
                     this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
                         item.lineNo = index
@@ -582,6 +584,7 @@
                 this.pageLoading = true
                 finstlbillsDetail(id).then(res=>{
                     this.form = res.data.data
+                    this.form.businessTypes = this.form.businessTypes.split(',') // 业务类型转换成数组显示
                     this.tableData = this.form.finStlBillsItemsList.map(item=>{
                         item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
                         item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
@@ -641,7 +644,7 @@
                 obj.mblno = this.form.mblno // MB/L NO
                 obj.hblno = this.form.hblno // HB/L NO
                 obj.queryAmount = this.form.queryAmount // 查询金额
-                obj.businessType = this.form.businessTypes // 业务类型
+                obj.businessType = this.form.businessTypes.join(',') // 业务类型
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.voyageNo = this.form.voyageNo // 航次
@@ -687,6 +690,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     settlementApprove(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -704,6 +708,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     revokeSettlementApprove(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');

src/views/iosBasicData/PaymentApplication/index.vue

@@ -50,26 +50,6 @@
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
-              <template slot-scope="scope" slot="billNo">
-                  <avue-text-ellipsis :text="scope.row.billNo" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpCnName">
-                  <avue-text-ellipsis :text="scope.row.corpCnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpEnName">
-                  <avue-text-ellipsis :text="scope.row.corpEnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpArgreementNo">
-                  <avue-text-ellipsis :text="scope.row.corpArgreementNo" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
 
           </avue-crud>
       </basic-container>
@@ -123,168 +103,210 @@
               prop: "businessType",
             },
             {
+                label: "MB/L NO",
+                prop: "mblno",
+                search:true,
+                overHidden:true
+            },
+            {
               label: "单据编号",
               prop: "billNo",
-                search:true,
+              search:true,
+              overHidden:true
             },
             {
               label: "对账/结算日期",
               prop: "billDate",
               width:"150",
+              overHidden:true
             },
             {
               label: "客户名称",
               prop: "corpCnName",
-                search:true,
+              search:true,
               width:"120",
+              overHidden:true
             },
             {
               label: "客户英文名称",
               prop: "corpEnName",
               width:"120",
+              overHidden:true
             },
             {
               label: "客户是否已签约",
               prop: "corpIsSigned",
               width:"120",
-                dicData:[],
-                props: {
-                    label: "dictValue",
-                    value: "dictKey"
-                },
+              dicData:[],
+              props: {
+                  label: "dictValue",
+                  value: "dictKey"
+              },
+              overHidden:true
             },
             {
               label: "客户约号",
               prop: "corpArgreementNo",
+              overHidden:true
             },
             {
               label: "客户账期备注",
               prop: "corpAccRemarks",
               width:"120",
+              overHidden:true
             },
             {
               label: "业务类型",
               prop: "businessTypes",
               width:"120",
+              overHidden:true,
+              type:'select',
+              multiple:true,
+              dicData:[
+                  {
+                      label:'海运出口',
+                      value:'SE'
+                  },{
+                      label:'海运进口',
+                      value:'SI'
+                  }
+              ],
             },
             {
               label: "业务单据编号",
               prop: "businessNo",
               width:"120",
+              overHidden:true
             },
             {
               label: "账单编号",
               prop: "accountNo",
               width:"100",
+              overHidden:true
             },
             {
               label: "对账单编号",
               prop: "checkNo",
               width:"100",
+              overHidden:true
             },
             {
               label: "业务所在部门",
               prop: "deptName",
               width:"120",
+              overHidden:true
             },
             {
               label: "业务操作",
               prop: "operatorName",
               width:"100",
+              overHidden:true
             },
             {
               label: "业务员",
               prop: "salesName",
+              overHidden:true
             },
             {
               label: "费用收付",
               prop: "dc",
-                // search:true,
-                type: 'select',
-                dicData:[
-                    {
-                        label:'Debit',
-                        value: 'D'
-                    },{
-                        label:'Credit',
-                        value: 'C'
-                    }
-                ]
+              // search:true,
+              type: 'select',
+              dicData:[
+                  {
+                      label:'Debit',
+                      value: 'D'
+                  },{
+                      label:'Credit',
+                      value: 'C'
+                  }
+              ],
+              overHidden:true
             },
             {
               label: "币种",
               prop: "curCode",
-                search:true,
-                type: 'select',
-                dicData:[],
-                props: {
-                    label: "code",
-                    value: "id"
-                },
+              search:true,
+              type: 'select',
+              dicData:[],
+              props: {
+                  label: "code",
+                  value: "id"
+              },
+              overHidden:true
             },
             {
               label: "中文船名",
               prop: "vesselCnName",
+              overHidden:true
             },
             {
               label: "英文船名",
               prop: "vesselEnName",
+              overHidden:true
             },
             {
               label: "航次",
               prop: "voyageNo",
-            },
-            {
-              label: "MB/L NO",
-              prop: "mblno",
+              overHidden:true
             },
             {
               label: "HB/L NO",
               prop: "hblno",
+              overHidden:true
             },
             {
               label: "财务开始日期",
               prop: "accountDateFrom",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "财务结束日期",
               prop: "accountDateTo",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "审核开始日期",
               prop: "auditDateFrom",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "审核结束日期",
               prop: "auditDateTo",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "发票号",
               prop: "invoiceNo",
+              overHidden:true
             },
             {
               label: "检验检疫 NO",
               prop: "iqNo",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "费用中文名称",
               prop: "feeCode",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "费用中文名称",
               prop: "feeCnName",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "费用英文名称",
               prop: "feeEnName",
-                width: "140"
+              width: "140",
+              overHidden:true
             },
             {
               label: "是否审核",

src/views/iosBasicData/PaymentSettlement/finstlbillsDetails.vue

@@ -75,7 +75,7 @@
                             </el-col>
                             <el-col :span="4">
                                 <el-form-item label="申请单号" prop="billNo">
-                                    <el-input style="width: 100%;" v-model="form.billNo"
+                                    <el-input style="width: 100%;" v-model="form.requestNo"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
                                               clearable placeholder="请输入单号" >
@@ -114,6 +114,7 @@
                                                   :clearable="true"
                                                   :disabled="editSave"
                                                   :buttonIf="false"
+                                                  :multiple="true"
                                                   @corpChange="corpChange($event,'businessTypes')">
                                     </search-query>
                                 </el-form-item>
@@ -536,7 +537,7 @@
                     this.$message.warning('请选择结算单位');
                     return
                 }
-                // 业务类型
+                // // 业务类型
                 if (!this.form.businessTypes) {
                     this.$message.warning('请选择业务类型');
                     return
@@ -553,6 +554,7 @@
                 this.form.businessTypeCode = 'HYFF'
                 this.form.businessType = 'STL' // 结算单
                 this.form.dc = 'C' // 付
+                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
 
                 if (this.whetherAuditing == '0') {
                     for (let item of this.handleSelectionData) {
@@ -603,6 +605,24 @@
                     this.tableData = res.data.data.finStlBillsItemsList.map(item=>{
                         item.id = ''
                         item.pid = ''
+                        item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
+                        if(item.curCode == 'CNY') {
+                            this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
+                            this.$set(item,'amountRMB',item.amount)
+                            this.$set(item,'amountNetRMB',item.amountNet)
+                            this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
+                            this.$set(item,'stlTtlAmountNetRMB',item.stlTtlAmountNet)
+                            this.$set(item,'currentStlAmountRMB',item.unsettledAmount) // 未结算金额
+                            this.$set(item,'currentStlAmountNetRMB',item.currentStlAmountNet)
+                        }else {
+                            this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
+                            this.$set(item,'amountUSD',item.amount)
+                            this.$set(item,'amountNetUSD',item.amountNet)
+                            this.$set(item,'stlTtlAmountNetUSD',item.stlTtlAmountNet)
+                            this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
+                            this.$set(item,'currentStlAmountUSD',item.unsettledAmount) // 未结算金额
+                            this.$set(item,'currentStlAmountNetUSD',item.currentStlAmountNet)
+                        }
                         return item
                     })
                 })
@@ -619,6 +639,7 @@
                 this.pageLoading = true
                 finstlbillsDetail(id).then(res=>{
                     this.form = res.data.data
+                    this.form.businessTypes = this.form.businessTypes.split(',') // 业务类型转换成数组显示
                     this.tableData = this.form.finStlBillsItemsList.map(item=>{
                         item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
                         item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
@@ -660,16 +681,16 @@
                     return
                 }
                 if (this.whetherAuditing == '1') {
-                    if (!this.form.billNo) {
+                    if (!this.form.requestNo) {
                         this.$message.warning('请输入申请单号');
                         return;
                     }
                 }
                 // 业务类型
-                // if (!this.form.businessTypes) {
-                //     this.$message.warning('请选择业务类型');
-                //     return
-                // }
+                if (!this.form.businessTypes) {
+                    this.$message.warning('请选择业务类型');
+                    return
+                }
                 delete this.form.id
                 // let obj = JSON.parse(JSON.stringify(this.form))
                 let obj = {}
@@ -677,19 +698,19 @@
                 obj.dc = 'C' // 付
                 obj.corpCnName = this.form.corpId // 结算单位
                 obj.curCode = this.form.curCode // 币别
-                // obj.dc = this.form.dc // 收付 D=收 C=付
                 obj.accBillNo = this.form.accountNo // 账单编号  ACCT NO
                 obj.billNo = this.form.businessNo // 单据编号  JOB NO
                 obj.checkBillNo = this.form.checkNo // CHK NO
                 obj.mblno = this.form.mblno // MB/L NO
                 obj.hblno = this.form.hblno // HB/L NO
                 obj.queryAmount = this.form.queryAmount // 查询金额
-                obj.businessType = this.form.businessTypes // 业务类型
+                obj.businessType = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.voyageNo = this.form.voyageNo // 航次
                 obj.signforDateList = this.form.signforDateList // 签收日期
-                obj.billNo = this.form.billNo // 申请单号
+                obj.billNo = this.form.requestNo // 申请单号
+
                 // 审核期间
                 if (this.form.approvedDate) {
                     obj.approveTimeList = this.form.approvedDate
@@ -703,6 +724,7 @@
                     this.approveDetailfun(obj.billNo)
                 }else {
                     finstlbillslistAccBillV1(obj).then(res=>{
+                        console.log(res.data.data,709)
                         this.tableData = res.data.data.map(item=>{
                             item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
                             if(item.curCode == 'CNY') {
@@ -729,12 +751,13 @@
             },
             // 结算确认
             finstlbillsConfirmSettlementfun(){
-                this.$confirm("确定进行对账操作?", {
+                this.$confirm("确定进行结算操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     finstlbillsConfirmSettlement(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -746,12 +769,13 @@
             },
             // 结算撤销
             finstlbillsRevokeSettlementfun(){
-                this.$confirm("确定进行撤销对账操作?", {
+                this.$confirm("确定进行撤销结算操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     finstlbillsRevokeSettlement(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');

src/views/iosBasicData/PaymentSettlement/index.vue

@@ -50,26 +50,6 @@
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
-              <template slot-scope="scope" slot="billNo">
-                  <avue-text-ellipsis :text="scope.row.billNo" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpCnName">
-                  <avue-text-ellipsis :text="scope.row.corpCnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpEnName">
-                  <avue-text-ellipsis :text="scope.row.corpEnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpArgreementNo">
-                  <avue-text-ellipsis :text="scope.row.corpArgreementNo" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
 
           </avue-crud>
       </basic-container>
@@ -126,22 +106,26 @@
               label: "单据编号",
               prop: "billNo",
                 search:true,
+                overHidden:true
             },
             {
               label: "对账/结算日期",
               prop: "billDate",
               width:"150",
+                overHidden:true
             },
             {
               label: "客户名称",
               prop: "corpCnName",
                 search:true,
               width:"120",
+                overHidden:true
             },
             {
               label: "客户英文名称",
               prop: "corpEnName",
               width:"120",
+                overHidden:true
             },
             {
               label: "客户是否已签约",
@@ -152,49 +136,59 @@
                     label: "dictValue",
                     value: "dictKey"
                 },
+                overHidden:true
             },
             {
               label: "客户约号",
               prop: "corpArgreementNo",
+                overHidden:true
             },
             {
               label: "客户账期备注",
               prop: "corpAccRemarks",
               width:"120",
+                overHidden:true
             },
             {
               label: "业务类型",
               prop: "businessTypes",
               width:"120",
+                overHidden:true
             },
             {
               label: "业务单据编号",
               prop: "businessNo",
               width:"120",
+                overHidden:true
             },
             {
               label: "账单编号",
               prop: "accountNo",
               width:"100",
+                overHidden:true
             },
             {
               label: "对账单编号",
               prop: "checkNo",
               width:"100",
+                overHidden:true
             },
             {
               label: "业务所在部门",
               prop: "deptName",
               width:"120",
+                overHidden:true
             },
             {
               label: "业务操作",
               prop: "operatorName",
               width:"100",
+                overHidden:true
             },
             {
               label: "业务员",
               prop: "salesName",
+                overHidden:true
             },
             {
               label: "费用收付",
@@ -209,7 +203,8 @@
                         label:'Credit',
                         value: 'C'
                     }
-                ]
+                ],
+                overHidden:true
             },
             {
               label: "币种",

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

@@ -175,23 +175,11 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
                 }
                 reportsGetReportData({
                     billId:this.assemblyForm.id,
-                    reportCode:this.businesstypeData.code,
+                    reportCode:this.businesstypeData.classifyCode,
                     groupCode:this.businesstypeData.cnName,
                 }).then(res=>{
-                    console.log(this.businesstypeData,181)
-                    // 字段过长报错 只把可用的字段摘出来
-                    // if (this.businesstypeData.code == 'RHTZ') {
-                    //     this.documentForm.quantity = res.data.data.data.quantity
-                    //     this.documentForm.grossWeight = res.data.data.data.grossWeight
-                    //     this.documentForm.measurement = res.data.data.data.measurement
-                    //     this.documentForm.quantityCntrTypesDescr = res.data.data.data.quantityCntrTypesDescr
-                    //     this.documentForm.destinationName = res.data.data.data.destinationName
-                    //     this.documentForm.vesselCnName = res.data.data.data.vesselCnName
-                    //     this.documentForm.etd = res.data.data.data.etd
-                    //     this.documentForm.mblno = res.data.data.data.mblno
-                    // }
                     this.documentForm = res.data.data.data
-                    this.documenturl = res.data.data.url;
+                    this.documenturl = this.businesstypeData.url;
                     // 打开报表选择框
                     this.documentVisible = true
                 })

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

@@ -499,25 +499,48 @@
             title="打印"
             :visible.sync="printingDialog"
             append-to-body
-            width="60%"
+            width="70%"
             :before-close="handleClose">
             <div>
-                <avue-crud :option="optionPrinting"
-                           :table-loading="printingLoading"
-                           :data="PrintingData"
-                           id="out-table"
-                           :header-cell-class-name="headerClassName"
-                           :row-style="{height:'20px'}"
-                           :cell-style="{padding:'0px'}">
-                    <template slot-scope="scope" slot="menu">
-                        <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
-                    </template>
-                </avue-crud>
+                <el-row :gutter="10">
+                    <el-col :span="4">
+                        <avue-tree :option="reportOption" :data="reportTypeData" @node-click="reportNodeClick"></avue-tree>
+                    </el-col>
+                    <el-col :span="20">
+                        <avue-crud :option="optionPrinting"
+                                   :table-loading="printingLoading"
+                                   :data="PrintingData"
+                                   id="out-table"
+                                   :header-cell-class-name="headerClassName"
+                                   :row-style="{height:'20px'}"
+                                   :cell-style="{padding:'0px'}">
+                            <template slot-scope="scope" slot="menu">
+                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                            </template>
+                        </avue-crud>
+                    </el-col>
+                </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button size="small" @click="printingDialog = false;">取 消</el-button>
             </span>
         </el-dialog>
+
+        <el-dialog
+            title="打印"
+            :visible.sync="selectPrintingDialog"
+            append-to-body
+            width="70%"
+            :before-close="handleClose">
+            <div>
+                <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
+            </span>
+        </el-dialog>
+
+
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -543,9 +566,11 @@
     import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
     import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
+    import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
+    import {getList as reportsList} from "@/api/iosBasicData/reports";
 
     export default {
-        components: {reportContainer, SearchQuery},
+        components: {reportContainer, SearchQuery,reportformsList},
         props:{
             pid:{
 
@@ -557,6 +582,22 @@
         },
         data(){
             return {
+                reportOption: {
+                    nodeKey: "id",
+                    addBtn: false,
+                    menu: false,
+                    size: "small",
+                    props: {
+                        labelText: "标题",
+                        label: "cnName",
+                        value: "value",
+                        children: "children"
+                    }
+                },
+                reportTypeData:[], // 打印选择的数据
+                reportformsObj:{}, // 打印选择的数据
+                selectPrintingDialog:false, // 打印弹窗
+
                 printingDialog:false, // 打印弹窗开关
                 printingDC:'', // 打印弹窗选择是应收还是应付
                 PrintingData:[], // 打印弹窗列表数据
@@ -992,50 +1033,61 @@
         methods:{
             // 费用弹窗里的打印
             dialogPreviewfun(row){
-                let reportCode = ''
-                let groupCode = ''
-                if (this.printingDC == 'D') {
-                    reportCode = 'FYYS'
-                    groupCode = '应收'
-                }else {
-                    reportCode = 'FYYF'
-                    groupCode = '应付'
+                console.log(row,1036)
+                if (!this.reportformsObj.id){
+                    this.$message.warning('请选择打印类型')
+                    return;
                 }
                 // 获取报表数据
                 reportsGetReportData({
                     billId:this.assemblyForm.id,
-                    reportCode:reportCode,
-                    groupCode:groupCode,
+                    reportCode:this.reportformsObj.classifyCode,
+                    groupCode:this.reportformsObj.cnName,
                     corpIds:row.id,
                 }).then(res=>{
-                    this.handleReportPreview(res.data.data.url,res.data.data.data)
+                    this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
+                })
+            },
+            // 打印弹窗里回调
+            reportRadio(val){
+                console.log(val,1058)
+                // 多选打印
+                let idArr = this.selectionDList.map(item=>{
+                    return item.id
+                })
+                // 获取报表数据
+                reportsGetReportData({
+                    billId:this.assemblyForm.id,
+                    reportCode:val.classifyCode,
+                    groupCode:val.cnName,
+                    itemIds:idArr.join(','),
+                }).then(res=>{
+                    this.handleReportPreview(val.url,res.data.data.data)
                 })
             },
             // 打印费用
             printingCostsfun(dc){
                 this.printingDC = dc
-                let reportCode = ''
                 let groupCode = ''
                 if (dc == 'D') {
-                    reportCode = 'FYYS'
                     groupCode = '应收'
                 }else {
-                    reportCode = 'FYYF'
                     groupCode = '应付'
                 }
                 if(this.selectionDList.length > 0) {
-                    // 多选打印
-                    let idArr = this.selectionDList.map(item=>{
-                        return item.id
-                    })
-                    // 获取报表数据
-                    reportsGetReportData({
-                        billId:this.assemblyForm.id,
-                        reportCode:reportCode,
-                        groupCode:groupCode,
-                        itemIds:idArr.join(','),
-                    }).then(res=>{
-                        this.handleReportPreview(res.data.data.url,res.data.data.data)
+                    // 打开选择弹窗
+                    this.selectPrintingDialog = true
+                    let page = {
+                        pageSize: 10,
+                        currentPage: 1,
+                        total: 0
+                    }
+                    this.$nextTick(()=>{
+                        this.$refs.reportformsList.onLoad(page,{
+                            businessType:'HYCK',
+                            classifyCode:'费用',
+                            groupCode:groupCode
+                        })
                     })
                 }else {
                     // 没有多选弹窗
@@ -1047,9 +1099,23 @@
                         this.printingLoading = false
                         this.PrintingData = res.data.data
                     })
+                    this.reportsListfun({
+                        businessType:'HYCK',
+                        classifyCode:'费用',
+                        groupCode:groupCode
+                    })
                     this.printingDialog = true
                 }
-
+            },
+            // 获取打印表格数据
+            reportsListfun(obj){
+                reportsList(1,50,obj).then(res=>{
+                    this.reportTypeData = res.data.data.records
+                })
+            },
+            // 打印表格选择
+            reportNodeClick(data){
+                this.reportformsObj = data
             },
             copyfun(dc){
                 let selection = []
@@ -1103,6 +1169,10 @@
             },
             // 模板导入
             templateExport(){
+                if (!this.lefttemplate.id) {
+                    this.$message.warning('请选择左侧数据')
+                    return
+                }
                 if (this.feesselectionList.length > 0) {
                     feecenterTemplateImport({
                         ...this.lefttemplate,
@@ -1115,7 +1185,7 @@
                         });
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
-                        this.$emit('billsDetailfun')
+                        // this.$emit('billsDetailfun')
                         this.templateVisible = false
                     })
                 }else {

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

@@ -6,13 +6,15 @@
                    :page.sync="page"
                    ref="crud"
                    id="out-table"
-                   @current-row-change="handleCurrentRowChange"
                    :header-cell-class-name="headerClassName"
                    @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312.2)"
                    @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312.2)"
                    @search-change="searchChange"
                    @search-reset="searchReset"
                    @refresh-change="refreshChange">
+            <template slot-scope="scope" slot="menu">
+                <el-button type="text" size="small" @click="handleCurrentRowChange(scope.row)">打印预览</el-button>
+            </template>
         </avue-crud>
         <!--@on-load="onLoad"-->
     </div>
@@ -24,11 +26,17 @@
     import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
 
     export default {
+        props:{
+            // query:{
+            //     type:Object,
+            //     delete:{}
+            // }
+        },
         data(){
             return {
                 option: {},
                 optionBack: {
-                    height:'auto',
+                    height:'300px',
                     calcHeight: 30,
                     tip: false,
                     searchShow: true,
@@ -36,108 +44,30 @@
                     border: true,
                     index: true,
                     selection: false, // 多选
-                    highlightCurrentRow:true, // 单选
+                    // highlightCurrentRow:true, // 单选
                     dialogClickModal: false,
                     addBtn:false,
                     viewBtn:false,
                     delBtn:false,
                     editBtn:false,
-                    menu:false,
+                    menuWidth:'100',
                     column: [
                         {
-                            label: "业务类型",
-                            prop: "businessType",
-                            type: 'select',
-                            dicData:[],
-                            props: {
-                                label: "cnName",
-                                value: "code"
-                            },
-                            rules: [{
-                                required: true,
-                                message: "请输入业务类型",
-                                trigger: "blur"
-                            }]
-                        },
-                        {
-                            label: "类别",
-                            prop: "classifyCode",
-                            rules: [{
-                                required: true,
-                                message: "请输入类别",
-                                trigger: "blur"
-                            }]
-                        },
-                        {
-                            label: "组别",
-                            prop: "groupCode",
-                            rules: [{
-                                required: true,
-                                message: "请输入组别",
-                                trigger: "blur"
-                            }]
-                        },
-                        {
                             label: "报表编码",
                             prop: "code",
-                            search:true,
-                            rules: [{
-                                required: true,
-                                message: "请输入报表编码",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "中文名称",
                             prop: "cnName",
-                            search:true,
-                            rules: [{
-                                required: true,
-                                message: "请输入中文名称",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "英文名称",
                             prop: "enName"
                         },
-                        {
-                            label: "报表格式",
-                            prop: "content",
-                            rules: [{
-                                required: true,
-                                message: "请输入报表格式",
-                                trigger: "blur"
-                            }]
-                        },
-                        {
-                            label: "授权用户",
-                            prop: "authorizedUsersId",
-                            // hide: true,
-                            overHidden:true,
-                            formslot:true,
-                            type:'tree',
-                            dicUrl: "/api/blade-user/userList",
-                            multiple: true,
-                            props: {
-                                label: "realName",
-                                value: "id"
-                            },
-                            dicData:[],
-                            rules: [{
-                                required: true,
-                                message: "请选择授权用户",
-                                trigger: "blur"
-                            }]
-                        },
-                        {
-                            label: "备注",
-                            prop: "remarks"
-                        },
                     ]
                 },
-                query: {},
                 loading: true,
+                query:{},
                 page: {
                     pageSize: 10,
                     currentPage: 1,
@@ -148,16 +78,9 @@
         },
         async created() {
             this.option = await this.getColumnData(this.getColumnName(312.2), this.optionBack);
-            getUserApprovalList().then(res=>{
-                this.findObject(this.option.column, "authorizedUsersId").dicData = res.data.data
-            })
-            // 获取业务类型
-            bbusinesstypeList(1,20).then(res=>{
-                this.findObject(this.option.column, "businessType").dicData = res.data.data.records
-            })
         },
         methods:{
-            // 单选
+            // 点击打印
             handleCurrentRowChange(val){
                 this.$emit('reportRadio',val)
             },

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

@@ -583,7 +583,7 @@
           // 获取报表数据
            const res = await reportsGetReportData({
               billId:this.id,
-              reportCode:this.form.code,
+              reportCode:this.form.classifyCode,
               groupCode:this.form.groupCode,
           })
           // 获取的数据赋值
@@ -683,7 +683,7 @@
               // billsDetail(this.id).then(res => {
               reportsGetReportData({
                   billId:this.id,
-                  reportCode:row.code,
+                  reportCode:row.classifyCode,
                   groupCode:row.groupCode,
               }).then(res => {
                   // var data = res.data.data.data.map((item,index)=>{

src/views/iosBasicData/bbusinesstype/index.vue

@@ -108,12 +108,10 @@ export default {
           {
             label: "单据号码格式",
             prop: "billNoFormat",
-            rules: [{
-              required: true,
-              pattern: /[Za-z0-9_]/,
-              message: "不能输入中文",
-              trigger: "blur"
-            }]
+            rules: [
+                { required: true, message: '请输入单据号码格式', trigger: 'blur' },
+                { pattern: /[Za-z0-9_]/, message: "不能输入中文", trigger: "blur" }
+            ]
           },
           {
             label: "版本",

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

@@ -50,9 +50,7 @@
                 prop="corpCnName"
                 label="结算单位" width="130px">
                 <template slot-scope="{ row }">
-                    <avue-text-ellipsis :text="row.corpCnName" :height="50" :width="130">
-                        <small slot="more">...</small>
-                    </avue-text-ellipsis>
+                    <span class="textHide">{{row.corpCnName}}</span>
                 </template>
             </el-table-column>
             <el-table-column
@@ -79,7 +77,8 @@
                 label="本次结算币种"
                 prop="currentStlCurCode" width="100">
                 <template slot-scope="{row}">
-                    <search-query :datalist="curCodeData"
+                    <search-query v-if="!editSave"
+                                  :datalist="curCodeData"
                                   :selectValue="row.currentStlCurCode"
                                   :filterable="true"
                                   :clearable="true"
@@ -90,6 +89,7 @@
                                   @corpChange="corpChange($event,row)"
                                   @corpFocus="getRateListfun">
                     </search-query>
+                    <span v-else>{{row.currentStlCurCode}}</span>
                 </template>
             </el-table-column>
             <el-table-column label="本次结算金额">
@@ -163,14 +163,17 @@
             </el-table-column>
             <el-table-column
                 prop="etd"
-                label="ETD" width="150px">
+                label="ETD" width="120px">
                 <template slot-scope="{ row }">
-                    <span>{{row.etd}}</span>
+                    <span class="textHide">{{row.etd}}</span>
                 </template>
             </el-table-column>
             <el-table-column
                 prop="accBillNo"
-                label="账单编号">
+                label="账单编号" width="120px">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.accBillNo}}</span>
+                </template>
             </el-table-column>
 
             <el-table-column
@@ -192,7 +195,7 @@
 
             <el-table-column
                 prop="accBillNo"
-                label="操作(无参数)">
+                label="操作(无参数)" width="120px">
             </el-table-column>
             <el-table-column
                 prop="bookingNo"
@@ -211,6 +214,9 @@
             <el-table-column
                 prop="vesselCnName"
                 label="船名">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.vesselCnName}}</span>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="voyageNo"
@@ -335,6 +341,10 @@
             form:{
                 type:Object,
                 default:{},
+            },
+            editSave:{
+                type:Boolean,
+                default:false
             }
         },
         data(){

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -529,6 +529,7 @@
                 <finstlbillsitems :tableData="tableData"
                                   :form="form"
                                   :handleSelectionData="handleSelectionData"
+                                  :editSave="editSave"
                                   @handleSelectionChange="handleSelectionChange">
                 </finstlbillsitems>
             </el-card>
@@ -915,6 +916,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     finstlbillsConfirmReconciliation(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -932,6 +934,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                     finstlbillsRevokeReconciliation(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -1001,17 +1004,7 @@
                 this.form.businessType = 'CHK' //对账单
                 this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
                 // 保留id
-                this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
-                    item.lineNo = Number(index) + 1
-                    item.pType = item.businessType
-                    item.accBillId = item.id
-                    item.accBillNo = item.billNo
-                    item.accDate = item.billDate
-                    delete item.businessType
-                    delete item.billNo
-                    delete item.billDate
-                    return item
-                })
+                this.form.finStlBillsItemsList = this.handleSelectionData
                 this.pageLoading = true
                 finstlbillsConfirmSignFor(this.form).then(res=>{
                     this.pageLoading = false
@@ -1026,18 +1019,9 @@
                 this.form.billNoFormat = 'HYDZ'
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账单
+                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
 
-                this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
-                    item.lineNo = Number(index) + 1
-                    item.pType = item.businessType
-                    item.accBillId = item.id
-                    item.accBillNo = item.billNo
-                    item.accDate = item.billDate
-                    delete item.businessType
-                    delete item.billNo
-                    delete item.billDate
-                    return item
-                })
+                this.form.finStlBillsItemsList = this.handleSelectionData
                 this.pageLoading = true
                 finstlbillsRevokeSignFor(this.form).then(res=>{
                     this.pageLoading = false

src/views/iosBasicData/finstlbills/index.vue

@@ -150,6 +150,78 @@
               prop: "businessTypes",
               width:"120",
               overHidden:true,
+              type:'select',
+              multiple:true,
+              dicData:[
+                  {
+                      label:'海运出口',
+                      value:'SE'
+                  },{
+                      label:'海运进口',
+                      value:'SI'
+                  }
+              ],
+
+            },
+            {
+                label: "本位币应收(CNY)",
+                prop: "amountDr",
+                width: "160"
+            },
+            {
+                label: "本位币应付(CNY)",
+                prop: "amountCr",
+                width: "160"
+            },
+            // {
+            //   label: "综合 USD 应收(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountDrUsd",
+            //     width: "160"
+            // },
+            // {
+            //   label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountCrUsd",
+            //     width: "160"
+            // },
+            {
+                label: "合计本位币应收(CNY)",
+                prop: "amountDrLoc",
+                width: "160"
+            },
+            {
+                label: "合计本位币应付(CNY)",
+                prop: "amountCrLoc",
+                width: "160"
+            },
+            {
+                label: "本位币税后应收(CNY)",
+                prop: "amountDrNet",
+                width: "160"
+            },
+            {
+                label: "本位币税后应付(CNY)",
+                prop: "amountCrNet",
+                width: "160"
+            },
+            // {
+            //   label: "综合 USD 税后应收(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountDrUsdNet",
+            //     width: "160"
+            // },
+            // {
+            //   label: "综合 USD 税后应付(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountCrUsdNet",
+            //     width: "160"
+            // },
+            {
+                label: "合计本位币税后应收(CNY)",
+                prop: "amountDrLocNet",
+                width: "170"
+            },
+            {
+                label: "合计本位币税后应付(CNY)",
+                prop: "amountCrLocNet",
+                width: "170"
             },
             {
               label: "业务单据编号",
@@ -331,66 +403,6 @@
               prop: "voucherDate",
             },
             {
-              label: "本位币应收(CNY)",
-              prop: "amountDr",
-                width: "160"
-            },
-            {
-              label: "本位币应付(CNY)",
-              prop: "amountCr",
-                width: "160"
-            },
-            // {
-            //   label: "综合 USD 应收(USD) - 非 USD 外币转换为 USD",
-            //   prop: "amountDrUsd",
-            //     width: "160"
-            // },
-            // {
-            //   label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
-            //   prop: "amountCrUsd",
-            //     width: "160"
-            // },
-            {
-              label: "合计本位币应收(CNY)",
-              prop: "amountDrLoc",
-                width: "160"
-            },
-            {
-              label: "合计本位币应付(CNY)",
-              prop: "amountCrLoc",
-                width: "160"
-            },
-            {
-              label: "本位币税后应收(CNY)",
-              prop: "amountDrNet",
-                width: "160"
-            },
-            {
-              label: "本位币税后应付(CNY)",
-              prop: "amountCrNet",
-                width: "160"
-            },
-            // {
-            //   label: "综合 USD 税后应收(USD) - 非 USD 外币转换为 USD",
-            //   prop: "amountDrUsdNet",
-            //     width: "160"
-            // },
-            // {
-            //   label: "综合 USD 税后应付(USD) - 非 USD 外币转换为 USD",
-            //   prop: "amountCrUsdNet",
-            //     width: "160"
-            // },
-            {
-              label: "合计本位币税后应收(CNY )",
-              prop: "amountDrLocNet",
-                width: "160"
-            },
-            {
-              label: "合计本位币税后应付(CNY)",
-              prop: "amountCrLocNet",
-                width: "160"
-            },
-            {
               label: "备注",
               prop: "remarks",
             },