货代bug 2024-1-11

src/views/billM/billingCenter/index.vue

@@ -96,7 +96,7 @@
               label: "账单编号",
               prop: "billNo",
               search: true,
-              width:"180",
+              width:180,
               overHidden:true,
               rules: [{
                 required: true,
@@ -108,7 +108,7 @@
               label: "账单日期",
               prop: "billDate",
               type: "date",
-              width:"100",
+              width:100,
               valueFormat:'yyyy-MM-dd',
               format: 'yyyy-MM-dd',
               overHidden:true,
@@ -156,7 +156,7 @@
                   prop: "accountDateList",
                   search: true,
                   hide: true,
-                  width:"100",
+                  width:100,
                   type: 'daterange',
                   format:'yyyy-MM-dd',
                   valueFormat:'yyyy-MM-dd',
@@ -190,7 +190,7 @@
               label: "业务单据编号",
               prop: "businessBillNo",
               search: true,
-              width:"180",
+              width:180,
               overHidden:true,
               rules: [{
                 required: true,
@@ -202,7 +202,7 @@
               label: "业务单据日期",
               prop: "businessDate",
               type: "date",
-              width:"180",
+              width:180,
               valueFormat:'yyyy-MM-dd',
               format: 'yyyy-MM-dd',
               overHidden:true,
@@ -217,7 +217,7 @@
                   prop: "businessDateList",
                   search: true,
                   hide: true,
-                  width:"100",
+                  width:100,
                   overHidden:true,
                   type: 'daterange',
                   format:'yyyy-MM-dd',
@@ -257,7 +257,7 @@
               label: "结算单位",
               prop: "corpCnName",
               search: true,
-              width:"180",
+              width:180,
               overHidden:true,
               type:'select',
               filterable:true,
@@ -276,7 +276,7 @@
               label: "客户中文名称",
               prop: "billCorpCnName",
               search: true,
-              width:"180",
+              width:180,
               overHidden:true,
               type:'select',
               filterable:true,
@@ -295,7 +295,7 @@
               label: "MB/L NO",
               prop: "mblno",
               search: true,
-              width:"180",
+              width:180,
               overHidden:true,
               rules: [{
                 required: true,
@@ -306,7 +306,7 @@
             {
               label: "HB/L NO",
               prop: "hblno",
-              width:"180",
+              width:180,
               search: true,
               overHidden:true,
               rules: [{
@@ -319,7 +319,7 @@
               label: "Reference NO",
               prop: "refno",
               search: true,
-              width:"180",
+              width:180,
               overHidden:true,
               rules: [{
                 required: true,
@@ -350,7 +350,7 @@
             {
               label: "综合USD应收",
               prop: "amountDrUsd",
-              width:"120",
+              width:120,
               overHidden:true,
               rules: [{
                 required: true,
@@ -361,7 +361,7 @@
             {
               label: "综合USD应付",
               prop: "amountCrUsd",
-              width:"120",
+              width:120,
               overHidden:true,
               rules: [{
                 required: true,
@@ -372,7 +372,7 @@
             {
               label: "合计CNY应收",
               prop: "amountDrLoc",
-              width:"120",
+              width:120,
               overHidden:true,
               rules: [{
                 required: true,
@@ -383,7 +383,7 @@
             {
               label: "合计CNY应付",
               prop: "amountCrLoc",
-              width:"120",
+              width:120,
               overHidden:true,
               rules: [{
                 required: true,
@@ -394,7 +394,7 @@
             {
               label: "结算单据编号",
               prop: "stlBillNo",
-              width:"180",
+              width:180,
               overHidden:true,
               rules: [{
                 required: true,
@@ -406,7 +406,7 @@
               label: "结算日期",
               prop: "stlDate",
               type: "date",
-              width:"100",
+              width:100,
               valueFormat:'yyyy-MM-dd',
               format: 'yyyy-MM-dd',
               overHidden:true,
@@ -419,7 +419,7 @@
             {
               label: "已结算CNY应收",
               prop: "stlAmountDr",
-              width:"120",
+              width:120,
               overHidden:true,
               rules: [{
                 required: true,
@@ -430,7 +430,7 @@
             {
               label: "已结算CNY应付",
               prop: "stlAmountCr",
-              width:"120",
+              width:120,
               overHidden:true,
               rules: [{
                 required: true,
@@ -438,43 +438,43 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "已结算综合USD应收",
-              prop: "stlAmountDrUsd",
-              width:"140",
-              overHidden:true,
-              rules: [{
-                required: true,
-                message: "请输入已结算综合 USD 应收(USD) - 非 USD 外币转换为 USD",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "已结算综合USD应付",
-              prop: "stlAmountCrUsd",
-              width:"140",
-              overHidden:true,
-              rules: [{
-                required: true,
-                message: "请输入已结算综合 USD 应付(USD) - 非 USD 外币转换为 USD",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "已结算综合USD应收",
+            //   prop: "stlAmountDrUsd",
+            //   width:"140",
+            //   overHidden:true,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入已结算综合 USD 应收(USD) - 非 USD 外币转换为 USD",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "已结算综合USD应付",
+            //   prop: "stlAmountCrUsd",
+            //   width:"140",
+            //   overHidden:true,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入已结算综合 USD 应付(USD) - 非 USD 外币转换为 USD",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "已结算合计CNY应收",
               prop: "stlAmountDrLoc",
-              width:"140",
+              width:140,
               overHidden:true,
               rules: [{
                 required: true,
-                message: "请输入已结算合计本位币应收(CNY )",
+                message: "请输入已结算合计本位币应收(CNY)",
                 trigger: "blur"
               }]
             },
             {
               label: "已结算合计CNY应付",
               prop: "stlAmountCrLoc",
-              width:"140",
+              width:140,
               overHidden:true,
               rules: [{
                 required: true,
@@ -496,7 +496,7 @@
               label: "发票日期",
               prop: "invoiceDate",
               type: "date",
-              width:"100",
+              width:100,
               valueFormat:'yyyy-MM-dd',
               format: 'yyyy-MM-dd',
               overHidden:true,
@@ -520,30 +520,30 @@
                 label: "付费申请金额CNY",
                 prop: "appliedAmount",
                 overHidden:true,
-                width: "120"
+                width: 120
             },
             {
                 label: "付费申请金额USD",
                 prop: "appliedAmountUsd",
                 overHidden:true,
-                width: "120"
+                width: 120
             },
             {
                 label: "申请发票金额CNY",
                 prop: "appliedInvoiceAmount",
                 overHidden:true,
-                width: "120"
+                width: 120
             },
             {
                 label: "申请发票金额USD",
                 prop: "appliedInvoiceAmountUsd",
                 overHidden:true,
-                width: "120"
+                width: 120
             },
             {
               label: "凭证号",
               prop: "voucherNo",
-              width:"180",
+              width:180,
               overHidden:true,
               rules: [{
                 required: true,
@@ -555,7 +555,7 @@
               label: "凭证日期",
               prop: "voucherDate",
               type: "date",
-              width:"100",
+              width:100,
               valueFormat:'yyyy-MM-dd',
               format: 'yyyy-MM-dd',
               overHidden:true,
@@ -625,7 +625,7 @@
             {
               label: "备注",
               prop: "remarks",
-              width: "180",
+              width: 180,
               overHidden:true,
               rules: [{
                 required: true,

src/views/iosBasicData/ComputationCenter/index.vue

@@ -68,6 +68,7 @@ import {fininvoicesList, generateFinStlBills} from "@/api/iosBasicData/fininvoic
 import {finstlbillsList, finstlbillsRemove} from "@/api/iosBasicData/finstlbills";
 import finstlbillsDetails from "@/views/iosBasicData/CollectionSettlement/finstlbillsDetails.vue";
 import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlementDetails.vue";
+import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
 
     export default {
         components: {settlementDetails},
@@ -132,6 +133,16 @@ import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlement
                             prop: "corpCnName",
                             search:true,
                             overHidden:true,
+                            type:'select',
+                            filterable:true,
+                            remote:true,
+                            dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                            dicData:[],
+                            props: {
+                                label: 'cnName',
+                                value: 'cnName',
+                                res:'data.records'
+                            },
                         },
                         {
                             label: "发票抬头",
@@ -189,8 +200,15 @@ import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlement
         },
         async created() {
             this.option = await this.getColumnData(this.getColumnName(324), this.optionBack);
+            this.getBcorpslistByTypefun()
         },
         methods:{
+            // 获取往来单位数据
+            getBcorpslistByTypefun(){
+                getBcorpslistByType(1,10).then(res=>{
+                    this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records
+                })
+            },
             // 选择结算
             chooseSettlement(){
                 if (this.selectionList.length === 0) {

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

@@ -47,7 +47,7 @@
             </el-table-column>
             <el-table-column
                 prop="corpCnName"
-                label="客户简称" width="130px">
+                label="客户名称" width="130px">
                 <template slot-scope="{ row }">
                     <span class="textHide">{{row.corpCnName}}</span>
                 </template>

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -847,7 +847,7 @@
             },
             // 结算确认
             settlementApprovefun(){
-                this.$confirm("确定进行对账操作?", {
+                this.$confirm("确定进行申请操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
@@ -865,7 +865,7 @@
             },
             // 结算撤销
             revokeSettlementApprovefun(){
-                this.$confirm("确定进行撤销对账操作?", {
+                this.$confirm("确定进行撤销申请操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"

src/views/iosBasicData/PaymentApplication/index.vue

@@ -47,6 +47,7 @@
                   </el-button>
                   <el-button type="text"
                              size="small"
+                             :disabled="row.status == 1"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>

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

@@ -221,7 +221,7 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
                     }else {
                         this.$message.success('操作成功')
                     }
-                    this.reportslogListfun(this.documentPage, this.query);
+                    this.reportslogListfun(this.documentPage, {...this.query,reportsCode:res.data.data.reportsCode});
                     this.editData = {}
                     this.documentForm = {}
                     this.documenturl = {}
@@ -237,7 +237,6 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             },
             // 左侧筛选
             nodeClick(data) {
-                console.log(data,240)
                 this.businesstypeData = data
                 this.reportslogListfun(this.documentPage, {reportsCode:data.content});
             },
@@ -269,7 +268,7 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             },
             // 点击刷新按钮
             refreshChange(){
-                this.reportslogListfun(this.documentPage, this.query);
+                this.reportslogListfun(this.documentPage, {...this.query,reportsCode:this.businesstypeData.content});
             },
             // 打开前的回调
             beforeOpen(done, type) {

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

@@ -489,7 +489,8 @@
                         </el-form-item>
                         <div>
                             <el-col :span="12">
-                                <el-form-item label="件数" prop="quantity" label-width="80px" >
+                                <el-form-item label="件数" prop="quantity" label-width="80px"
+                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">件数</span>
                                 </span>
@@ -500,7 +501,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="包装" prop="packingUnit" label-width="50px"  >
+                                <el-form-item label="包装" prop="packingUnit" label-width="50px"
+                                              :rules="[{required: true,message: '',trigger: 'blur' }]"  >
                                 <span slot="label">
                                     <span style="color: #1e9fff">包装</span>
                                 </span>
@@ -521,7 +523,8 @@
                         </div>
                         <div>
                             <el-col :span="12">
-                                <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="80px" >
+                                <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="80px"
+                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">毛重(KGS)</span>
                                 </span>
@@ -532,7 +535,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="尺码(CBM)" prop="measurement" label-width="80px"  >
+                                <el-form-item label="尺码(CBM)" prop="measurement" label-width="80px"
+                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">尺码(CBM)</span>
                                 </span>
@@ -671,7 +675,7 @@
         <el-dialog
             title="第二通知人"
             :visible.sync="hnotify2Visible"
-            width="30%"
+            width="50%"
             append-to-body
             :before-close="hnotify2HandleClose">
             <div>
@@ -1328,7 +1332,10 @@ import {NdayDate} from "@/util/date";
             hnotify2BcorpsListfun(cnName){
                 let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
                 getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
-                    this.hnotify2Data = res.data.data.records
+                    this.hnotify2Data = res.data.data.records.map(item=>{
+                        item.cnName = item.cnName + ' - ' + item.code
+                        return item
+                    })
                 })
             },
             // 收货地数据 （港口表）

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

@@ -6,8 +6,8 @@
                    :header-cell-class-name="headerClassName"
                    @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309.6)"
                    @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 309.6)" >
-            <template slot-scope="scope" slot="menuLeft">
-                <el-button v-if="!typeMenu" type="danger"
+            <template slot-scope="scope" slot="menuLeft" >
+                <el-button v-if="!typeMenu && assemblyForm.billStatus != 3" type="danger"
                            size="small"
                            icon="el-icon-delete"
                            plain
@@ -15,7 +15,7 @@
                            @click="batchWithdrawfun">批量撤回
                 </el-button>
             </template>
-            <template slot-scope="scope" slot="menu">
+            <template slot-scope="scope" slot="menu" v-if="assemblyForm.billStatus != 3" >
                 <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
                            :disabled="detailData.seeDisabled"
                            @click.stop="withdrawfun(scope.row, scope.index)">撤回
@@ -27,6 +27,9 @@
                     {{scope.row.billNo}}
                 </span>
             </template>
+            <template slot-scope="scope" slot="billDate">
+                <span>{{scope.row.billDate?scope.row.billDate.slice(0,10):''}}</span>
+            </template>
         </avue-crud>
     </div>
 </template>

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

@@ -839,7 +839,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.columnforfun('srcType').dicData = res.data.data
                 })
             },
-
             // 获取业务来源代理数据
             agentBcorpsListfun(cnName){
                 let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
@@ -1214,6 +1213,18 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     if (valid) {
                         // 判断必填项
                         let sum = '请填写'
+                        if (!this.form.quantity) {
+                            sum += ` 件数`
+                        }
+                        if (!this.form.packingUnit) {
+                            sum += ` 包装`
+                        }
+                        if (!this.form.grossWeight) {
+                            sum += ` 毛重`
+                        }
+                        if (!this.form.measurement) {
+                            sum += ` 尺码`
+                        }
                         for (let item of this.form.feeCenterListD) {
                             if (!item.corpId) {
                                 sum += ` 应收序号${item.$index + 1}往来单位`
@@ -1563,6 +1574,10 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (this.form.hnotifyCnName) {
                     this.form.hnotifyCnName = this.form.hnotifyCnName.split(' - ')[0]
                 }
+                // 第二通知人
+                if (this.form.hnotify2CnName) {
+                    this.form.hnotify2CnName = this.form.hnotify2CnName.split(' - ')[0]
+                }
                 // COLOADER
                 if (this.form.coloaderCnName) {
                     this.form.coloaderCnName = this.form.coloaderCnName.split(' - ')[0]
@@ -1625,6 +1640,10 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (this.form.hnotifyCnName) {
                     this.form.hnotifyCnName = this.form.hnotifyCnName + ' - ' + this.form.hnotifyCode
                 }
+                // 第二通知人
+                if (this.form.hnotify2CnName) {
+                    this.form.hnotify2CnName = this.form.hnotify2CnName + ' - ' + this.form.hnotify2Code
+                }
                 // COLOADER
                 if (this.form.coloaderCnName) {
                     let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'

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

@@ -71,9 +71,18 @@
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="船名">
-                                  <el-input placeholder="请输入船名" clearable
-                                            size="small" style="width:100%" v-model="query.vesselCnName">
-                                  </el-input>
+                                  <search-query :datalist="vesselData"
+                                                :selectValue="query.vesselEnName"
+                                                :filterable="true"
+                                                :clearable="true"
+                                                :remote="true"
+                                                :buttonIf="false"
+                                                :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                                placeholder="请输入船名"
+                                                @remoteMethod="vesselBvesselsListfun"
+                                                @corpChange="corpChange($event,'vesselEnName')"
+                                                @corpFocus="vesselBvesselsListfun" >
+                                  </search-query>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold" >
@@ -85,30 +94,76 @@
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="船公司">
-                                  <el-input placeholder="请输入船公司" clearable
-                                            size="small" style="width:100%" v-model="query.carrierCnName">
-                                  </el-input>
+                                  <search-query :datalist="carrierData"
+                                                :selectValue="query.carrierCnName"
+                                                :filterable="true"
+                                                :clearable="true"
+                                                :remote="true"
+                                                :buttonIf="false"
+                                                :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                placeholder="请输入船公司"
+                                                @remoteMethod="carrierBcorpslistByTypefun"
+                                                @corpChange="corpChange($event,'carrierCnName')"
+                                                @corpFocus="carrierBcorpslistByTypefun" >
+                                  </search-query>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="目的港">
-                                  <el-input placeholder="请输入目的港" clearable
-                                            size="small" style="width:100%" v-model="query.podCnName">
-                                  </el-input>
+                                  <!--<el-input placeholder="请输入目的港" clearable-->
+                                  <!--          size="small" style="width:100%" v-model="query.podCnName">-->
+                                  <!--</el-input>-->
+                                  <search-query :datalist="podData"
+                                                :selectValue="query.podEnName"
+                                                :filterable="true"
+                                                :clearable="true"
+                                                :remote="true"
+                                                :buttonIf="false"
+                                                :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                                placeholder="请输入目的港"
+                                                @remoteMethod="podBportsListfun"
+                                                @corpChange="corpChange($event,'podEnName')"
+                                                @corpFocus="podBportsListfun" >
+                                  </search-query>
+
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="航线">
-                                  <el-input placeholder="请输入航线" clearable
-                                            size="small" style="width:100%" v-model="query.lineCnName">
-                                  </el-input>
+                                  <!--<el-input placeholder="请输入航线" clearable-->
+                                  <!--          size="small" style="width:100%" v-model="query.lineCnName">-->
+                                  <!--</el-input>-->
+                                  <search-query :datalist="lineData"
+                                                :selectValue="query.lineCnName"
+                                                :filterable="true"
+                                                :clearable="true"
+                                                :remote="true"
+                                                :buttonIf="false"
+                                                :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                placeholder="请输入航线"
+                                                @remoteMethod="lineBlinesListfun"
+                                                @corpChange="corpChange($event,'lineCnName')"
+                                                @corpFocus="lineBlinesListfun" >
+                                  </search-query>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="场站">
-                                  <el-input placeholder="请输入场站" clearable
-                                            size="small" style="width:100%" v-model="query.cyCode">
-                                  </el-input>
+                                  <!--<el-input placeholder="请输入场站" clearable-->
+                                  <!--          size="small" style="width:100%" v-model="query.cyCode">-->
+                                  <!--</el-input>-->
+                                  <search-query :datalist="cyData"
+                                                :selectValue="query.cyCnName"
+                                                :filterable="true"
+                                                :clearable="true"
+                                                :remote="true"
+                                                :buttonIf="false"
+                                                :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                placeholder="请输入场站"
+                                                @remoteMethod="cyBcorpslistByType"
+                                                @corpChange="corpChange($event,'cyCnName')"
+                                                @corpFocus="cyBcorpslistByType" >
+                                  </search-query>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
@@ -179,9 +234,21 @@
                           </el-col>
                           <el-col :span="6" v-show="fold">
                               <el-form-item label="订舱代理">
-                                  <el-input placeholder="请输入订舱代理" clearable
-                                            size="small" style="width:100%" v-model="query.bookingAgentCnName">
-                                  </el-input>
+                                  <!--<el-input placeholder="请输入订舱代理" clearable-->
+                                  <!--          size="small" style="width:100%" v-model="query.bookingAgentCnName">-->
+                                  <!--</el-input>-->
+                                  <search-query :datalist="bookingAgentData"
+                                                :selectValue="query.bookingAgentCnName"
+                                                :filterable="true"
+                                                :clearable="true"
+                                                :remote="true"
+                                                :buttonIf="false"
+                                                :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                placeholder="请输入订舱代理"
+                                                @remoteMethod="bookingAgentBcorpsListfun"
+                                                @corpChange="corpChange($event,'bookingAgentCnName')"
+                                                @corpFocus="bookingAgentBcorpsListfun">
+                                  </search-query>
                               </el-form-item>
                           </el-col>
                           <el-col :span="6" v-show="fold">
@@ -249,9 +316,9 @@
                              size="small"
                              icon="el-icon-delete"
                              plain
+                             v-if="query.billStatus != 3"
                              @click="handleDelete">删 除
                   </el-button>
-
                   <el-dropdown style="line-height: 0">
                       <el-button size="small" type="success" style="margin-right: 8px" :disabled="selectionList.length == 0" >
                           发送 EDI<i class="el-icon-arrow-down el-icon--right"></i>
@@ -303,6 +370,12 @@
                       {{scope.row.billNo}}
                   </span>
               </template>
+              <template slot="eta" slot-scope="scope">
+                  <span>{{scope.row.eta?scope.row.eta.slice(0,10):''}}</span>
+              </template>
+              <template slot="updateTime" slot-scope="scope">
+                  <span>{{scope.row.updateTime?scope.row.updateTime.slice(0,10):''}}</span>
+              </template>
           </avue-crud>
       </basic-container>
 
@@ -326,13 +399,12 @@
                      @resetColumn="resetColumnTwo('mawbOptionCrud', 'mawbOption', 'mawbOptionBack', 309.7)"
                      @saveColumn="saveColumnTwo('mawbOptionCrud', 'mawbOption', 'mawbOptionBack', 309.7)"
                       >
-              <template slot="radio"
-                        slot-scope="{row}">
+              <template slot="radio" slot-scope="{row}">
                   <el-radio v-model="dialogRadio" :label="row.id" @input="radioInput(row)"></el-radio>
               </template>
           </avue-crud>
           <span slot="footer" class="dialog-footer">
-              <el-button @click="dialogVisible = false">取 消</el-button>
+              <el-button @click="dialogVisible = false;dialogRadio = null">取 消</el-button>
               <el-button type="primary" @click="AddToMainOrder">确 定</el-button>
           </span>
       </el-dialog>
@@ -356,6 +428,10 @@ import {getWorkDicts} from "@/api/system/dictbiz";
 import {dateFormat, defaultDate} from "@/util/date";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {editypesList} from "@/api/iosBasicData/editypes";
+import {getBvesselsList} from "@/api/iosBasicData/bvessels";
+import {getBcorpslistByType,getBcorpsDetail} from "@/api/iosBasicData/bcorps";
+import {bportsList} from "@/api/iosBasicData/bports";
+import {blinesList} from "@/api/iosBasicData/blines";
 
   export default {
     components:{SearchQuery, feesTemplateItems, billsDetails,SplitList},
@@ -365,6 +441,18 @@ import {editypesList} from "@/api/iosBasicData/editypes";
           // 展开和收回
           fold:false,
           maxShow:3,
+          // 船名
+          vesselData:[],
+          // 船公司
+          carrierData:[],
+          // 目的港(卸货港)
+          podData:[],
+          // 航线
+          lineData:[],
+          // 场站
+          cyData:[],
+          // 订舱代理
+          bookingAgentData:[],
           // 单据类型
           billTypeData:[
               {
@@ -1042,6 +1130,45 @@ import {editypesList} from "@/api/iosBasicData/editypes";
           handleClick(tab, event){
               this.onLoad(this.page, this.query);
           },
+          // 获取船名
+          vesselBvesselsListfun(enName){
+              getBvesselsList(1,10,{enName}).then(res=>{
+                  this.vesselData = res.data.data.records
+              })
+          },
+          // 获取船公司数据
+          carrierBcorpslistByTypefun(cnName){
+              let corpType = '1712286570540703745'
+              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                  this.carrierData = res.data.data.records
+              })
+          },
+          // 卸货港数据
+          podBportsListfun(enName){
+              bportsList(1,10,{enName}).then(res=>{
+                  this.podData = res.data.data.records
+              })
+          },
+          // 航线数据
+          lineBlinesListfun(cnName){
+              blinesList(1,10,{cnName}).then(res=>{
+                  this.lineData = res.data.data.records
+              })
+          },
+          // 获取场站数据
+          cyBcorpslistByType(cnName){
+              let corpType = '1712286771737272322'
+              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                  this.cyData = res.data.data.records
+              })
+          },
+          // 订舱代理
+          bookingAgentBcorpsListfun(cnName){
+              let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
+              getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
+                  this.bookingAgentData = res.data.data.records
+              })
+          },
         // 获取业务状态字典数据
         billStatusWorkDictsfun(){
            getWorkDicts('bill_status').then(res=>{
@@ -1155,6 +1282,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
         // 添加到主单接口
         billsIncreaseReinsurancePolicyfun(ids,id){
             billsIncreaseReinsurancePolicy(ids,id).then(res=>{
+                this.dialogRadio = null
                 this.$message({
                     type: "success",
                     message: "操作成功!"

src/views/iosBasicData/bcorps/index.vue

@@ -108,6 +108,7 @@ import bcorpstypedefine from "@/views/iosBasicData/bcorps/bcorpstypedefine.vue"
 
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
 import {getWorkDicts} from "@/api/system/dictbiz";
+import {bcountrysList} from "@/api/iosBasicData/bcountrys";
 
 export default {
   components: {
@@ -275,33 +276,20 @@ export default {
           {
             label: "国家",
             prop: "cntyName",
-            width: "140",
+            width: 140,
+            overHidden:true,
             search: true,
-            rules: [{
-              required: true,
-              message: "请输入国家名称",
-              trigger: "blur"
-            }],
-              overHidden:true,
+            type: "select",
+            filterable:true,
+            remote:true,
+            dicUrl: "/api/blade-los/bcountrys/list?cnName={{key}}",
+            dicData:[],
+            props: {
+                label: 'cnName',
+                value: 'cnName',
+                res:"data.records"
+            },
           },
-          // {
-          //   label: "省、州",
-          //   prop: "province",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入省、州",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "城市",
-          //   prop: "city",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入城市",
-          //     trigger: "blur"
-          //   }]
-          // },
           {
             label: "中文地址",
             prop: "cnAddr",
@@ -338,26 +326,6 @@ export default {
             }],
               overHidden:true,
           },
-          // {
-          //   label: "传真",
-          //   prop: "fax",
-          //   width: "120",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入传真",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "电子邮箱",
-          //   prop: "email",
-          //   width: "160",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入电子邮箱",
-          //     trigger: "blur"
-          //   }]
-          // },
           {
             label: "负责人姓名",
             prop: "mgrName",
@@ -391,57 +359,6 @@ export default {
             }],
               overHidden:true,
           },
-          // {
-          //   label: "客户来源类别",
-          //   prop: "sourceType",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入客户来源类别",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "部门名称",
-          //   prop: "deptName",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入部门名称",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "业务员 Id",
-          //   prop: "salesId",
-          //   hide: true,
-          //   display: false,
-          // },
-          // {
-          //   label: "业务员姓名",
-          //   prop: "salesName",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入业务员姓名",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "所属单位 Id",
-          //   prop: "corpId",
-          //   hide: true,
-          //   display: false,
-          // },
-          // {
-          //   label: "所属单位名称",
-          //   prop: "corpName",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入所属单位名称",
-          //     trigger: "blur"
-          //   }]
-          // },
           {
             label: "客户类型",
             prop: "corpTypeName",
@@ -464,417 +381,6 @@ export default {
             }],
               overHidden:true,
           },
-          // {
-          //   label: "海运邮箱",
-          //   prop: "seaEmail",
-          //   width: "160",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入海运邮箱",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "空运邮箱",
-          //   prop: "airEmail",
-          //   width: "160",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入空运邮箱",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "国际编码",
-          //   prop: "unCode",
-          //   width: "160",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入国际编码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "海关编码",
-          //   prop: "customsCode",
-          //   width: "160",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入海关编码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "SCAC 代码",
-          //   prop: "scacCode",
-          //   width: "160",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入SCAC 代码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "iGenZong 代码",
-          //   prop: "igenzongCode",
-          //   width: 120,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入iGenZong 代码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "美线约号",
-          //   prop: "amLineAgreementno",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入美线约号",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "船公司代码",
-          //   prop: "carrierCode",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入船公司代码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "场站三字码",
-          //   prop: "cyCode",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入场站三字码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "CMA Laracode",
-          //   prop: "cmaLaracode",
-          //   width: 120,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入CMA Laracode",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "CMA Location",
-          //   prop: "cmaLocation",
-          //   width: 120,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入CMA Location",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "ZIM CUCC",
-          //   prop: "zimCucc",
-          //   width: 120,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入ZIM CUCC",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "关贸云编码",
-          //   prop: "gmyCode",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入关贸云编码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "INTRRA ICUA",
-          //   prop: "inttraIcua",
-          //   width: "120",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入INTRRA ICUA",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "INTRRA ICUA 联系人",
-          //   prop: "inttraIcuaAttn",
-          //   width: "160",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入INTRRA ICUA 联系人",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "INTRRA ICUA Email",
-          //   prop: "inttraIcuaEmail",
-          //   width: "140",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入INTRRA ICUA Email",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "EDI 格式名称",
-          //   prop: "ediFmt",
-          //   width: "120",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入EDI 格式名称",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "EDI FTP 地址",
-          //   prop: "ediFtp",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入EDI FTP 地址",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "EDI 邮箱",
-          //   prop: "ediEmail",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入EDI 邮箱",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "是否 VIP 客户",
-          //   prop: "vip",
-          //   width: 120,
-          //   type: 'select',
-          //   dicData: [{
-          //     label: '否',
-          //     value: 0
-          //   }, {
-          //     label: '是',
-          //     value: 1
-          //   }],
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入是否 VIP 客户，0=否，1=是",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "VIP 等级",
-          //   prop: "vipLevel",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入VIP 等级",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "是否已签约",
-          //   prop: "isSigned",
-          //   type: 'select',
-          //   width: 100,
-          //   dicData: [{
-          //     label: '否',
-          //     value: 0
-          //   }, {
-          //     label: '是',
-          //     value: 1
-          //   }],
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入是否已签约，0=否，1=是",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "授信状态",
-          //   prop: "creditStatus",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入授信状态",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "授信等级",
-          //   prop: "creditLevel",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入授信等级,A=A级,B=B级,B+=B+级,B-=B-级,C=C级,D=黑名单",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "授信天数",
-          //   prop: "creditDay",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入授信天数",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "授信币种",
-          //   prop: "creditCur",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入授信币种",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "授信额度",
-          //   prop: "creditGrant",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入授信额度",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "授信利率",
-          //   prop: "creditRate",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入授信利率",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "付款方式",
-          //   prop: "paymentType",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入付款方式",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "账期设置",
-          //   prop: "accountPeriodType",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入账期设置",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "最大欠款额",
-          //   prop: "maxArrears",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入最大欠款额",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "协议号",
-          //   prop: "agreementNo",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入协议号",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "绩效系数",
-          //   prop: "performanceRate",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入绩效系数",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "增值税率",
-          //   prop: "taxRate",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入增值税率",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "存在",
-          //   prop: "isPs",
-          //   type: 'select',
-          //   dicData: [{
-          //     label: '否',
-          //     value: 0
-          //   }, {
-          //     label: '是',
-          //     value: 1
-          //   }],
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入存在 PS 0=否 1=是",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "利润分成比例",
-          //   prop: "psRate",
-          //   width: 100,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入PS(利润分成) 比例",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "允许付大于收",
-          //   prop: "psAllowLargeCredit",
-          //   type: 'select',
-          //   width: 100,
-          //   dicData: [{
-          //     label: '否',
-          //     value: 0
-          //   }, {
-          //     label: '是',
-          //     value: 1
-          //   }],
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入PS允许付大于收 0=否 1=是",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // // {
-          // //   label: "详情，主要用于提单信息",
-          // //   prop: "details",
-          // //   rules: [{
-          // //     required: true,
-          // //     message: "请输入详情，主要用于提单信息",
-          // //     trigger: "blur"
-          // //   }]
-          // // },
-          // // {
-          // //   label: "JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]",
-          // //   prop: "extendedData",
-          // //   rules: [{
-          // //     required: true,
-          // //     message: "请输入JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]",
-          // //     trigger: "blur"
-          // //   }]
-          // // },
-          // {
-          //   label: "版本",
-          //   prop: "version",
-          //   hide: true,
-          //   display: false,
-          // },
           {
             label: "状态",
             prop: "status",
@@ -894,63 +400,6 @@ export default {
             }],
               overHidden:true,
           },
-          // {
-          //   label: "分公司 Id",
-          //   prop: "branchId",
-          //   hide: true,
-          //   display: false,
-          // },
-          // {
-          //   label: "创建人 Id",
-          //   prop: "createUser",
-          //   hide: true,
-          //   display: false,
-          // },
-          // {
-          //   label: "创建人",
-          //   prop: "createUserName",
-          //   display: false,
-          // },
-          // {
-          //   label: "创建部门 Id",
-          //   prop: "createDept",
-          //   hide: true,
-          //   display: false,
-          // },
-          // {
-          //   label: "创建部门",
-          //   prop: "createDeptName",
-          //   display: false,
-          // },
-          // {
-          //   label: "创建时间",
-          //   prop: "createTime",
-          //   width: 160,
-          //   display: false,
-          // },
-          // {
-          //   label: "修改人 Id",
-          //   prop: "updateUser",
-          //   hide: true,
-          //   display: false,
-          // },
-          // {
-          //   label: "修改人",
-          //   prop: "updateUserName",
-          //   display: false,
-          // },
-          // {
-          //   label: "修改时间",
-          //   prop: "updateTime",
-          //   width: 160,
-          //   display: false,
-          // },
-          // {
-          //   label: "是否已删除（0 否 1是）",
-          //   prop: "isDeleted",
-          //   hide: true,
-          //   display: false,
-          // },
           {
             label: "备注",
             prop: "remarks",
@@ -1006,6 +455,7 @@ export default {
 
     }
     this.$store.commit("DOMIO_IN_CUL");
+    this.bcountrysListfun() // 获取国家数据
     this.bcorpstypedefineListfun() // 获取客户类别
     this.ifInvoiceGetWorkDictsfun() // 字典状态
   },
@@ -1013,6 +463,12 @@ export default {
       this.$store.commit("DOMIO_OUT_CUL");
   },
   methods: {
+      // 获取国家数据
+      bcountrysListfun(){
+          bcountrysList(1,10).then(res=>{
+              this.findObject(this.option.column, "cntyName").dicData = res.data.data.records
+          })
+      },
       // 获取状态字典数据
       ifInvoiceGetWorkDictsfun(){
           getWorkDicts('ifInvoice').then(res=>{

src/views/iosBasicData/btrademodes/index.vue

@@ -110,7 +110,7 @@ export default {
         stripe: true,
         calcHeight: 30,
         searchIcon: true,
-        searchIndex: 3,
+        searchIndex: 4,
         tip: false,
         searchShow: true,
         searchMenuSpan: 24,

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -16,10 +16,10 @@
                            plain>导出到税控
                 </el-button>
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == 1"
-                            :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销发票
+                            :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销开票
                 </el-button>
                 <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
-                            :loading="saveLoading" @click="fininvoicesConfirmFinInvoicesfun">确认发票
+                            :loading="saveLoading" @click="fininvoicesConfirmFinInvoicesfun">确认开票
                 </el-button>
                 <el-button  size="small" type="primary" style="margin-right: 8px" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
@@ -792,7 +792,7 @@ export default {
             },
             // 确认发票
             fininvoicesConfirmFinInvoicesfun(){
-                this.$confirm("确定进行对账操作?", {
+                this.$confirm("确定进行开票操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"

src/views/iosBasicData/fininvoices/index.vue

@@ -47,34 +47,15 @@
                              @click="rowDel(row)">删除
                   </el-button>
               </template>
-              <template slot-scope="scope" slot="billNo">
-                  <avue-text-ellipsis :text="scope.row.billNo" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpCnName">
-                  <avue-text-ellipsis :text="scope.row.corpCnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="corpEnName">
-                  <avue-text-ellipsis :text="scope.row.corpEnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="invCorpCnName">
-                  <avue-text-ellipsis :text="scope.row.invCorpCnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
-              <template slot-scope="scope" slot="invCorpEnName">
-                  <avue-text-ellipsis :text="scope.row.invCorpEnName" :height="30" use-tooltip placement="top">
-                      <small slot="more">...</small>
-                  </avue-text-ellipsis>
-              </template>
               <template slot-scope="scope" slot="stlMode">
                   <span>{{scope.row.stlMode?'月结':'票结'}}</span>
               </template>
+              <template slot-scope="{ row }" slot="billDate">
+                  {{row.billDate?row.billDate.slice(0,10):''}}
+              </template>
+              <template slot-scope="{ row }" slot="invoiceDate">
+                  {{row.invoiceDate?row.invoiceDate.slice(0,10):''}}
+              </template>
           </avue-crud>
       </basic-container>
       <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack"></fininvoicesDetails>
@@ -123,244 +104,260 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
             {
               label: "单据编号",
               prop: "billNo",
-              rules: [{
-                required: true,
-                message: "请输入单据编号",
-                trigger: "blur"
-              }]
+              search:true,
+              overHidden:true,
             },
             {
               label: "单据日期",
               prop: "billDate",
-              search:true,
-              rules: [{
-                required: true,
-                message: "请输入单据日期",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "发票号码",
               prop: "invoiceNo",
-              rules: [{
-                required: true,
-                message: "请输入发票号码",
-                trigger: "blur"
-              }]
+                search:true,
+              overHidden:true,
             },
             {
               label: "开票日期",
               prop: "invoiceDate",
-              rules: [{
-                required: true,
-                message: "请输入开票日期",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "原发票号码",
               prop: "origInvoiceNo",
-                width:"120"
+              width:120,
+              overHidden:true,
             },
             {
               label: "税务发票号码",
               prop: "taxInvoiceNo",
-                width:"150"
+              width:150,
+              overHidden:true,
             },
             {
               label: "全电发票",
               prop: "invType",
+              overHidden:true,
             },
             {
               label: "普通发票/专用发票",
               prop: "taxType",
-                width:"160"
+              width:160,
+              overHidden:true,
             },
             {
               label: "税率 %",
               prop: "taxRate",
-              rules: [{
-                required: true,
-                message: "请输入税率 %",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
               label: "结算方式",
               prop: "stlMode",
+              overHidden:true,
             },
             {
               label: "发票币种",
               prop: "invCurCode",
-              rules: [{
-                required: true,
-                message: "请输入发票币种",
-                trigger: "blur"
-              }]
+              overHidden:true,
             },
             {
-              label: "客户中文名称",
+              label: "客户名称",
               prop: "corpCnName",
-                width:"120"
+                search:true,
+              width:120,
+              overHidden:true,
             },
             {
               label: "客户英文名称",
               prop: "corpEnName",
-                width:"120"
+              width:120,
+              overHidden:true,
             },
             {
               label: "客户开票单位名称",
               prop: "corpInvoiceHeader",
-                width:"150"
+              width:150,
+              overHidden:true,
             },
             {
               label: "开票单位中文名称",
               prop: "invCorpCnName",
-                width:"160"
+              width:160,
+              overHidden:true,
             },
             {
               label: "开票单位英文名称",
               prop: "invCorpEnName",
-                width:"150"
+              width:150,
+              overHidden:true,
             },
             {
               label: "开票单位税号",
               prop: "invCorpTaxNo",
-                width:"140"
+              width:140,
+              overHidden:true,
             },
             {
               label: "开票单位CNY开户银行",
               prop: "invCorpAccountBankCny",
-                width:"160"
+              width:160,
+              overHidden:true,
             },
             {
               label: "开票单位CNY银行账号",
               prop: "invCorpAccountNoCny",
-                width:"160"
+              width:160,
+              overHidden:true,
             },
             {
               label: "开票单位USD开户银行",
               prop: "invCorpAccountBankUsd",
-                width:"160"
+              width:160,
+              overHidden:true,
             },
             {
               label: "开票单位USD银行账号",
               prop: "invCorpAccountNoUsd",
-                width:"160"
+              width:160,
+              overHidden:true,
             },
             {
               label: "船名/航次",
               prop: "vesselVoyno",
-                width:"100"
+              width:100,
+              overHidden:true,
             },
             {
               label: "开船日",
               prop: "etd",
+              overHidden:true,
             },
             {
               label: "装货港",
               prop: "pol",
+              overHidden:true,
             },
             {
               label: "卸货港",
               prop: "pod",
+              overHidden:true,
             },
             {
               label: "目的地",
               prop: "destination",
+              overHidden:true,
             },
             {
               label: "箱型/箱量",
               prop: "containers",
-                width:"100"
+              width:100,
+              overHidden:true,
             },
             {
               label: "币种",
               prop: "curCode",
+              overHidden:true,
             },
             {
               label: "原汇率",
               prop: "exrate",
+              overHidden:true,
             },
             {
               label: "是否转换为人民币",
               prop: "isExchangeToCny",
-                width:"140",
-                dicData:[{
-                    label:'否',
-                    value:0
-                },{
-                    label:'是',
-                    value:1
-                },]
+              width:140,
+              dicData:[{
+                  label:'否',
+                  value:0
+              },{
+                  label:'是',
+                  value:1
+              }],
+              overHidden:true,
             },
             {
               label: "业务类型",
               prop: "businessTypes",
+              overHidden:true,
             },
             {
               label: "业务单据编号",
               prop: "businessNo",
-                width:"120",
+              width:120,
+              overHidden:true,
             },
             {
               label: "对账单编号",
               prop: "checkNo",
-                width:"120",
+              width:120,
+              overHidden:true,
             },
             {
               label: "MBL NO",
               prop: "mblno",
+              overHidden:true,
             },
             {
               label: "HBL NO",
               prop: "hblno",
+              overHidden:true,
             },
             {
               label: "订舱",
               prop: "bookingNo",
+              overHidden:true,
             },
             {
               label: "中文船名",
               prop: "vesselCnName",
+                overHidden:true,
             },
             {
               label: "英文船名",
               prop: "vesselEnName",
+                overHidden:true,
             },
             {
               label: "航次",
               prop: "voyageNo",
+                overHidden:true,
             },
             {
               label: "财务开始日期",
               prop: "accountDateFrom",
-                width:"100",
+                width:100,
+                overHidden:true,
             },
             {
               label: "财务结束日期",
               prop: "accountDateTo",
-                width:"100",
+                width:100,
+                overHidden:true,
             },
             {
               label: "申请人",
               prop: "applicantName",
+                overHidden:true,
             },
             {
               label: "审核人",
               prop: "approverName",
+                overHidden:true,
             },
             {
               label: "是否代理发票",
               prop: "isAgent",
-                width:"120",
+                width:120,
                 dicData:[{
                     label:'否',
                     value:0
                 },{
                     label:'是',
                     value:1
-                },]
+                }],
+                overHidden:true,
             },
             {
               label: "是否DK",
@@ -371,7 +368,8 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
                 },{
                     label:'是',
                     value:1
-                },]
+                }],
+                overHidden:true,
             },
             {
               label: "是否RP",
@@ -382,115 +380,134 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDeta
                 },{
                     label:'是',
                     value:1
-                },]
+                }],
+                overHidden:true,
             },
             {
               label: "RP名称",
               prop: "rpName",
+                overHidden:true,
             },
             {
               label: "导出日期",
               prop: "exportDate",
-              width: "100"
+              width: 100,
+                overHidden:true,
             },
             {
               label: "导出人",
               prop: "exportName",
+                overHidden:true,
             },
             {
               label: "是否导出船名航次",
               prop: "isExportVslvoy",
-                width: "140",
+                width: 140,
                 dicData:[{
                     label:'否',
                     value:0
                 },{
                     label:'是',
                     value:1
-                },]
+                }],
+                overHidden:true,
             },
             {
               label: "是否导出主单号",
               prop: "isExportMblno",
-                width: "140",
+                width: 140,
                 dicData:[{
                     label:'否',
                     value:0
                 },{
                     label:'是',
                     value:1
-                },]
+                }],
+                overHidden:true,
             },
             {
               label: "是否导出分单号",
               prop: "isExportHblno",
-                width: "140",
+                width: 140,
                 dicData:[{
                     label:'否',
                     value:0
                 },{
                     label:'是',
                     value:1
-                },]
+                }],
+                overHidden:true,
             },
             {
               label: "发票本位币(CNY)",
               prop: "amountCny",
-                width: "140",
+                width: 140,
+                overHidden:true,
             },
             {
               label: "发票USD",
               prop: "amountUsd",
-              width: "100"
+              width: "100",
+                overHidden:true,
             },
             {
               label: "税额(CNY)",
               prop: "amountTax",
-                width: "100"
+                width: "100",
+                overHidden:true,
             },
             {
               label: "合计本位币(CNY)",
               prop: "amountLoc",
-                width: "120"
+                width: "120",
+                overHidden:true,
             },
             {
               label: "全电发票备注",
               prop: "elecRemarks",
-                width: "120"
+                width: "120",
+                overHidden:true,
             },
             {
               label: "银行进账单出票人名称",
               prop: "bankReceiptCorpName",
-                width: "160"
+                width: "160",
+                overHidden:true,
             },
             {
               label: "银行进账单出票银行",
               prop: "bankReceiptBankName",
-                width: "160"
+                width: "160",
+                overHidden:true,
             },
             {
               label: "银行进账单出票银行账号",
               prop: "bankReceiptAccountNo",
-                width: "160"
+                width: "160",
+                overHidden:true,
             },
             {
               label: "银行进账单票据种类",
               prop: "bankReceiptBillType",
-                width: "160"
+                width: "160",
+                overHidden:true,
             },
             {
               label: "银行进账单票据张数",
               prop: "bankReceiptBillCount",
-                width: "160"
+                width: "160",
+                overHidden:true,
             },
             {
               label: "银行进账单是否已进账(收款)",
               prop: "bankReceiptIsIncome",
-                width: "180"
+                width: "180",
+                overHidden:true,
             },
             {
               label: "备注",
               prop: "remarks",
+                overHidden:true,
               rules: [{
                 required: true,
                 message: "请输入备注",

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -53,6 +53,9 @@
               <template slot-scope="{ row }" slot="billNo">
                   <span class="pointerClick" @click="editFun(row)" >{{row.billNo}}</span>
               </template>
+              <template slot-scope="{ row }" slot="invoiceDate">
+                  {{row.invoiceDate?row.invoiceDate.slice(0,10):''}}
+              </template>
           </avue-crud>
       </basic-container>
       <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack"></fininvoicesDetails>
@@ -90,7 +93,7 @@ import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvo
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
           border: true,
           index: true,
           viewBtn: true,

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1163,7 +1163,7 @@ export default {
         },
         // 确认申请
         fininvoicesConfirmFinInvoicesfun(){
-            this.$confirm("确定进行确认发票操作?", {
+            this.$confirm("确定进行确认开票操作?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -83,6 +83,12 @@
               <template slot-scope="{ row }" slot="billNo">
                   <span class="pointerClick" @click="editFun(row)" >{{row.billNo}}</span>
               </template>
+              <template slot-scope="{ row }" slot="billDate">
+                  {{row.billDate?row.billDate.slice(0,10):''}}
+              </template>
+              <template slot-scope="{ row }" slot="invoiceDate">
+                  {{row.invoiceDate?row.invoiceDate.slice(0,10):''}}
+              </template>
           </avue-crud>
       </basic-container>
       <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack"></fininvoicesDetails>
@@ -134,7 +140,7 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
             calcHeight: 30,
             tip: false,
             searchShow: true,
-            searchMenuSpan: 6,
+            searchMenuSpan: 18,
             border: true,
             index: true,
             selection: true,

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -498,6 +498,7 @@
     } from '@/api/iosBasicData/finstlbills'
     import expand from "@/components/basic-container/expand.vue";
     import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
+    import {dateFormat} from "@/util/date";
 
     export default {
         components: {SearchQuery,expand,finstlbillsitems},
@@ -516,7 +517,12 @@
                 saveLoading:false, // 按钮动画
                 // 绑定的数据
                 form:{
-
+                    billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 对账日期 默认 当天
+                    isApproved:'0',
+                    isSignfor:'0',
+                    isCleared:'0',
+                    isChecked:'0',
+                    isInvoice:'0',
                 },
                 handleSelectionData:[], // 表格选择的数据
                 corpData:[], // 对账单位 数据
@@ -820,9 +826,9 @@
                     obj.approveTimeList = this.form.approvedDate
                 }
                 // 财务期间
-                if (this.form.accountDate) {
-                    obj.billDateList = this.form.accountDate
-                }
+                // if (this.form.accountDate) {
+                //     obj.billDateList = this.form.accountDate
+                // }
                 finstlbillslistAccBillV1(obj).then(res=>{
                     this.tableData = res.data.data.map((item,index)=>{
                         item.lineNo = Number(index) + 1

src/views/iosBasicData/finstlbills/index.vue

@@ -89,7 +89,7 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 24,
           border: true,
           index: true,
           viewBtn: true,

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -366,6 +366,26 @@ export default {
     rowUpdate(row, index, done, loading){
         done(row);
     },
+    // 批量删除
+    BatchDelete(){
+        if (this.selectionList.length === 0) {
+            this.$message.warning("请选择至少一条数据");
+            return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+        }).then(()=>{
+            let arrId = this.selectionList.map(item=>{
+                return item.id
+            })
+            bcurexrateDetails(arrId.join(',')).then(res=>{
+                this.$message.success('操作成功')
+                this.getDetail(this.form.id)
+            })
+        })
+    },
     // 删除
     rowDel(row){
         this.$confirm("确定将选择数据删除?", {
@@ -374,7 +394,8 @@ export default {
             type: "warning"
         }).then(()=>{
             bcurexrateDetails(row.id).then(res=>{
-                console.log(res,357)
+                this.$message.success('操作成功')
+                this.getDetail(this.form.id)
             })
         })
     },
@@ -440,24 +461,27 @@ export default {
       });
     },
     openEdit() {
-      const data = {
-        moduleName: "xxb",
-        tableName: "primary_school",
-        billId: this.form.id,
-        no: localStorage.getItem("browserID"),
-        billNo: this.form.exrateYear + "-" + this.form.moon
-      };
-      this.checkLock(data).then(res => {
-        if (res.data.code == 200) {
-          this.onLock(data).then(re => {
-            if (re.data.code == 200) {
-                this.$set(this.detailData,'status',2)
-                this.$set(this.option,'disabled',false)
-              // this.option = this.$options.data().option;
-            }
-          });
-        }
-      });
+        this.$set(this.detailData,'status',2)
+        this.$set(this.option,'disabled',false)
+      // const data = {
+      //   moduleName: "xxb",
+      //   tableName: "primary_school",
+      //   billId: this.form.id,
+      //   no: localStorage.getItem("browserID"),
+      //   billNo: this.form.exrateYear + "-" + this.form.moon
+      // };
+      // this.checkLock(data).then(res => {
+      //   if (res.data.code == 200) {
+        // 上锁接口
+      //     this.onLock(data).then(re => {
+      //       if (re.data.code == 200) {
+      //           this.$set(this.detailData,'status',2)
+      //           this.$set(this.option,'disabled',false)
+      //         // this.option = this.$options.data().option;
+      //       }
+      //     });
+      //   }
+      // });
     },
     //返回列表
     backToList() {
@@ -478,6 +502,15 @@ export default {
         done();
         if (valid) {
           this.toggleForm();
+          // 拿有id 的数据
+          let arrId = []
+          for (let item of  this.dataList) {
+              if (item.id) {
+                  arrId.push(item.id)
+              }
+          }
+          // 删除有ID的数据
+          bcurexrateDetails(arrId.join(',')).then(res=>{})
           this.dataList = [];
           if (this.form.paritiesType == "年汇率") {
             this.form.exrateMonth = "";
@@ -492,6 +525,15 @@ export default {
               enName: this.form.enName,
             };
             this.dataList.push(data);
+            typeSave({
+                ...this.form,
+                curExrateList: this.dataList
+            }).then(res => {
+                this.$message.success("操作成功");
+                this.getDetail(res.data.data.id);
+            }).finally(() => {
+                this.loadingBtn = false;
+            });
           } else if (this.form.paritiesType == "月汇率") {
             this.form.exrateMonth = "";
             for (let i = 1; i <= 12; i++) {
@@ -509,6 +551,15 @@ export default {
               };
               this.dataList.push(data);
             }
+            typeSave({
+                ...this.form,
+                curExrateList: this.dataList
+            }).then(res => {
+                this.$message.success("操作成功");
+                this.getDetail(res.data.data.id);
+            }).finally(() => {
+                this.loadingBtn = false;
+            });
           } else if (this.form.paritiesType == "日汇率") {
             const days = this.getCountDays(this.form.annual, this.form.moon);
             for (let i = 1; i <= days; i++) {
@@ -541,13 +592,13 @@ export default {
     },
     toggleForm() {
       if (this.form.paritiesType == "日汇率") {
-        this.findObject(this.optionList.column, "exrateDay").hide = false;
+        // this.findObject(this.optionList.column, "exrateDay").hide = false;
         this.findObject(this.optionList.column, "exrateMonth").hide = false;
       } else if (this.form.paritiesType == "月汇率") {
-        this.findObject(this.optionList.column, "exrateDay").hide = true;
+        // this.findObject(this.optionList.column, "exrateDay").hide = true;
         this.findObject(this.optionList.column, "exrateMonth").hide = false;
       } else {
-        this.findObject(this.optionList.column, "exrateDay").hide = true;
+        // this.findObject(this.optionList.column, "exrateDay").hide = true;
         this.findObject(this.optionList.column, "exrateMonth").hide = true;
       }
     },