货代 2024-1-15

src/api/iosBasicData/bills.js

@@ -37,6 +37,14 @@ export const billsDetail = (id) => {
     }
   })
 }
+// 海运出库amend 检索
+export const billsGetDetail = (data) => {
+  return request({
+    url: '/api/blade-los/bills/getDetail',
+    method: 'get',
+    params: data
+  })
+}
 // 海运出口复制单据
 export const billsCopyBills = (data) => {
   return request({

src/views/exportTrade/salesContract/detailsPage.vue

@@ -146,7 +146,7 @@
                         <el-select size="small" v-model="form.banks" placeholder="请选择" @change="banksChange"
                                    clearable
                                    :disabled="detailData.status == 1 || !form.belongToCorpId">
-                            <el-option v-for="item in banksData" :key="item.id" :label="item.accountNo"
+                            <el-option v-for="item in banksData" :key="item.id" :label="item.accountBank"
                                        :value="item.accountNo">
                             </el-option>
                         </el-select>
@@ -1486,6 +1486,7 @@ export default {
       this.form.coefficient = row.coefficient;
       this.form.corpsName = row.cname;
       this.form.belongToCorpId = row.belongtocompany
+        this.getCorpsBank({id:row.belongtocompany})
       this.form.clientMessage = (row.cname ? row.cname : '') + '\r\n' + (row.addr ? row.addr : '')
       if (this.data.length > 0) {
         this.data.forEach(e => {
@@ -1518,10 +1519,14 @@ export default {
         // this.form.corpsBank = row.corpsBankName;
         // 获取银行信息数据
         customeDetail(row.id).then(res=>{
-            this.banksData = res.data.data.corpsBankList
+            this.banksData = res.data.data.corpsBankList.map(item=>{
+                item.accountBank = item.accountBank + ' - ' + item.accountNo
+                return item
+            })
             if (this.banksData.length > 0) {
+                console.log(this.banksData[0],1524)
                 this.$set(this.form,'banks',this.banksData[0].accountNo)
-                this.$set(this.form,'accountBank',this.banksData[0].accountBank)
+                this.$set(this.form,'accountBank',this.banksData[0].accountBank.split(' - ')[0])
                 this.$set(this.form,'banksAccountName',this.banksData[0].accountName)
             }else {
                 this.$set(this.form,'banks','')
@@ -1535,7 +1540,7 @@ export default {
        for (let item of this.banksData) {
            if (value == item.accountNo) {
                this.$set(this.form,'banks',item.accountNo)
-               this.$set(this.form,'accountBank',item.accountBank)
+               this.$set(this.form,'accountBank',item.accountBank.split(' - ')[0])
                this.$set(this.form,'banksAccountName',item.accountName)
            }
        }

src/views/iosBasicData/ComputationCenter/index.vue

@@ -96,14 +96,14 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                     calcHeight: 30,
                     tip: false,
                     searchShow: true,
-                    searchMenuSpan: 6,
+                    searchMenuSpan: 24,
                     searchLabelWidth:'100',
                     border: true,
                     index: true,
                     selection: true,
                     dialogClickModal: false,
                     searchIcon: true,
-                    searchIndex: 3,
+                    searchIndex: 4,
                     stripe:true,
                     addBtn:false,
                     viewBtn:false,
@@ -165,16 +165,44 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                         {
                             label: "单据日期",
                             prop: "billDate",
+                            overHidden:true,
+                            width:"150",
+                        },
+                        {
+                            label: "单据开始日期",
+                            prop: "businessDateStart",
                             search:true,
                             overHidden:true,
-                            searchProp: 'billDateList',
-                            type: "daterange",
-                            searchRange: true,
-                            searchDefaultTime: ["00:00:00", "23:59:59"],
+                            hide:true,
+                            searchLabelWidth:'100',
+                            type: "date",
                             format: "yyyy-MM-dd",
-                            valueFormat: "yyyy-MM-dd HH:mm:ss"
+                            valueFormat: "yyyy-MM-dd HH:mm:ss",
                         },
                         {
+                            label: "单据结束日期",
+                            prop: "businessDateEnd",
+                            search:true,
+                            overHidden:true,
+                            hide:true,
+                            searchLabelWidth:'100',
+                            type: "date",
+                            format: "yyyy-MM-dd",
+                            valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        },
+                        // {
+                        //     label: "单据日期",
+                        //     prop: "billDate",
+                        //     search:true,
+                        //     overHidden:true,
+                        //     searchProp: 'billDateList',
+                        //     type: "daterange",
+                        //     searchRange: true,
+                        //     searchDefaultTime: ["00:00:00", "23:59:59"],
+                        //     format: "yyyy-MM-dd",
+                        //     valueFormat: "yyyy-MM-dd HH:mm:ss"
+                        // },
+                        {
                             label: "提交日期",
                             prop: "auditDateFrom",
                             width: "140",
@@ -293,9 +321,13 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                     this.findObject(this.option.column, "type").hide = true
                     this.findObject(this.option.column, "businessType").hide = false
                 }
-                this.query = {};
+                // this.query = {};
                 this.page.currentPage = 1
                 this.selectionList = []
+                this.$set(this.query,'billNo','')
+                this.$set(this.query,'corpCnName','')
+                this.$set(this.query,'businessDateStart','')
+                this.$set(this.query,'businessDateEnd','')
                 this.onLoad(this.page)
             },
              // 刷新回调

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -72,24 +72,31 @@
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="业务日期" prop="etd">
-                                    <el-date-picker
-                                        v-model="form.accountDate"
-                                        type="datetimerange"
-                                        range-separator="至"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        style="width: 100%;"
-                                        size="small"
-                                        :disabled="editSave"
-                                        format="yyyy-MM-dd"
-                                        value-format="yyyy-MM-dd"
-                                        placeholder="选择业务日期">
+                            <el-col :span="4">
+                                <el-form-item label="业务开始日期" prop="accountDateFrom">
+                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择业务开始日期">
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="5">
+                            <el-col :span="4">
+                                <el-form-item label="业务结束日期" prop="accountDateTo">
+                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择业务结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="3">
                                 <el-form-item label="收/付" prop="queryAmount">
                                     <search-query :datalist="dcData"
                                                   :selectValue="form.dc"
@@ -103,7 +110,7 @@
                                     </search-query>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
+                            <el-col :span="3">
                                 <el-form-item label="币别" prop="curCode">
                                     <search-query :datalist="curCodeData"
                                                   :selectValue="form.curCode"
@@ -611,6 +618,8 @@ export default {
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算单
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
                 this.form.settlementType = this.settlementType
                 this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
                     if (item.currentStlCurCode == 'CNY') {
@@ -744,10 +753,8 @@ export default {
             obj.voyageNo = this.form.voyageNo // 航次
             obj.signforDateList = this.form.signforDateList // 签收日期
             obj.auditStatus = '0'
-            // 财务期间
-            if (this.form.accountDate) {
-                obj.billDateList = this.form.accountDate
-            }
+            obj.billDateStart = this.form.accountDateFrom // 业务开始日期
+            obj.billDateEnd = this.form.accountDateTo // 业务开始日期
             // 判断是否有对账单号
             if (this.form.checkNo) {
                 obj.corpId = this.form.corpId // 结算单位
@@ -890,6 +897,9 @@ export default {
             }).then(()=>{
                 this.pageLoading = true
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                 this.form.url = '/iosBasicData/ComputationCenter/index',
                 this.form.pageStatus = "this.$store.getters.SettlementCenterF"
                 this.form.pageLabel = "结算中心(F)"
@@ -911,6 +921,9 @@ export default {
             }).then(()=>{
                 this.pageLoading = true
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                 finstlbillsRevokeSettlement(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message.success('操作成功');

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -98,24 +98,31 @@
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="业务日期" prop="etd">
-                                    <el-date-picker
-                                        v-model="form.accountDate"
-                                        type="datetimerange"
-                                        range-separator="至"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        style="width: 100%;"
-                                        size="small"
-                                        :disabled="editSave"
-                                        format="yyyy-MM-dd"
-                                        value-format="yyyy-MM-dd"
-                                        placeholder="选择业务日期">
+                            <el-col :span="4">
+                                <el-form-item label="财务开始日期" prop="accountDateFrom">
+                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择财务开始日期">
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="5">
+                            <el-col :span="4">
+                                <el-form-item label="财务结束日期" prop="accountDateTo">
+                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择财务结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="3">
                                 <el-form-item label="收/付" prop="queryAmount">
                                     <search-query :datalist="dcData"
                                                   :selectValue="form.dc"
@@ -129,7 +136,7 @@
                                     </search-query>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
+                            <el-col :span="3">
                                 <el-form-item label="币别" prop="curCode">
                                     <search-query :datalist="curCodeData"
                                                   :selectValue="form.curCode"
@@ -692,6 +699,9 @@
                     if(this.form.estimatedTime) {
                         this.form.estimatedTime = this.form.estimatedTime + ' 00:00:00'
                     }
+                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     this.saveLoading = true // 加载动画
                     this.form.billNoFormat = 'FFSQ'
                     this.form.businessTypeCode = 'FFSQ'
@@ -778,12 +788,9 @@
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.voyageNo = this.form.voyageNo // 航次
-                obj.signforDateList = this.form.signforDateList // 签收日期
                 obj.auditStatus = '0'
-                // 财务期间
-                if (this.form.accountDate) {
-                    obj.billDateList = this.form.accountDate
-                }
+                obj.billDateStart = this.form.accountDateFrom // 财务开始日期
+                obj.billDateEnd = this.form.accountDateTo // 财务开始日期
                 // 判断是否有对账单号
                 if (this.form.checkNo) {
                     obj.corpId = this.form.corpId // 结算单位
@@ -904,6 +911,10 @@
                 }).then(()=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.estimatedTime = this.form.estimatedTime?this.form.estimatedTime.slice(0,10) + ' 00:00:00':null
+                    this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     this.form.url = '/iosBasicData/PaymentApplication/index',
                     this.form.pageStatus = "this.$store.getters.paidapplication"
                     this.form.pageLabel = "付费申请(F)"
@@ -925,6 +936,10 @@
                 }).then(()=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.estimatedTime = this.form.estimatedTime?this.form.estimatedTime.slice(0,10) + ' 00:00:00':null
+                    this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     revokeSettlementApprove(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');

src/views/iosBasicData/PaymentApplication/index.vue

@@ -143,33 +143,42 @@
                 search:true,
             },
             {
+                label: "收款情况",
+                prop: "collectionSituation",
+                search:true,
+                width:"120",
+                overHidden:true
+            },
+            {
                 label: "预计收回",
                 prop: "estimatedTime",
                 type:'date',
                 format: "yyyy-MM-dd",
-                valueFormat: 'yyyy-MM-dd HH:mm:ss',
+                valueFormat: 'yyyy-MM-dd',
                 width:"120",
                 overHidden:true
             },
             {
-                label: "预计收回",
-                prop: "estimatedTimeList",
+                label: "预计开始收回",
+                prop: "estimatedTimeStart",
                 search:true,
+                overHidden:true,
+                searchLabelWidth:"100",
                 hide:true,
                 type: "date",
-                overHidden: true,
-                width: 100,
-                searchRange: true,
-                searchDefaultTime: ["00:00:00", "23:59:59"],
                 format: "yyyy-MM-dd",
-                valueFormat: "yyyy-MM-dd HH:mm:ss"
+                valueFormat: "yyyy-MM-dd HH:mm:ss",
             },
             {
-                label: "收款情况",
-                prop: "collectionSituation",
+                label: "预计结束收回",
+                prop: "estimatedTimeEnd",
                 search:true,
-                width:"120",
-                overHidden:true
+                overHidden:true,
+                searchLabelWidth:"100",
+                hide:true,
+                type: "date",
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd HH:mm:ss",
             },
             {
                 label: "应付(CNY)",
@@ -196,31 +205,49 @@
                 overHidden:true
             },
             {
+                label: "业务日期",
+                prop: "billDate",
+                overHidden:true,
+                width:"150",
+            },
+            {
                 label: "业务开始日期",
-                prop: "billDateFrom",
+                prop: "businessDateStart",
                 width: "140",
-                overHidden:true
+                overHidden:true,
+                search:true,
+                hide: true,
+                searchLabelWidth:"100",
+                type: "date",
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd HH:mm:ss",
             },
             {
                 label: "业务结束日期",
-                prop: "billDateTo",
+                prop: "businessDateEnd",
                 width: "140",
-                overHidden:true
-            },
-            {
-                label: "业务日期",
-                prop: "billDateList",
+                overHidden:true,
                 search:true,
-                hide:true,
-                searchProp: "billDateList",
+                hide: true,
+                searchLabelWidth:"100",
                 type: "date",
-                overHidden: true,
-                width: 100,
-                searchRange: true,
-                searchDefaultTime: ["00:00:00", "23:59:59"],
                 format: "yyyy-MM-dd",
-                valueFormat: "yyyy-MM-dd HH:mm:ss"
+                valueFormat: "yyyy-MM-dd HH:mm:ss",
             },
+            // {
+            //     label: "业务日期",
+            //     prop: "billDateList",
+            //     search:true,
+            //     hide:true,
+            //     searchProp: "billDateList",
+            //     type: "date",
+            //     overHidden: true,
+            //     width: 100,
+            //     searchRange: true,
+            //     searchDefaultTime: ["00:00:00", "23:59:59"],
+            //     format: "yyyy-MM-dd",
+            //     valueFormat: "yyyy-MM-dd HH:mm:ss"
+            // },
             {
                 label: "费用收付",
                 prop: "dc",
@@ -343,7 +370,7 @@
           this.editFun({id:this.$route.query.billId})
       }
       this.$store.commit('FFQSF_IN_DETAIL')
-      this.dictionaryfun() // 获取字典数据
+      // this.dictionaryfun() // 获取字典数据
         this.getRateListfun() // 币别数据
     },
     methods: {
@@ -486,7 +513,7 @@
       searchChange(params, done) {
         this.query = params;
         this.page.currentPage = 1;
-        this.onLoad(this.page, params);
+        this.onLoad(this.page, this.query);
         done();
       },
       selectionChange(list) {
@@ -533,20 +560,20 @@
         dictionaryfun(){
           // 全部是否
             getWorkDicts('ifInvoice').then(res=>{
-                this.findObject(this.option.column, "isApproved").dicData = res.data.data
-                this.findObject(this.option.column, "isSignfor").dicData = res.data.data
+                // this.findObject(this.option.column, "isApproved").dicData = res.data.data
+                // this.findObject(this.option.column, "isSignfor").dicData = res.data.data
                 this.findObject(this.option.column, "isChecked").dicData = res.data.data
                 this.findObject(this.option.column, "isCleared").dicData = res.data.data
             })
             // 是否开发票
-            getWorkDicts('invoice_los').then(res=>{
-                this.findObject(this.option.column, "isInvoice").dicData = res.data.data
-            })
+            // getWorkDicts('invoice_los').then(res=>{
+            //     this.findObject(this.option.column, "isInvoice").dicData = res.data.data
+            // })
             // 是否
-            getWorkDicts('ifInvoice').then(res=>{
-                this.findObject(this.option.column, "corpIsSigned").dicData = res.data.data
-                this.findObject(this.option.column, "isTax").dicData = res.data.data
-            })
+            // getWorkDicts('ifInvoice').then(res=>{
+            //     // this.findObject(this.option.column, "corpIsSigned").dicData = res.data.data
+            //     this.findObject(this.option.column, "isTax").dicData = res.data.data
+            // })
         },
         // 获取币别数据
         getRateListfun(cnName){

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

@@ -388,7 +388,8 @@
                         </el-row>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="ETD" prop="etd" label-width="90px">
+                        <el-form-item label="ETD" prop="etd" label-width="90px"
+                                      :rules="[{required: true,message: '',trigger: 'blur' }]">
                         <span slot="label">
                              <span style="color: #1e9fff">ETD</span>
                         </span>

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

@@ -59,7 +59,7 @@
                           :clearable="true"
                           :remote="true"
                           :buttonIf="false"
-                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                          :forParameter="{key:'id',label:'cntrType',value:'cntrType'}"
                           @remoteMethod="remoteMethod($event,'cntrTypeCode')"
                           @corpChange="corpChange($event,row)"
                           @corpFocus="remoteMethod($event,'cntrTypeCode')" >
@@ -390,8 +390,8 @@ import {number} from "echarts";
         // 选择框的回调
         corpChange(value,row) {
             for (let item of this.cntrTypeCodeData) {
-                if (item.cnName == value) {
-                    this.$set(row,'cntrTypeCode',item.cnName)
+                if (item.cntrType == value) {
+                    this.$set(row,'cntrTypeCode',item.cntrType)
                     this.$set(row,'teu',item.teu)
                 }
             }

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

@@ -546,15 +546,10 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 disabled:true,
                             },
                             {
-                                label: "单据日期",
-                                prop: "billDate",
+                                label: "创建日期",
+                                prop: "createTime",
                                 type:'date',
-                                disabled:false,
-                                rules: [{
-                                    required: true,
-                                    message: " ",
-                                    trigger: "blur"
-                                }]
+                                disabled:true,
                             },
                         ],
                         [
@@ -1225,6 +1220,9 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                         if (!this.form.measurement) {
                             sum += ` 尺码`
                         }
+                        if (!this.form.etd) {
+                            sum += ` ETD`
+                        }
                         for (let item of this.form.feeCenterListD) {
                             if (!item.corpId) {
                                 sum += ` 应收序号${item.$index + 1}往来单位`
@@ -1261,6 +1259,8 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                             })
                             return;
                         }
+                        // 赋值 ETD 日期
+                        this.form.billDate = this.form.etd
                         // 调用保存接口
                         this.billsSubmitfun()
                     }

src/views/iosBasicData/amends/amendsDetails.vue

@@ -16,206 +16,205 @@
             <el-card class="box-card">
                 <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
                     <el-row>
-                        <el-col :span="6">
-                            <el-form-item label="业务编号:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                        <el-col :span="5">
+                            <el-form-item label="原M B/L NO:" prop="mblno">
+                                <el-input style="width: 100%;" v-model="form.mblno"
                                           size="small" autocomplete="off"
-                                          :disabled="true"
-                                          clearable placeholder="请输入业务编号" >
+                                          clearable placeholder="请输入原M B/L NO" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="制单日期:" prop="voucherDate">
-                                <el-date-picker v-model="form.voucherDate" clearable
-                                                style="width: 100%;"
-                                                type="date" size="small"
-                                                value-format="yyyy-MM-dd HH:mm"
-                                                placeholder="选择制单日期">
-                                </el-date-picker>
+                        <el-col :span="5">
+                            <el-form-item label="原H B/L NO:" prop="hblno">
+                                <el-input style="width: 100%;" v-model="form.hblno"
+                                          size="small" autocomplete="off"
+                                          clearable placeholder="请输入原H B/L NO" >
+                                </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="操作:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                        <el-col :span="5">
+                            <el-form-item label="原外提单号:" prop="refno">
+                                <el-input style="width: 100%;" v-model="form.refno"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入操作" >
+                                          clearable placeholder="请输入原外提单号" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="业务类型:" prop="businessType">
-                                <search-query :datalist="businessTypeData"
-                                              :selectValue="form.businessType"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :buttonIf="false"
-                                              placeholder="请选择业务类型">
-                                </search-query>
+                        <el-col :span="5">
+                            <el-form-item label="BOOKINGNO:" prop="bookingNo">
+                                <el-input style="width: 100%;" v-model="form.bookingNo"
+                                          size="small" autocomplete="off"
+                                          clearable placeholder="请输入BOOKINGNO" >
+                                </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="原业务编号:" prop="billNo">
+                        <el-col :span="4">
+                            <el-form-item label="AMEND原因:" prop="billNo">
                                 <el-input style="width: 100%;" v-model="form.billNo"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入原业务编号" >
+                                          clearable placeholder="请输入AMEND" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-col :span="16">
-                                <el-form-item label="委托人:" prop="billNo">
-                                    <el-input style="width: 100%;" v-model="form.billNo"
+                        <el-col :span="10">
+                            <el-col :span="15">
+                                <el-form-item label="客户名称:" prop="corpCnName">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName"
                                               size="small" autocomplete="off"
-                                              clearable placeholder="请输入委托人" >
+                                              :disabled="true"
+                                              clearable placeholder="客户名称" >
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="" prop="billNo" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-col :span="9">
+                                <el-form-item label="" prop="corpEnName" label-width="5px">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName"
                                               size="small" autocomplete="off"
-                                              clearable placeholder="请输入委托人" >
+                                              :disabled="true"
+                                              clearable placeholder="客户名称" >
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="发货人:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
-                                          size="small" autocomplete="off"
-                                          clearable placeholder="请输入发货人" >
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="原H B/L NO:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
-                                          size="small" autocomplete="off"
-                                          clearable placeholder="请输入原H B/L NO" >
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="原M B/L NO:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
-                                          size="small" autocomplete="off"
-                                          clearable placeholder="请输入原M B/L NO" >
-                                </el-input>
+                        <el-col :span="5">
+                            <el-form-item label="业务类型:" prop="businessType">
+                                <search-query :datalist="businessTypeData"
+                                              :selectValue="form.businessType"
+                                              :filterable="true"
+                                              :disabled="true"
+                                              :clearable="true"
+                                              :remote="true"
+                                              :buttonIf="false"
+                                              placeholder="业务类型">
+                                </search-query>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="原外提单号:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                        <el-col :span="5">
+                            <el-form-item label="原业务编号:" prop="billNo">
+                                <el-input style="width: 100%;" v-model="form.origBillNo"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入原外提单号" >
+                                          :disabled="true"
+                                          clearable placeholder="原业务编号" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="BOOKINGNO:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
-                                          size="small" autocomplete="off"
-                                          clearable placeholder="请输入BOOKINGNO" >
-                                </el-input>
+                        <el-col :span="4">
+                            <el-form-item label="制单日期:" prop="voucherDate">
+                                <el-date-picker v-model="form.voucherDate" clearable
+                                                style="width: 100%;"
+                                                type="date" size="small"
+                                                value-format="yyyy-MM-dd HH:mm"
+                                                placeholder="选择制单日期">
+                                </el-date-picker>
                             </el-form-item>
                         </el-col>
+
                         <el-col :span="5">
-                            <el-form-item label="船名:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-form-item label="船名:" prop="vesselCnName">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入船名" >
+                                          :disabled="true"
+                                          clearable placeholder="船名" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="航次:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-form-item label="航次:" prop="voyageNo">
+                                <el-input style="width: 100%;" v-model="form.voyageNo"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入航次" >
+                                          :disabled="true"
+                                          clearable placeholder="航次" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="ETD:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-form-item label="ETD:" prop="etd">
+                                <el-input style="width: 100%;" v-model="form.etd"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入ETD" >
+                                          :disabled="true"
+                                          clearable placeholder="ETD" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="箱量:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-form-item label="ETA:" prop="eta">
+                                <el-input style="width: 100%;" v-model="form.eta"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入箱量" >
+                                          :disabled="true"
+                                          clearable placeholder="ETA" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="ETA:" prop="billNo">
+                            <el-form-item label="业务编号:" prop="billNo">
                                 <el-input style="width: 100%;" v-model="form.billNo"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入ETA" >
+                                          :disabled="true"
+                                          clearable placeholder="业务编号" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="件数:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-form-item label="件数:" prop="quantity">
+                                <el-input style="width: 100%;" v-model="form.quantity"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入件数" >
+                                          :disabled="true"
+                                          clearable placeholder="件数" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="毛重:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-form-item label="毛重:" prop="grossWeight">
+                                <el-input style="width: 100%;" v-model="form.grossWeight"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入毛重" >
+                                          :disabled="true"
+                                          clearable placeholder="毛重" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="尺码:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                            <el-form-item label="尺码:" prop="measurement">
+                                <el-input style="width: 100%;" v-model="form.measurement"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入尺码" >
+                                          :disabled="true"
+                                          clearable placeholder="尺码" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="更改前内容:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                        <el-col :span="9">
+                            <el-form-item label="箱型箱量:" prop="quantityCntrDescr">
+                                <el-input style="width: 100%;" v-model="form.quantityCntrDescr"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入更改前内容" >
+                                          :disabled="true"
+                                          clearable placeholder="箱型箱量" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="4">
-                            <el-form-item label="" prop="billNo" label-width="50px">
-                                <el-button  size="small" type="primary" style="margin-right: 8px"
-                                            :loading="saveLoading" >提取原业务信息
-                                </el-button>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="AMEND:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                        <el-col :span="10">
+                            <el-form-item label="原业务备注:" prop="origRemarks">
+                                <el-input style="width: 100%;" v-model="form.origRemarks"
+                                          type="textarea"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入AMEND" >
+                                          :disabled="true"
+                                          clearable placeholder="原业务备注" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="19">
+                        <el-col :span="10">
                             <el-form-item label="备注:" prop="billNo">
-                                <el-input style="width: 100%;" v-model="form.billNo"
+                                <el-input style="width: 100%;" v-model="form.billNo" type="textarea"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入备注" >
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="" prop="billNo" label-width="50px">
+                                <el-button  size="small" type="primary" style="margin-right: 8px"
+                                            :loading="saveLoading" @click="retrievalfun" >提取原业务信息
+                                </el-button>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-form>
             </el-card>
@@ -226,13 +225,13 @@
                                 :loading="saveLoading" @click="addTablefun" >新增费用
                     </el-button>
                     <el-button type="danger" plain size="small">批量删除</el-button>
-                    <el-button type="success" plain size="small">应收账单
-                    </el-button>
-                    <el-button type="danger" plain size="small">撤销账单
-                    </el-button>
+                    <!--<el-button type="success" plain size="small">应收账单-->
+                    <!--</el-button>-->
+                    <!--<el-button type="danger" plain size="small">撤销账单-->
+                    <!--</el-button>-->
                     <el-button type="primary" plain size="small">打印账单</el-button>
-                    <el-button type="success" plain size="small">应收模板</el-button>
-                    <el-button type="info" plain size="small">保存账单</el-button>
+                    <!--<el-button type="success" plain size="small">应收模板</el-button>-->
+                    <!--<el-button type="info" plain size="small">保存账单</el-button>-->
                 </div>
                 <amends-costdetails :tableData="tableData"></amends-costdetails>
             </el-card>
@@ -251,6 +250,7 @@
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
     import amendsCostdetails from "@/views/iosBasicData/amends/assembly/amendsCostdetails.vue";
     import billgenerated from "@/views/iosBasicData/amends/assembly/billgenerated.vue";
+    import {billsGetDetail} from "@/api/iosBasicData/bills";
 
     export default {
         components: {SearchQuery,amendsCostdetails,billgenerated},
@@ -278,6 +278,21 @@
                     edit:true
                 })
             },
+            // 检索
+            retrievalfun(){
+                if (!this.form.mblno && !this.form.hblno && !this.form.refno && !this.form.bookingNo) {
+                    return this.$message.warning('请填写至少一项检索条件')
+                }
+                billsGetDetail({
+                    mblno:this.form.mblno?this.form.mblno:null,
+                    hblno:this.form.hblno?this.form.hblno:null,
+                    refno:this.form.refno?this.form.refno:null,
+                    bookingNo:this.form.bookingNo?this.form.bookingNo:null
+                }).then(res=>{
+                    console.log(res,292)
+
+                })
+            },
             //返回列表
             backToList() {
                 this.$emit('goBack')

src/views/iosBasicData/amends/index.vue

@@ -74,108 +74,84 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            {
-              label: "业务类型, SEA=海运出口AMEND SIA=海运进口AMEND",
-              prop: "businessType",
-              rules: [{
-                required: true,
-                message: "请输入业务类型, SEA=海运出口AMEND SIA=海运进口AMEND",
-                trigger: "blur"
-              }]
-            },
+              {
+                  label: "客户名称",
+                  prop: "corpCnName",
+                  overHidden:true,
+              },
+              {
+                  label: "原MB/L NO",
+                  prop: "mblno",
+                  overHidden:true,
+              },
+              {
+                  label: "原HB/L NO",
+                  prop: "hblno",
+                  overHidden:true,
+              },
+              {
+                  label: "原船名",
+                  prop: "vesselCnName",
+                  overHidden:true,
+              },
+              {
+                  label: "原航次",
+                  prop: "voyageNo",
+                  overHidden:true,
+              },
+              {
+                  label: "原Reference NO",
+                  prop: "refno",
+                  overHidden:true,
+              },
+              {
+                  label: "原开船日期",
+                  prop: "etd",
+                  overHidden:true,
+              },
             {
               label: "单据编号",
               prop: "billNo",
-              rules: [{
-                required: true,
-                message: "请输入单据编号",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "单据日期",
               prop: "billDate",
-              rules: [{
-                required: true,
-                message: "请输入单据日期",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "财务日期",
               prop: "accountDate",
-              rules: [{
-                required: true,
-                message: "请输入财务日期",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "操作 Id",
-              prop: "operatorId",
-              rules: [{
-                required: true,
-                message: "请输入操作 Id",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "操作",
               prop: "operatorName",
-              rules: [{
-                required: true,
-                message: "请输入操作",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "责任方",
               prop: "responsibleParty",
-              rules: [{
-                required: true,
-                message: "请输入责任方",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "原业务 id",
-              prop: "origId",
-              rules: [{
-                required: true,
-                message: "请输入原业务 id",
-                trigger: "blur"
-              }]
             },
             {
               label: "单据编号",
               prop: "origBillNo",
-              rules: [{
-                required: true,
-                message: "请输入单据编号",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "单据日期",
               prop: "origBillDate",
-              rules: [{
-                required: true,
-                message: "请输入单据日期",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "财务日期",
               prop: "origAccountDate",
-              rules: [{
-                required: true,
-                message: "请输入财务日期",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
-              label: "进出口, E=出口 I=进口",
+              label: "进出口",
               prop: "origSeaType",
+              overHidden:true,
               rules: [{
                 required: true,
                 message: "请输入进出口, E=出口 I=进口",
@@ -183,8 +159,9 @@
               }]
             },
             {
-              label: "单据类型, DD=直单(默认) MM=主单 MH=主分单 HH=从分单",
+              label: "单据类型",
               prop: "origBillType",
+              overHidden:true,
               rules: [{
                 required: true,
                 message: "请输入单据类型, DD=直单(默认) MM=主单 MH=主分单 HH=从分单",
@@ -194,303 +171,98 @@
             {
               label: "原业务备注",
               prop: "origRemarks",
-              rules: [{
-                required: true,
-                message: "请输入原业务备注",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "客户 id",
-              prop: "corpId",
-              rules: [{
-                required: true,
-                message: "请输入客户 id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "客户中文名称",
-              prop: "corpCnName",
-              rules: [{
-                required: true,
-                message: "请输入客户中文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "客户英文名称",
               prop: "corpEnName",
-              rules: [{
-                required: true,
-                message: "请输入客户英文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "客户约号",
               prop: "corpArgreementNo",
-              rules: [{
-                required: true,
-                message: "请输入客户约号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "航线 id",
-              prop: "lineId",
-              rules: [{
-                required: true,
-                message: "请输入航线 id",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "航线中文名称",
               prop: "lineCnName",
-              rules: [{
-                required: true,
-                message: "请输入航线中文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "航线英文名称",
               prop: "lineEnName",
-              rules: [{
-                required: true,
-                message: "请输入航线英文名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "船公司 id",
-              prop: "carrierId",
-              rules: [{
-                required: true,
-                message: "请输入船公司 id",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "船公司中文名称",
               prop: "carrierCnName",
-              rules: [{
-                required: true,
-                message: "请输入船公司中文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "船公司英文名称",
               prop: "carrierEnName",
-              rules: [{
-                required: true,
-                message: "请输入船公司英文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "船公司约号",
               prop: "carrierArgreementNo",
-              rules: [{
-                required: true,
-                message: "请输入船公司约号",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "订舱号",
               prop: "bookingNo",
-              rules: [{
-                required: true,
-                message: "请输入订舱号",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "订舱日期",
               prop: "bookingDate",
-              rules: [{
-                required: true,
-                message: "请输入订舱日期",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "船名 id",
-              prop: "vesselId",
-              rules: [{
-                required: true,
-                message: "请输入船名 id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "中文船名",
-              prop: "vesselCnName",
-              rules: [{
-                required: true,
-                message: "请输入中文船名",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "英文船名",
               prop: "vesselEnName",
-              rules: [{
-                required: true,
-                message: "请输入英文船名",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "航次",
-              prop: "voyageNo",
-              rules: [{
-                required: true,
-                message: "请输入航次",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "MB/L NO",
-              prop: "mblno",
-              rules: [{
-                required: true,
-                message: "请输入MB/L NO",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "HB/L NO",
-              prop: "hblno",
-              rules: [{
-                required: true,
-                message: "请输入HB/L NO",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "Reference NO",
-              prop: "refno",
-              rules: [{
-                required: true,
-                message: "请输入Reference NO",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "开船日期",
-              prop: "etd",
-              rules: [{
-                required: true,
-                message: "请输入开船日期",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
+
             {
               label: "到港日期",
               prop: "eta",
-              rules: [{
-                required: true,
-                message: "请输入到港日期",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "装货港 id",
-              prop: "polId",
-              rules: [{
-                required: true,
-                message: "请输入装货港 id",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "装货港代码",
               prop: "polCode",
-              rules: [{
-                required: true,
-                message: "请输入装货港代码",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "装货港英文名称",
               prop: "polCnName",
-              rules: [{
-                required: true,
-                message: "请输入装货港英文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "装货港英文名称",
               prop: "polEnName",
-              rules: [{
-                required: true,
-                message: "请输入装货港英文名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "装货港英文名称打印 默认等于pol_en_name 可以编辑",
-              prop: "polNamePrint",
-              rules: [{
-                required: true,
-                message: "请输入装货港英文名称打印 默认等于pol_en_name 可以编辑",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "卸货港 id",
-              prop: "podId",
-              rules: [{
-                required: true,
-                message: "请输入卸货港 id",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "卸货港代码",
               prop: "podCode",
-              rules: [{
-                required: true,
-                message: "请输入卸货港代码",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "卸货港中文名称",
               prop: "podCnName",
-              rules: [{
-                required: true,
-                message: "请输入卸货港中文名称",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "卸货港英文名称",
               prop: "podEnName",
-              rules: [{
-                required: true,
-                message: "请输入卸货港英文名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "卸货港英文名称打印 默认等于pol_en_name 可以编辑",
-              prop: "podNamePrint",
-              rules: [{
-                required: true,
-                message: "请输入卸货港英文名称打印 默认等于pol_en_name 可以编辑",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
-              label: "货物类别 dry=普货 danger=危险品 reefer=冻柜",
+              label: "货物类别",
               prop: "cargoType",
+              overHidden:true,
               rules: [{
                 required: true,
                 message: "请输入货物类别 dry=普货 danger=危险品 reefer=冻柜",
@@ -498,80 +270,44 @@
               }]
             },
             {
-              label: "包装单位 Id",
-              prop: "packingUnitId",
-              rules: [{
-                required: true,
-                message: "请输入包装单位 Id",
-                trigger: "blur"
-              }]
-            },
-            {
               label: "包装单位",
               prop: "packingUnit",
-              rules: [{
-                required: true,
-                message: "请输入包装单位",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
               label: "件数",
               prop: "quantity",
-              rules: [{
-                required: true,
-                message: "请输入件数",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
               label: "毛重 (KGM)",
               prop: "grossWeight",
-              rules: [{
-                required: true,
-                message: "请输入毛重 (KGM)",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
               label: "净重 (KGM)",
               prop: "netWeight",
-              rules: [{
-                required: true,
-                message: "请输入净重 (KGM)",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "体积 (CBM)",
               prop: "measurement",
-              rules: [{
-                required: true,
-                message: "请输入体积 (CBM)",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
               label: "集装箱箱数英文, ",
               prop: "quantityCntrDescr",
-              rules: [{
-                required: true,
-                message: "请输入集装箱箱数英文, ",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
               label: "商品包装件数英文, ",
               prop: "quantityPackingDescr",
-              rules: [{
-                required: true,
-                message: "请输入商品包装件数英文, ",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
-              label: "集装箱箱型箱数英文, 1*20GP,2*40HC",
+              label: "集装箱箱型箱数英文",
               prop: "quantityCntrTypesDescr",
+                overHidden:true,
               rules: [{
                 required: true,
                 message: "请输入集装箱箱型箱数英文, 1*20GP,2*40HC",
@@ -581,29 +317,17 @@
             {
               label: "状态（业务参数配置）",
               prop: "billStatus",
-              rules: [{
-                required: true,
-                message: "请输入状态（业务参数配置）",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
               label: "财务状态（业务参数配置）",
               prop: "accountStatus",
-              rules: [{
-                required: true,
-                message: "请输入财务状态（业务参数配置）",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
             {
               label: "备注",
               prop: "remarks",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
+                overHidden:true,
             },
           ]
         },

src/views/iosBasicData/fininvoices/index.vue

@@ -93,7 +93,7 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 18,
           border: true,
           index: true,
           viewBtn: true,
@@ -112,6 +112,33 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
               prop: "billDate",
               overHidden:true,
             },
+              {
+                  label: "发票日期",
+                  prop: "invoiceDate",
+                  overHidden:true,
+              },
+              {
+                  label: "单据开始日期",
+                  prop: "invoiceDateStart",
+                  search:true,
+                  overHidden:true,
+                  hide:true,
+                  searchLabelWidth:"100",
+                  type: "date",
+                  format: "yyyy-MM-dd",
+                  valueFormat: "yyyy-MM-dd HH:mm:ss",
+              },
+              {
+                  label: "单据结束日期",
+                  prop: "invoiceDateEnd",
+                  search:true,
+                  overHidden:true,
+                  hide:true,
+                  searchLabelWidth:"100",
+                  type: "date",
+                  format: "yyyy-MM-dd",
+                  valueFormat: "yyyy-MM-dd HH:mm:ss",
+              },
             {
               label: "发票号码",
               prop: "invoiceNo",
@@ -119,11 +146,6 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
               overHidden:true,
             },
             {
-              label: "开票日期",
-              prop: "invoiceDate",
-              overHidden:true,
-            },
-            {
               label: "原发票号码",
               prop: "origInvoiceNo",
               width:120,

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -94,7 +94,7 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvo
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 12,
+          searchMenuSpan: 6,
           border: true,
           index: true,
           viewBtn: true,
@@ -155,15 +155,31 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvo
                 overHidden:true,
             },
             {
-              label: "开票日期",
+              label: "单据日期",
               prop: "invoiceDate",
+              overHidden:true,
+            },
+            {
+                label: "单据开始日期",
+                prop: "invoiceDateStart",
+                search:true,
+                overHidden:true,
+                hide:true,
+                searchLabelWidth:"100",
+                type: "date",
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+                label: "单据结束日期",
+                prop: "invoiceDateEnd",
                 search:true,
-              rules: [{
-                required: true,
-                message: "请输入开票日期",
-                trigger: "blur"
-              }],
                 overHidden:true,
+                hide:true,
+                searchLabelWidth:"100",
+                type: "date",
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd HH:mm:ss",
             },
             {
               label: "原发票号码",

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -141,7 +141,7 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
             calcHeight: 30,
             tip: false,
             searchShow: true,
-            searchMenuSpan: 18,
+            searchMenuSpan: 12,
             border: true,
             index: true,
             selection: true,
@@ -163,9 +163,30 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
                   {
                       label: "单据日期",
                       prop: "billDate",
-                      search:true,
                       overHidden:true,
                   },
+                {
+                    label: "单据开始日期",
+                    prop: "invoiceDateStart",
+                    search:true,
+                    overHidden:true,
+                    hide:true,
+                    searchLabelWidth:"100",
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd HH:mm:ss",
+                },
+                {
+                    label: "单据结束日期",
+                    prop: "invoiceDateEnd",
+                    search:true,
+                    overHidden:true,
+                    hide:true,
+                    searchLabelWidth:"100",
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd HH:mm:ss",
+                },
                   {
                       label: "客户名称",
                       prop: "corpCnName",
@@ -285,16 +306,32 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
                     overHidden:true,
                 },
                 {
-                    label: "开票日期",
+                    label: "单据日期",
                     prop: "invoiceDate",
-                    search:true,
-                    rules: [{
-                        required: true,
-                        message: "请输入开票日期",
-                        trigger: "blur"
-                    }],
                     overHidden:true,
                 },
+              {
+                  label: "单据开始日期",
+                  prop: "invoiceDateStart",
+                  search:true,
+                  overHidden:true,
+                  hide:true,
+                  searchLabelWidth:"100",
+                  type: "date",
+                  format: "yyyy-MM-dd",
+                  valueFormat: "yyyy-MM-dd HH:mm:ss",
+              },
+              {
+                  label: "单据结束日期",
+                  prop: "invoiceDateEnd",
+                  search:true,
+                  overHidden:true,
+                  hide:true,
+                  searchLabelWidth:"100",
+                  type: "date",
+                  format: "yyyy-MM-dd",
+                  valueFormat: "yyyy-MM-dd HH:mm:ss",
+              },
                 {
                     label: "原发票号码",
                     prop: "origInvoiceNo",
@@ -708,7 +745,6 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
       // 获取币别数据
       getRateListfun(){
           getRateList({current:1,size:20}).then(res=>{
-              console.log(res,696)
               this.findObject(this.applyOptionBack.column, "invCurCode").dicData = res.data.data.records
           })
       },
@@ -838,6 +874,7 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
           if(this.tabsValue == '申请') {
               this.applyQuery = params;
               this.applyPage.currentPage = 1;
+              this.applyQuery.billDateList = []
               this.onLoad(this.applyPage, params);
           }else {
               this.query = params;

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -30,57 +30,6 @@
                 <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
                     <el-row>
                         <el-row>
-                            <el-col :span="5">
-                                <el-form-item label="对账单号" prop="checkNo">
-                                    <el-input style="width: 100%;" v-model="form.billNo"
-                                              size="small" autocomplete="off"
-                                              :disabled="true"
-                                              clearable placeholder="请输入对账单号" >
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="对账日期" prop="billDate">
-                                    <el-date-picker v-model="form.billDate" clearable
-                                                    style="width: 100%;"
-                                                    type="date" size="small"
-                                                    :disabled="editSave"
-                                                    value-format="yyyy-MM-dd HH:mm"
-                                                    placeholder="选择对账日期">
-                                    </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="限定金额" prop="limitedAmount">
-                                    <el-input style="width: 100%;" v-model="form.limitedAmount"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入对账单号" >
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="备注" prop="remarks" >
-                                    <el-input style="width: 100%;" v-model="form.remarks"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入备注" >
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="4">
-                                <el-form-item label="审核" prop="isApproved" label-width="50px">
-                                    <search-query :datalist="allyesnoData"
-                                                  :selectValue="form.isApproved"
-                                                  :clearable="true"
-                                                  :disabled="editSave"
-                                                  :buttonIf="false"
-                                                  :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                                                  @corpChange="corpChange($event,'isApproved')"
-                                                  @corpFocus="allyesnoWorkDictsfun" >
-                                    </search-query>
-                                </el-form-item>
-                            </el-col>
                             <el-col :span="10">
                                 <el-form-item label="对账单位" prop="corpCnName">
                                     <el-col :span="10">
@@ -115,43 +64,217 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="5">
-                                <el-form-item label="协议签订人" prop="corpAccRemarks">
-                                    <el-input style="width: 100%;" v-model="form.corpAccRemarks"
+                                <el-form-item label="船 名" prop="vesselCnName" >
+                                    <el-input style="width: 100%;" v-model="form.vesselCnName"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
-                                              clearable placeholder="请输入协议签订人" >
-                                    </el-input>
+                                              clearable placeholder="请选择船名" ></el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="5">
-                                <el-form-item label="业务类型" prop="businessTypes" >
-                                    <search-query :datalist="businessTypesData"
-                                                  :selectValue="form.businessTypes"
+                                <el-form-item label="航 次" prop="voyageNo" >
+                                    <el-input style="width: 100%;" v-model="form.voyageNo"
+                                              size="small" autocomplete="off"
+                                              :disabled="editSave"
+                                              clearable placeholder="请选择航次" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="4">
+                                <el-form-item label="审核" prop="isApproved" label-width="50px">
+                                    <search-query :datalist="allyesnoData"
+                                                  :selectValue="form.isApproved"
                                                   :clearable="true"
                                                   :disabled="editSave"
                                                   :buttonIf="false"
-                                                  :multiple="true"
-                                                  @corpChange="corpChange($event,'businessTypes')">
+                                                  :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                                                  @corpChange="corpChange($event,'isApproved')"
+                                                  @corpFocus="allyesnoWorkDictsfun" >
                                     </search-query>
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="5">
+                                <el-form-item label="JOB NO" prop="businessNo">
+                                    <el-input style="width: 100%;" v-model="form.businessNo"
+                                              size="small" autocomplete="off"
+                                              :disabled="editSave"
+                                              clearable placeholder="请输入JOB NO" >
+                                    </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="5">
+                                <el-form-item label="ACCT NO" prop="accountNo">
+                                    <el-input style="width: 100%;" v-model="form.accountNo"
+                                              size="small" autocomplete="off"
+                                              :disabled="editSave"
+                                              clearable placeholder="请输入ACCT NO" >
+                                    </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="5">
+                                <el-form-item label="MBL NO" prop="mblno">
+                                    <el-input style="width: 100%;" v-model="form.mblno"
+                                              size="small" autocomplete="off"
+                                              :disabled="editSave"
+                                              clearable placeholder="请输入MBL NO" >
+                                    </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="5">
+                                <el-form-item label="HBL NO" prop="hblno">
+                                    <el-input style="width: 100%;" v-model="form.hblno"
+                                              size="small" autocomplete="off"
+                                              :disabled="editSave"
+                                              clearable placeholder="请输入HBL NO" >
+                                    </el-input>
+                                </el-form-item>
+                            </el-col>
                             <el-col :span="4">
-                                <el-form-item label="签收" prop="isSignfor" label-width="50px">
+                                <el-form-item label="对账" prop="isChecked" label-width="50px">
                                     <search-query :datalist="allyesnoData"
-                                                  :selectValue="form.isSignfor"
+                                                  :selectValue="form.isChecked"
                                                   :clearable="true"
                                                   :disabled="editSave"
                                                   :buttonIf="false"
                                                   :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                                                  @corpChange="corpChange($event,'isSignfor')"
+                                                  @corpChange="corpChange($event,'isChecked')"
                                                   @corpFocus="allyesnoWorkDictsfun" >
                                     </search-query>
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="4">
+                                <el-form-item label="业务开始日期" prop="businessDateStart">
+                                    <el-date-picker v-model="form.businessDateStart" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择财务开始日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="4">
+                                <el-form-item label="业务结束日期" prop="businessDateEnd">
+                                    <el-date-picker v-model="form.businessDateEnd" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择财务结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="4">
+                                <el-form-item label="财务开始日期" prop="accountDateFrom">
+                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择财务开始日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="4">
+                                <el-form-item label="财务结束日期" prop="accountDateTo">
+                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择财务结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="4">
+                                <el-form-item label="审核开始期间" prop="auditDateFrom">
+                                    <el-date-picker v-model="form.auditDateFrom" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择审核开始日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="4">
+                                <el-form-item label="审核结束期间" prop="auditDateTo">
+                                    <el-date-picker v-model="form.auditDateTo" clearable
+                                                    style="width: 100%;"
+                                                    type="date" size="small"
+                                                    :disabled="editSave"
+                                                    format="yyyy-MM-dd"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="选择审核结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
                         </el-row>
                         <expand :showBtn="true" :showSpan="true">
                             <el-row>
                                 <el-col :span="5">
+                                    <el-form-item label="操作员" prop="updateUserName" >
+                                        <search-query :datalist="updateUserData"
+                                                      :selectValue="form.updateUserName"
+                                                      :clearable="true"
+                                                      :disabled="editSave"
+                                                      :buttonIf="false"
+                                                      :filterable="true"
+                                                      :remote="true"
+                                                      :forParameter="{ key:'id', label:'name', value:'name'}"
+                                                      @corpChange="corpChange($event,'updateUserName')"
+                                                      @remoteMethod="updateUserUserGetListfun"
+                                                      @corpFocus="updateUserUserGetListfun" >
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="BKNO" prop="bookingNo" >
+                                        <el-input style="width: 100%;" v-model="form.bookingNo"
+                                                  size="small" autocomplete="off"
+                                                  :disabled="editSave"
+                                                  clearable placeholder="请输入BKNO" ></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="协议签订人" prop="corpAccRemarks">
+                                        <el-input style="width: 100%;" v-model="form.corpAccRemarks"
+                                                  size="small" autocomplete="off"
+                                                  :disabled="editSave"
+                                                  clearable placeholder="请输入协议签订人" >
+                                        </el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="业务类型" prop="businessTypes" >
+                                        <search-query :datalist="businessTypesData"
+                                                      :selectValue="form.businessTypes"
+                                                      :clearable="true"
+                                                      :disabled="editSave"
+                                                      :buttonIf="false"
+                                                      :multiple="true"
+                                                      @corpChange="corpChange($event,'businessTypes')">
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="4">
+                                    <el-form-item label="发票" prop="isChecked" label-width="50px">
+                                        <search-query :datalist="isInvoiceData"
+                                                      :selectValue="form.isInvoice"
+                                                      :clearable="true"
+                                                      :disabled="editSave"
+                                                      :buttonIf="false"
+                                                      :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                                                      @corpChange="corpChange($event,'isInvoice')"
+                                                      @corpFocus="invoiceWorkDictsfun" >
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="5">
                                     <el-form-item label="收 / 付" prop="dc">
                                         <search-query :datalist="dcData"
                                                       :selectValue="form.dc"
@@ -205,196 +328,69 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
-                                    <el-form-item label="销账" prop="isCleared" label-width="50px">
+                                    <el-form-item label="签收" prop="isSignfor" label-width="50px">
                                         <search-query :datalist="allyesnoData"
-                                                      :selectValue="form.isCleared"
+                                                      :selectValue="form.isSignfor"
                                                       :clearable="true"
                                                       :disabled="editSave"
                                                       :buttonIf="false"
                                                       :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                                                      @corpChange="corpChange($event,'isCleared')"
+                                                      @corpChange="corpChange($event,'isSignfor')"
                                                       @corpFocus="allyesnoWorkDictsfun" >
                                         </search-query>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
-                                    <el-form-item label="JOB NO" prop="businessNo">
-                                        <el-input style="width: 100%;" v-model="form.businessNo"
+                                    <el-form-item label="对账单号" prop="checkNo">
+                                        <el-input style="width: 100%;" v-model="form.billNo"
                                                   size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入JOB NO" >
+                                                  :disabled="true"
+                                                  clearable placeholder="请输入对账单号" >
                                         </el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
-                                    <el-form-item label="ACCT NO" prop="accountNo">
-                                        <el-input style="width: 100%;" v-model="form.accountNo"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入ACCT NO" >
-                                        </el-input>
+                                    <el-form-item label="对账日期" prop="billDate">
+                                        <el-date-picker v-model="form.billDate" clearable
+                                                        style="width: 100%;"
+                                                        type="date" size="small"
+                                                        :disabled="editSave"
+                                                        value-format="yyyy-MM-dd HH:mm"
+                                                        placeholder="选择对账日期">
+                                        </el-date-picker>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
-                                    <el-form-item label="MBL NO" prop="mblno">
-                                        <el-input style="width: 100%;" v-model="form.mblno"
+                                    <el-form-item label="限定金额" prop="limitedAmount">
+                                        <el-input style="width: 100%;" v-model="form.limitedAmount"
                                                   size="small" autocomplete="off"
                                                   :disabled="editSave"
-                                                  clearable placeholder="请输入MBL NO" >
+                                                  clearable placeholder="请输入对账单号" >
                                         </el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
-                                    <el-form-item label="HBL NO" prop="hblno">
-                                        <el-input style="width: 100%;" v-model="form.hblno"
+                                    <el-form-item label="备注" prop="remarks" >
+                                        <el-input style="width: 100%;" v-model="form.remarks"
                                                   size="small" autocomplete="off"
                                                   :disabled="editSave"
-                                                  clearable placeholder="请输入HBL NO" >
+                                                  clearable placeholder="请输入备注" >
                                         </el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
-                                    <el-form-item label="对账" prop="isChecked" label-width="50px">
+                                    <el-form-item label="销账" prop="isCleared" label-width="50px">
                                         <search-query :datalist="allyesnoData"
-                                                      :selectValue="form.isChecked"
+                                                      :selectValue="form.isCleared"
                                                       :clearable="true"
                                                       :disabled="editSave"
                                                       :buttonIf="false"
                                                       :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                                                      @corpChange="corpChange($event,'isChecked')"
+                                                      @corpChange="corpChange($event,'isCleared')"
                                                       @corpFocus="allyesnoWorkDictsfun" >
                                         </search-query>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="财务日期" prop="etd">
-                                        <el-date-picker
-                                            v-model="form.accountDate"
-                                            type="datetimerange"
-                                            range-separator="至"
-                                            start-placeholder="开始日期"
-                                            end-placeholder="结束日期"
-                                            style="width: 100%;"
-                                            size="small"
-                                            :disabled="editSave"
-                                            format="yyyy-MM-dd"
-                                            value-format="yyyy-MM-dd"
-                                            placeholder="选择财务日期">
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="审核期间" prop="etd">
-                                        <el-date-picker
-                                            v-model="form.approvedDate"
-                                            type="datetimerange"
-                                            range-separator="至"
-                                            start-placeholder="开始日期"
-                                            end-placeholder="结束日期"
-                                            style="width: 100%;"
-                                            size="small"
-                                            :disabled="editSave"
-                                            format="yyyy-MM-dd"
-                                            value-format="yyyy-MM-dd"
-                                            placeholder="选择对账日期">
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="查询金额" prop="queryAmount">
-                                        <el-input style="width: 100%;" v-model="form.queryAmount"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入查询金额" >
-                                        </el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="账期备注" prop="corpAccRemarks">
-                                        <el-input style="width: 100%;" v-model="form.corpAccRemarks"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入账期备注" >
-                                        </el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-form-item label="发票" prop="isChecked" label-width="50px">
-                                        <search-query :datalist="isInvoiceData"
-                                                      :selectValue="form.isInvoice"
-                                                      :clearable="true"
-                                                      :disabled="editSave"
-                                                      :buttonIf="false"
-                                                      :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                                                      @corpChange="corpChange($event,'isInvoice')"
-                                                      @corpFocus="invoiceWorkDictsfun" >
-                                        </search-query>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="船 名" prop="vesselCnName" >
-                                        <el-input style="width: 100%;" v-model="form.vesselCnName"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请选择船名" ></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="航 次" prop="voyageNo" >
-                                        <el-input style="width: 100%;" v-model="form.voyageNo"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请选择航次" ></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="三检单号" prop="threeInspectionsNo" >
-                                        <el-input style="width: 100%;" v-model="form.threeInspectionsNo"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入三检单号" ></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="预收帐款" prop="receivableAdvance" >
-                                        <el-input style="width: 100%;" v-model="form.receivableAdvance"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入预收帐款" ></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-form-item label="发票号" prop="invoiceNo" label-width="50px">
-                                        <el-input style="width: 100%;" v-model="form.invoiceNo"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入发票号" ></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="操作员" prop="updateUserName" >
-                                        <search-query :datalist="updateUserData"
-                                                      :selectValue="form.updateUserName"
-                                                      :clearable="true"
-                                                      :disabled="editSave"
-                                                      :buttonIf="false"
-                                                      :filterable="true"
-                                                      :remote="true"
-                                                      :forParameter="{ key:'id', label:'name', value:'name'}"
-                                                      @corpChange="corpChange($event,'updateUserName')"
-                                                      @remoteMethod="updateUserUserGetListfun"
-                                                      @corpFocus="updateUserUserGetListfun" >
-                                        </search-query>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="BKNO" prop="bookingNo" >
-                                        <el-input style="width: 100%;" v-model="form.bookingNo"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请输入BKNO" ></el-input>
-                                    </el-form-item>
-                                </el-col>
                             </el-row>
                         </expand>
 
@@ -523,6 +519,8 @@
                     isCleared:'0',
                     isChecked:'0',
                     isInvoice:'0',
+                    accountDate:[],
+                    approvedDate:[],
                 },
                 handleSelectionData:[], // 表格选择的数据
                 corpData:[], // 对账单位 数据
@@ -710,7 +708,13 @@
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账单
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.auditDateFrom = this.form.auditDateFrom?this.form.auditDateFrom.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                 if (!this.form.id) {
                     this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
                         item.lineNo = Number(index) + 1
@@ -798,11 +802,6 @@
                     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 = {}
@@ -830,14 +829,12 @@
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.threeInspectionsNo = this.form.threeInspectionsNo // 三检单号
                 obj.voyageNo = this.form.voyageNo // 航次
-                // 审核期间
-                if (this.form.approvedDate) {
-                    obj.approveTimeList = this.form.approvedDate
-                }
-                // 财务期间
-                // if (this.form.accountDate) {
-                //     obj.billDateList = this.form.accountDate
-                // }
+                obj.businessDateStart = this.form.businessDateStart // 业务开始日期
+                obj.businessDateEnd = this.form.businessDateEnd // 业务结束日期
+                obj.billDateStart = this.form.accountDateFrom // 财务开始日期
+                obj.billDateEnd = this.form.accountDateTo // 财务开始日期
+                obj.approveTimeStart = this.form.auditDateFrom // 审核开始日期
+                obj.approveTimeEnd = this.form.auditDateTo // 审核结束日期
                 finstlbillslistAccBillV1(obj).then(res=>{
                     this.tableData = res.data.data.map((item,index)=>{
                         item.lineNo = Number(index) + 1
@@ -850,13 +847,13 @@
                             this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
                             this.$set(item,'unsettledAmountRMB',item.unsettledAmount)
                             this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
-                            this.$set(item,'currentStlAmountRMB',Number(item.amount) - Number(item.stlTtlAmount))
+                            this.$set(item,'currentStlAmountRMB',item.reconciliationCurrentAmount)
                         }else {
                             this.$set(item,'amountUSD',item.amount)
                             this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
                             this.$set(item,'unsettledAmountUSD',item.unsettledAmount)
                             this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
-                            this.$set(item,'currentStlAmountUSD',(Number(item.amount) - Number(item.stlTtlAmount)).toFixed(2))
+                            this.$set(item,'currentStlAmountUSD',item.reconciliationCurrentAmount)
                         }
                         return item
                     })
@@ -879,6 +876,13 @@
                 }).then(()=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.auditDateFrom = this.form.auditDateFrom?this.form.auditDateFrom.slice(0,10) + ' 00:00:00':null
+                    this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+                    this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null
+                    this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null
+                    this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     this.form.url = '/iosBasicData/finstlbills/index',
                     this.form.pageStatus = "this.$store.getters.paidapplication"
                     this.form.pageLabel = "对账中心(F)"
@@ -901,6 +905,13 @@
                 }).then(()=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.auditDateFrom = this.form.auditDateFrom?this.form.auditDateFrom.slice(0,10) + ' 00:00:00':null
+                    this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+                    this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null
+                    this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null
+                    this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     finstlbillsRevokeReconciliation(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');

src/views/iosBasicData/finstlbills/index.vue

@@ -112,17 +112,32 @@
               overHidden:true,
             },
             {
-              label: "对账日期",
-              prop: "billDate",
+                label: "对账日期",
+                prop: "billDate",
+                overHidden:true,
+                width:"150",
+            },
+            {
+              label: "业务开始日期",
+              prop: "businessDateStart",
               search:true,
               overHidden:true,
-              searchProp: 'billDateList',
-              type: "daterange",
-              searchRange: true,
-              searchDefaultTime: ["00:00:00", "23:59:59"],
+              hide:true,
+              searchLabelWidth:"100",
+              type: "date",
               format: "yyyy-MM-dd",
               valueFormat: "yyyy-MM-dd HH:mm:ss",
-              width:"150",
+            },
+            {
+                label: "业务结束日期",
+                prop: "businessDateEnd",
+                search:true,
+                overHidden:true,
+                hide:true,
+                searchLabelWidth:"100",
+                type: "date",
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd HH:mm:ss",
             },
             {
               label: "客户名称",
@@ -624,6 +639,7 @@
         this.query = {};
         this.onLoad(this.page);
       },
+        // 搜索
       searchChange(params, done) {
         this.query = params;
         this.page.currentPage = 1;
@@ -685,7 +701,7 @@
             })
             // 是否
             getWorkDicts('ifInvoice').then(res=>{
-                this.findObject(this.option.column, "corpIsSigned").dicData = res.data.data
+                // this.findObject(this.option.column, "corpIsSigned").dicData = res.data.data
                 this.findObject(this.option.column, "isTax").dicData = res.data.data
             })
         },