Merge remote-tracking branch 'origin/dev' into dev

src/util/columnSetting.js

@@ -3,8 +3,15 @@ import {
   getColumn,
   delColumn
 } from "@/api/saveColumn";
+import {validatenull} from './validate'
+export const arraySort = (list = [], prop, callback) => {
+  return list.filter(ele => !validatenull(ele[prop])).sort((a, b) => callback(a, b)).concat(list.filter(ele => validatenull(ele[prop])));
+}
 
 export async function getColumnData(columnKey, mainOption) {
+  mainOption.column.forEach((item,index)=>{
+    item.index=index+1
+  })
   let option
   const localData = JSON.parse(localStorage.getItem(columnKey));
   if (localData != null) {
@@ -16,9 +23,11 @@ export async function getColumnData(columnKey, mainOption) {
     option = res.data.data ? JSON.parse(res.data.data.jsonMessage)?JSON.parse(res.data.data.jsonMessage):mainOption: mainOption;
     localStorage.setItem(columnKey, JSON.stringify(option));
   }
+  option.column=arraySort(option.column, 'index', (a, b) => a.index - b.index)
   return option
 }
 export async function saveColumnData(columnKey, option) {
+  option.column=arraySort(option.column, 'index', (a, b) => a.index - b.index)
   let res = await saveColumn({
     fileName: columnKey,
     jsonMessage: JSON.stringify(option)
@@ -31,6 +40,9 @@ export async function saveColumnData(columnKey, option) {
   }
 }
 export async function delColumnData(columnKey, option) {
+  option.column.forEach((item,index)=>{
+    item.index=index+1
+  })
   let res = await delColumn({
     fileName: columnKey
   })

src/views/iosBasicData/ComputationCenter/index.vue

@@ -125,6 +125,53 @@ export default {
                 searchIndex: 3,
                 menuWidth: '100',
                 column: [
+                {
+                        label: "往来单位",
+                        prop: "corpCnName",
+                        search: true,
+                        overHidden: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicData: [],
+                        searchOrder: 1,
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                    },
+                    {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        search: true,
+                        searchOrder: 2,
+                        overHidden: true
+                    },
+                    {
+                        label: "JOB NO",
+                        prop: "businessNo",
+                        width: "120",
+                        search: true,
+                        searchOrder: 3,
+                        overHidden: true
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true
+                    },
+                    {
+                        label: "ACCT NO",
+                        prop: "accountNo",
+                        width: "100",
+                        search: true,
+                        searchOrder: 5,
+                        overHidden: true
+                    },
                     {
                         label: "业务类型",
                         prop: "businessType",
@@ -156,23 +203,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "往来单位",
-                        prop: "corpCnName",
-                        search: true,
-                        overHidden: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                        dicData: [],
-                        searchOrder: 1,
-                        props: {
-                            label: 'cnName',
-                            value: 'cnName',
-                            res: 'data.records'
-                        },
-                    },
-                    {
                         label: "发票抬头",
                         prop: "invCorpCnName",
                         hide: true,
@@ -284,36 +314,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "JOB NO",
-                        prop: "businessNo",
-                        width: "120",
-                        search: true,
-                        searchOrder: 3,
-                        overHidden: true
-                    },
-                    {
-                        label: "ACCT NO",
-                        prop: "accountNo",
-                        width: "100",
-                        search: true,
-                        searchOrder: 5,
-                        overHidden: true
-                    },
-                    {
-                        label: "MB/L NO",
-                        prop: "mblno",
-                        search: true,
-                        searchOrder: 2,
-                        overHidden: true
-                    },
-                    {
-                        label: "HB/L NO",
-                        prop: "hblno",
-                        search: true,
-                        searchOrder: 4,
-                        overHidden: true
-                    },
-                    {
                         label: "对账单号",
                         prop: "checkNo",
                         search: true,

src/views/iosBasicData/PaymentApplication/index.vue

@@ -85,20 +85,52 @@ export default {
         menuWidth: 100,
         expand: true,
         rowKey: 'id',
+        searchIcon: true,
+        searchIndex: 3,
         column: [
           {
-            label: "单据编号",
-            prop: "billNo",
+            label: "付费对象",
+            prop: "corpCnName",
             search: true,
             width: "120",
+            searchOrder: 1,
             overHidden: true
           },
           {
-            label: "付费对象",
-            prop: "corpCnName",
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "JOB NO",
+            prop: "businessNo",
+            width: "120",
+            search: true,
+            searchOrder: 3,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 4,
+            overHidden: true
+          },
+          {
+            label: "ACCT NO",
+            prop: "accountNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
+          {
+            label: "单据编号",
+            prop: "billNo",
             search: true,
             width: "120",
-            searchOrder: 1,
             overHidden: true
           },
           {
@@ -291,36 +323,6 @@ export default {
             overHidden: true
           },
           {
-            label: "JOB NO",
-            prop: "businessNo",
-            width: "120",
-            search: true,
-            searchOrder: 3,
-            overHidden: true
-          },
-          {
-            label: "ACCT NO",
-            prop: "accountNo",
-            width: "100",
-            search: true,
-            searchOrder: 5,
-            overHidden: true
-          },
-          {
-            label: "MB/L NO",
-            prop: "mblno",
-            search: true,
-            searchOrder: 2,
-            overHidden: true
-          },
-          {
-            label: "HB/L NO",
-            prop: "hblno",
-            search: true,
-            searchOrder: 4,
-            overHidden: true
-          },
-          {
             label: "对账单号",
             prop: "checkNo",
             search: true,

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

@@ -48,9 +48,9 @@
             <BillofLadingDetails
                 v-else-if="businesstypeData.reportsType == 'TDXQ' || businesstypeData.reportsType == 'DCWTS'"
                 :documentForm="documentForm"></BillofLadingDetails>
-                <BillofLadingDetailsM
-                v-else-if="businesstypeData.reportsType == 'MBL BOOKING SHEET'"
-                :documentForm="documentForm"></BillofLadingDetailsM>
+            <BillofLadingDetailsM v-else-if="businesstypeData.reportsType == 'MBL BOOKING SHEET'"
+                :documentForm="documentForm">
+            </BillofLadingDetailsM>
             <span slot="footer" class="dialog-footer">
                 <!--<el-button type="success" @click="documentSubmit(true)" >保存并打印</el-button>-->
                 <el-button v-if="addShow" type="success" :disabled="!documentForm.id"
@@ -110,11 +110,11 @@ import { isProcurement } from "@/api/basicData/configuration";
 export default {
     components: {
         businessReports,
-        BillofLadingDetails,BillofLadingDetailsM, reportContainer, reportformsList, bbusinesstype, DispatchNotice, PurchaseNotice
+        BillofLadingDetails, BillofLadingDetailsM, reportContainer, reportformsList, bbusinesstype, DispatchNotice, PurchaseNotice
     },
     data() {
         return {
-            textareaNumber:5,
+            textareaNumber: 5,
             previewDialog: false, // 打印预览弹窗
             PreviewOption: {}, // 打印预览弹窗的配置项
             PreviewOptionBack: {
@@ -315,7 +315,7 @@ export default {
         this.documentOption = await this.getColumnData(this.getColumnName(312.1), this.documentOptionBack);
         this.PreviewOption = await this.getColumnData(this.getColumnName(312.3), this.PreviewOptionBack);
         isProcurement({ "param": "textarea.number" }).then(res => {
-            if(res.data.data){
+            if (res.data.data) {
                 this.textareaNumber = res.data.data
             }
         })
@@ -332,13 +332,14 @@ export default {
             const data = await this.PreviewOnLoad(this.PreviewPage, {
                 businessType: 'HYCK',
                 classifyCode: '单证',
-                groupCode: row.groupCode=='提单详情(H)'?'提单详情':row.groupCode
+                groupCode: row.groupCode == '提单详情(H)' ? '提单详情' : row.groupCode
             });
             this.$nextTick(() => {
                 if (data.length == 1) {
                     this.handleReportPreview(data[0].url, this.documentForm)
                 } else {
                     this.previewDialog = true
+                    this.documentVisible = false
                 }
             })
             // let obj = {businessType:'HYCK',classifyCode:'单证',groupCode:row.groupCode}
@@ -441,7 +442,7 @@ export default {
             reportsGetReportData({
                 billId: this.assemblyForm.id,
                 reportCode: this.businesstypeData.classifyCode,
-                groupCode: this.businesstypeData.groupCode,
+                groupCode: this.businesstypeData.groupCode=='提单详情(H)'?'提单详情':this.businesstypeData.groupCode,
                 reportsType: this.businesstypeData.reportsType,
                 type: 'HYCK'
             }).then(res => {
@@ -497,6 +498,7 @@ export default {
                 obj.groupCode = this.businesstypeData.groupCode
                 obj.reportsType = this.businesstypeData.reportsType
             }
+            console.log(this.documentForm)
             obj.printContent = JSON.stringify({
                 data: {
                     ...this.documentForm,

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

@@ -101,7 +101,7 @@
                                                                 }} {{ item[0].label }}
                                                             </span>
                                                             <span v-else style="color: #1e9fff">{{ item[0].label
-                                                            }}</span>
+                                                                }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -298,7 +298,8 @@
         <!--预览报表弹窗-->
         <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <business-reports :id="form.id" :classifycode="getReportTypeByBigHandle()" :disabled="detailData.seeDisabled"></business-reports>
+            <business-reports :id="form.id" :classifycode="getReportTypeByBigHandle()"
+                :disabled="detailData.seeDisabled"></business-reports>
         </el-dialog>
     </div>
 </template>
@@ -849,6 +850,9 @@ export default {
         isProcurement({ "param": "verify.symbol" }).then(res => {
             this.verifySymbolStatus = res.data.data
         })
+        if (this.detailData.billType) {
+            this.form.billType = this.detailData.billType
+        }
         // 判断是否员id, 有id 就不显示
         if (!this.form.id) {
             this.deptGetDetailPolfun() // 收货地 装货港 当前登录人的默认
@@ -2482,10 +2486,10 @@ export default {
             }
         },
         getReportTypeByBigHandle() {
-            var rt="";
-            if (this.bigtabs == 'wt') rt="业务";
-            if (this.bigtabs == 'fy') rt="费用";
-            if (this.bigtabs == 'dz') rt="单证";
+            var rt = "";
+            if (this.bigtabs == 'wt') rt = "业务";
+            if (this.bigtabs == 'fy') rt = "费用";
+            if (this.bigtabs == 'dz') rt = "单证";
             return rt;
         },
         // 获取不分页的分单列表

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

@@ -310,7 +310,11 @@
                 <!--#endregion-->
 
                 <template slot="menuLeft">
-                    <el-button type="primary" size="small" @click="addbtnfun()">新建业务
+                    <el-button type="primary" size="small" @click="addbtnfun('MM')">新建主单
+                    </el-button>
+                    <el-button type="success" size="small" @click="addbtnfun('MH')">新建分单
+                    </el-button>
+                    <el-button type="warning" size="small" @click="addbtnfun('DD')">新建直单
                     </el-button>
                     <el-button type="primary" size="small" plain @click="CopyDocumentsfun">复制单据
                     </el-button>
@@ -353,11 +357,20 @@
                             <el-tab-pane label="接单" name="0">
                                 <span slot="label">接单</span>
                             </el-tab-pane>
+                            <el-tab-pane label="出号" name="4">
+                                <span slot="label">出号</span>
+                            </el-tab-pane>
+                            <el-tab-pane label="开船" name="5">
+                                <span slot="label">开船</span>
+                            </el-tab-pane>
+                            <el-tab-pane label="到港" name="6">
+                                <span slot="label">到港</span>
+                            </el-tab-pane>
                             <el-tab-pane label="退舱" name="1">
                                 <span slot="label" style="color: #d86363">退舱</span>
                             </el-tab-pane>
                             <el-tab-pane label="完成" name="3"></el-tab-pane>
-                            <el-tab-pane label="全部" name="4"></el-tab-pane>
+                            <el-tab-pane label="全部" name="7"></el-tab-pane>
                         </el-tabs>
                     </div>
                 </template>
@@ -1620,25 +1633,25 @@ export default {
     },
     methods: {
         rowStyle({ row, column, rowIndex, columnIndex }) {
-            if (row.status ==2) {
+            if (row.status == 2) {
                 return {
                     // color: '#fff',
                     backgroundColor: '#fbd26a',
-                    
+
                 }
             }
-            if (row.status ==3) {
+            if (row.status == 3) {
                 return {
                     // color: '#fff',
                     backgroundColor: '#ced094',
-                    
+
                 }
             }
-            if (row.status ==4) {
+            if (row.status == 4) {
                 return {
                     // color: '#fff',
                     backgroundColor: '#fbc4c4',
-                    
+
                 }
             }
         },
@@ -1946,8 +1959,9 @@ export default {
             this.$store.commit("OUT_SEAFE_DETAIL");
         },
         // 新增弹窗开启
-        addbtnfun() {
+        addbtnfun(type) {
             this.detailData.seeDisabled = false
+            this.detailData.billType = type
             this.isShow = false
             this.$store.commit("IN_SEAFE_DETAIL");
         },

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -19,7 +19,10 @@
                 <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="sortTypeSearch">
+                <el-radio v-model="query.sortType" label="1" @input="searchChange">结算单位</el-radio>
+                <el-radio v-model="query.sortType" label="3" @input="searchChange">提单号</el-radio>
+            </template>
             <template slot-scope="{disabled,size}" slot="businessTypeSearch">
                 <search-query :datalist="businessTypeData" :selectValue="query.businessType" :clearable="true"
                     :buttonIf="false" :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
@@ -83,6 +86,7 @@ export default {
             },
             query: {
                 dc: 'D',
+                sortType:'1',
                 isBusinessDate: 1,
                 isToExamineDate: 0,
                 etdStart: defaultDate3()[0],
@@ -94,7 +98,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 14,
+                searchMenuSpan: 6,
                 border: true,
                 index: false,
                 selection: true,
@@ -266,7 +270,7 @@ export default {
                         hide: true,
                         search: true,
                         searchslot: true,
-                        searchSpan: 4,
+                        searchSpan: 6,
                         searchLabelWidth: '0'
                     },
                     {
@@ -283,6 +287,14 @@ export default {
                         hide: true,
                         searchLabelWidth: '0',
                     },
+                    {
+                        label: "",
+                        prop: "sortType",
+                        hide: true,
+                        search: true,
+                        searchslot: true,
+                        searchLabelWidth: '0'
+                    },
 
                 ]
             },
@@ -347,6 +359,7 @@ export default {
         this.option = await this.getColumnData(this.getColumnName(334), this.optionBack);
         this.query = {
             dc: 'D',
+            sortType:'1',
             isBusinessDate: 1,
             isToExamineDate: 0,
             etdStart: defaultDate3()[0],
@@ -474,6 +487,7 @@ export default {
         searchReset() {
             this.query = {
                 dc: 'D',
+                sortType:'1',
                 isBusinessDate: 1,
                 isToExamineDate: 0,
                 etdStart: null,
@@ -539,6 +553,7 @@ export default {
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
                 this.query = {
                     dc: 'D',
+                    sortType:'1',
                     isBusinessDate: 1,
                     isToExamineDate: 0,
                     etdStart: defaultDate3()[0],

src/views/iosBasicData/financeProfit/index.vue

@@ -194,6 +194,18 @@ export default {
                         name: 'realAmountProfitLoc',
                         type: 'sum',
                         decimals: 2
+                    }, {
+                        name: 'notReceivedDrUsd',
+                        type: 'sum',
+                        decimals: 2
+                    }, {
+                        name: 'notReceivedDr',
+                        type: 'sum',
+                        decimals: 2
+                    }, {
+                        name: 'notReceivedLoc',
+                        type: 'sum',
+                        decimals: 2
                     }],
                 column: [
                     {
@@ -353,6 +365,21 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "未收美元",
+                        prop: "notReceivedDrUsd",
+                        overHidden: true,
+                    },
+                    {
+                        label: "未收人民币",
+                        prop: "notReceivedDr",
+                        overHidden: true,
+                    },
+                    {
+                        label: "未收合计",
+                        prop: "notReceivedLoc",
+                        overHidden: true,
+                    },
+                    {
                         label: "应付美元",
                         prop: "amountCrUsd",
                         overHidden: true,

src/views/iosBasicData/fininvoices/index.vue

@@ -79,14 +79,55 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 8,
         border: true,
         index: true,
         viewBtn: true,
         selection: true,
         dialogClickModal: false,
         menuWidth: 100,
+        searchIcon: true,
+        searchIndex: 3,
         column: [
+        {
+            label: "客户名称",
+            prop: "corpCnName",
+            search: true,
+            width: 120,
+            searchOrder: 1,
+            overHidden: true,
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "JOB NO",
+            prop: "businessNo",
+            width: "120",
+            search: true,
+            searchOrder: 3,
+            overHidden: true
+          },
+          
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 4,
+            overHidden: true
+          },
+          {
+            label: "业务单号",
+            prop: "businessNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
           {
             label: "单据编号",
             prop: "billNo",
@@ -195,14 +236,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "客户名称",
-            prop: "corpCnName",
-            search: true,
-            width: 120,
-            searchOrder: 1,
-            overHidden: true,
-          },
-          {
             label: "费用名称",
             prop: "feeCnName",
             width: "140",
@@ -210,36 +243,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "JOB NO",
-            prop: "businessNo",
-            width: "120",
-            search: true,
-            searchOrder: 3,
-            overHidden: true
-          },
-          {
-            label: "业务单号",
-            prop: "businessNo",
-            width: "100",
-            search: true,
-            searchOrder: 5,
-            overHidden: true
-          },
-          {
-            label: "MB/L NO",
-            prop: "mblno",
-            search: true,
-            searchOrder: 2,
-            overHidden: true
-          },
-          {
-            label: "HB/L NO",
-            prop: "hblno",
-            search: true,
-            searchOrder: 4,
-            overHidden: true
-          },
-          {
             label: "对账单号",
             prop: "checkNo",
             search: true,
@@ -853,7 +856,9 @@ export default {
   background: #ecf5ff !important;
   text-align: center;
 }
-
+/deep/ .el-col-md-8 {
+  width: 24.33333%;
+}
 .pointerClick {
   cursor: pointer;
   color: #1e9fff;

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -85,7 +85,47 @@ export default {
         selection: true,
         dialogClickModal: false,
         menuWidth: 100,
+        searchIcon: true,
+        searchIndex: 3,
         column: [
+        {
+            label: "客户名称",
+            prop: "corpCnName",
+            width: "120",
+            search: true,
+            searchOrder: 1,
+            overHidden: true,
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "JOB NO",
+            prop: "businessNo",
+            width: "120",
+            search: true,
+            searchOrder: 3,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 4,
+            overHidden: true
+          },
+          {
+            label: "ACCT NO",
+            prop: "accountNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
           {
             label: "单据编号",
             prop: "billNo",
@@ -98,14 +138,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "客户名称",
-            prop: "corpCnName",
-            width: "120",
-            search: true,
-            searchOrder: 1,
-            overHidden: true,
-          },
-          {
             label: "费用名称",
             prop: "feeCnName",
             width: "140",
@@ -217,36 +249,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "JOB NO",
-            prop: "businessNo",
-            width: "120",
-            search: true,
-            searchOrder: 3,
-            overHidden: true
-          },
-          {
-            label: "业务单号",
-            prop: "businessNo",
-            width: "100",
-            search: true,
-            searchOrder: 5,
-            overHidden: true
-          },
-          {
-            label: "MB/L NO",
-            prop: "mblno",
-            search: true,
-            searchOrder: 2,
-            overHidden: true
-          },
-          {
-            label: "HB/L NO",
-            prop: "hblno",
-            search: true,
-            searchOrder: 4,
-            overHidden: true
-          },
-          {
             label: "对账单号",
             prop: "checkNo",
             search: true,
@@ -869,6 +871,10 @@ export default {
   text-align: center;
 }
 
+/deep/ .el-col-md-8 {
+  width: 24.33333%;
+}
+
 .pointerClick {
   cursor: pointer;
   color: #1e9fff;

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -142,7 +142,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 selection: true,
@@ -152,8 +152,32 @@ export default {
                 viewBtn: false,
                 delBtn: false,
                 editBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
                 column: [
                     {
+                        label: "客户名称",
+                        prop: "corpCnName",
+                        width: "120",
+                        search: true,
+                        searchOrder: 1,
+                        overHidden: true,
+                    },
+                    {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        search: true,
+                        searchOrder: 2,
+                        overHidden: true
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true
+                    },
+                    {
                         label: "单据编号",
                         prop: "billNo",
                         search: true,
@@ -202,14 +226,6 @@ export default {
                         searchDefaultTime: ["00:00:00", "23:59:59"],
                     },
                     {
-                        label: "客户名称",
-                        prop: "corpCnName",
-                        width: "120",
-                        search: true,
-                        searchOrder: 1,
-                        overHidden: true,
-                    },
-                    {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: "140",
@@ -240,14 +256,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "JOB NO",
-                        prop: "businessNo",
-                        width: "120",
-                        search: true,
-                        searchOrder: 3,
-                        overHidden: true
-                    },
-                    {
                         label: "业务单号",
                         prop: "businessNo",
                         width: "100",
@@ -256,20 +264,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "MB/L NO",
-                        prop: "mblno",
-                        search: true,
-                        searchOrder: 2,
-                        overHidden: true
-                    },
-                    {
-                        label: "HB/L NO",
-                        prop: "hblno",
-                        search: true,
-                        searchOrder: 4,
-                        overHidden: true
-                    },
-                    {
                         label: "对账单号",
                         prop: "checkNo",
                         search: true,
@@ -316,7 +310,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 selection: true,
@@ -326,7 +320,31 @@ export default {
                 viewBtn: false,
                 delBtn: false,
                 editBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
                 column: [
+                {
+                        label: "客户名称",
+                        prop: "corpCnName",
+                        width: "120",
+                        search: true,
+                        searchOrder: 1,
+                        overHidden: true,
+                    },
+                    {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        search: true,
+                        searchOrder: 2,
+                        overHidden: true
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true
+                    },
                     {
                         label: "单据编号",
                         prop: "billNo",
@@ -339,14 +357,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "客户名称",
-                        prop: "corpCnName",
-                        width: "120",
-                        search: true,
-                        overHidden: true,
-                        searchOrder: 1,
-                    },
-                    {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: "140",
@@ -375,7 +385,7 @@ export default {
                         label: "制单人",
                         prop: "createUserName",
                         overHidden: true,
-                    },                {
+                    }, {
                         label: "制单日期",
                         prop: "createTime",
                         overHidden: true,
@@ -483,14 +493,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "JOB NO",
-                        prop: "businessNo",
-                        width: "120",
-                        search: true,
-                        searchOrder: 3,
-                        overHidden: true
-                    },
-                    {
                         label: "业务单号",
                         prop: "businessNo",
                         width: "100",
@@ -499,20 +501,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "MB/L NO",
-                        prop: "mblno",
-                        search: true,
-                        searchOrder: 2,
-                        overHidden: true
-                    },
-                    {
-                        label: "HB/L NO",
-                        prop: "hblno",
-                        search: true,
-                        searchOrder: 4,
-                        overHidden: true
-                    },
-                    {
                         label: "对账单号",
                         prop: "checkNo",
                         search: true,
@@ -642,16 +630,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "MBL NO",
-                        prop: "mblno",
-                        overHidden: true,
-                    },
-                    {
-                        label: "HBL NO",
-                        prop: "hblno",
-                        overHidden: true,
-                    },
-                    {
                         label: "订舱",
                         prop: "bookingNo",
                         overHidden: true,

src/views/iosBasicData/finstlbills/index.vue

@@ -88,8 +88,49 @@ export default {
         menuWidth: 100,
         expand: true,
         rowKey: 'id',
+        searchIcon: true,
+        searchIndex: 3,
         column: [
           {
+            label: "客户名称",
+            prop: "corpCnName",
+            search: true,
+            width: "120",
+            searchOrder: 1,
+            overHidden: true,
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "JOB NO",
+            prop: "businessNo",
+            width: "120",
+            search: true,
+            searchOrder: 3,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 4,
+            overHidden: true
+          },
+          {
+            label: "ACCT NO",
+            prop: "accountNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
+
+          {
             label: "业务类型",
             prop: "businessType",
             overHidden: true,
@@ -129,50 +170,12 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
-            label: "客户名称",
-            prop: "corpCnName",
-            search: true,
-            width: "120",
-            searchOrder: 1,
-            overHidden: true,
-          },
-          {
             label: "客户英文名称",
             prop: "corpEnName",
             width: "120",
             overHidden: true,
           },
           {
-            label: "JOB NO",
-            prop: "businessNo",
-            width: "120",
-            search: true,
-            searchOrder: 3,
-            overHidden: true
-          },
-          {
-            label: "ACCT NO",
-            prop: "accountNo",
-            width: "100",
-            search: true,
-            searchOrder: 5,
-            overHidden: true
-          },
-          {
-            label: "MB/L NO",
-            prop: "mblno",
-            search: true,
-            searchOrder: 2,
-            overHidden: true
-          },
-          {
-            label: "HB/L NO",
-            prop: "hblno",
-            search: true,
-            searchOrder: 4,
-            overHidden: true
-          },
-          {
             label: "对账单号",
             prop: "checkNo",
             search: true,
@@ -842,6 +845,9 @@ export default {
   background: #ecf5ff !important;
   text-align: center;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 
 .pointerClick {
   cursor: pointer;

src/views/iosBasicData/paymentDetail/index.vue

@@ -22,6 +22,10 @@
                 <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="sortTypeSearch">
+                <el-radio v-model="query.sortType" label="1" @input="searchChange">结算单位</el-radio>
+                <el-radio v-model="query.sortType" label="3" @input="searchChange">提单号</el-radio>
+            </template>
             <template slot-scope="{disabled,size}" slot="typeSearch">
                 <search-query :datalist="typeData" :selectValue="query.type" :buttonIf="false"
                     @corpChange="corpChange($event, 'type')">
@@ -101,6 +105,7 @@ export default {
                 isBusinessDate: 1,
                 isToExamineDate: 0,
                 type: '1',
+                sortType:'1',
                 etdStart: defaultDate3()[0],
                 etdEnd: defaultDate3()[1],
             },
@@ -293,7 +298,14 @@ export default {
                         hide: true,
                         searchLabelWidth: '0',
                     },
-
+                    {
+                        label: "",
+                        prop: "sortType",
+                        hide: true,
+                        search: true,
+                        searchslot: true,
+                        searchLabelWidth: '0'
+                    },
                 ]
             },
             data: [],
@@ -382,6 +394,7 @@ export default {
             isBusinessDate: 1,
             isToExamineDate: 0,
             type: '1',
+            sortType:'1',
             etdStart: defaultDate3()[0],
             etdEnd: defaultDate3()[1],
         }
@@ -579,6 +592,7 @@ export default {
                 isBusinessDate: 1,
                 isToExamineDate: 0,
                 type: '1',
+                sortType:'1',
                 etdStart: null,
                 etdEnd: null,
             }
@@ -645,6 +659,7 @@ export default {
                     isBusinessDate: 1,
                     isToExamineDate: 0,
                     type: '1',
+                    sortType:'1',
                     etdStart: defaultDate3()[0],
                     etdEnd: defaultDate3()[1],
                 }