货代bug 2024-1-24

src/api/iosBasicData/aeabills.js

@@ -42,7 +42,7 @@ export const aeabillsRemove = (ids) => {
 
 export const aeabillsSubmit = (row) => {
   return request({
-    url: '/api/blade.los/aeabills/submit',
+    url: '/api/blade-los/aeabills/submit',
     method: 'post',
     data: row
   })
@@ -113,3 +113,11 @@ export const aeabillsRevokeDisembarking = (ids) => {
     }
   })
 }
+// 空运出库amend 检索
+export const aeabillsGetDetail = (data) => {
+  return request({
+    url: '/api/blade-los/aeabills/getDetail',
+    method: 'get',
+    params: data
+  })
+}

src/api/iosBasicData/finstlbills.js

@@ -57,6 +57,14 @@ export const finstlbillslistAccBillV1 = (params) => {
     params: params
   })
 }
+// 单号检索
+export const finstlbillslistAccBillByCorp = (params) => {
+  return request({
+    url: '/api/blade-los/finaccbills/listAccBillByCorp',
+    method: 'get',
+    params: params
+  })
+}
 // 有对账走的检索
 export const finstlbillsGetByDetail = (params) => {
   return request({

src/views/approveDataH/index.vue

@@ -23,6 +23,7 @@
         <span v-else-if="scope.row.checkType == 'HYJK-DJ'">海运进口</span>
         <span v-else-if="scope.row.checkType == 'HYJK-FY'">海运进口费用</span>
         <span v-else-if="scope.row.checkType == 'sea-approve'">海运出口AMEND</span>
+        <span v-else-if="scope.row.checkType == 'KYCK-DJ'">空运出口</span>
 
 
       </template>
@@ -39,19 +40,27 @@
         <el-button type="text" size="small" :disabled="scope.row.operate" @click.stop="jumpPage(scope.row)">查看
         </el-button>
           <el-button type="text" size="small" v-if="scope.row.checkType == 'HYCK-DJ'"
-                     :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row,'HYCK-DJ')">
-              审批
+                     :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="printWindowfun(scope.row,'HYCK-DJ')">审批
           </el-button>
+          <el-button type="text" size="small" v-if="scope.row.checkType == 'HYJK-DJ'"
+                     :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="printWindowfun(scope.row,'HYJK-DJ')">审批
+          </el-button>
+          <!--<el-button type="text" size="small" v-if="scope.row.checkType == 'KYCK-DJ'"-->
+          <!--           :disabled="scope.row.auditStatus != 'S'"-->
+          <!--           @click.stop="printWindowfun(scope.row,'KYCK-DJ')">审批-->
+          <!--</el-button>-->
           <el-button type="text" size="small" v-else-if="scope.row.checkType == 'HYCK-FFSQ'"
-                     :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row,'HYCK-FFSQ')">
-              审批
+                     :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="printWindowfun(scope.row,'HYCK-FFSQ')">审批
           </el-button>
           <el-button type="text" size="small" v-else-if="scope.row.checkType == 'sea-approve'"
-                     :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row,'sea-approve')">
-              审批
+                     :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="printWindowfun(scope.row,'sea-approve')">审批
           </el-button>
-          <el-button type="text" size="small" v-else :disabled="scope.row.auditStatus != 'S'" @click.stop="openCheck(scope.row)">
-              审批
+          <el-button type="text" size="small" v-else :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="openCheck(scope.row)">审批
           </el-button>
         <el-button type="text" size="small" @click.stop="openCheckSchedule(scope.row)">审批流程
         </el-button>
@@ -213,7 +222,19 @@ export default {
                   classifyCode:'业务',
                   groupCode:'销售报告'
               }
-          }else if (type == 'HYCK-FFSQ') {
+          }else if (type == 'HYJK-DJ') {
+              obj = {
+                  businessType:'HYJK',
+                  classifyCode:'业务',
+                  groupCode:'销售报告'
+              }
+          } else if (type == 'KYCK-DJ') {
+              obj = {
+                  businessType:'KYCK',
+                  classifyCode:'业务',
+                  groupCode:'销售报告'
+              }
+          } else if (type == 'HYCK-FFSQ') {
               obj = {
                   businessType:'FFSQ',
                   classifyCode:'付费申请',
@@ -225,9 +246,7 @@ export default {
                   classifyCode:'AMEND',
                   groupCode:'SE'
               }
-          }else {
-
-          }
+          }else {}
           getreportsList(1, 10, obj).then(res=>{
               this.reportRadio(res.data.data.records[0])
           })

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

@@ -587,6 +587,21 @@
                                 </search-query>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="业务类型" prop="billType" >
+                                <span slot="label">
+                                    <span style="color: #1e9fff">业务类型</span>
+                                </span>
+                                <search-query :datalist="seaTypeData"
+                                              :selectValue="assemblyForm.seaType"
+                                              :clearable="true"
+                                              :buttonIf="false"
+                                              :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                                              @corpFocus="seaTypeWorkDictsfun"
+                                              @corpChange="corpChange($event,'seaType')">
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
 
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedDeclare">需报关</el-checkbox>
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
@@ -750,7 +765,7 @@ import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import {NdayDate} from "@/util/date";
 import {getBunitsList} from "@/api/iosBasicData/bunits";
 import {getWorkDicts} from "@/api/system/dictbiz";
-
+import {regularFloating, regularInteger} from "@/util/regularJudgment";
     export default {
         props:{
             detailData:{
@@ -838,12 +853,7 @@ import {getWorkDicts} from "@/api/system/dictbiz";
                     }
                 ],
                 // 业务类型数据
-                seaTypeData:[
-                    {
-                        dictValue:'直航',
-                        dictKey:'直航',
-                    }
-                ],
+                seaTypeData:[],
                 // 危险品弹窗
                 dgVisible:false,
                 // 航空公司数据
@@ -858,7 +868,6 @@ import {getWorkDicts} from "@/api/system/dictbiz";
                 lineData:[],
                 // COLOADER
                 coloaderCnNameData:[],
-
                 marksIndex:1
             }
         },
@@ -1337,6 +1346,12 @@ import {getWorkDicts} from "@/api/system/dictbiz";
                     this.waybillCnNameData = res.data.data.records
                 })
             },
+            // 业务类型
+            seaTypeWorkDictsfun(){
+                getWorkDicts("air_freight_business_type").then(res => {
+                    this.seaTypeData = res.data.data;
+                })
+            },
 
 
         }

src/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue

@@ -32,7 +32,7 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   :disabled="detailData.seeDisabled || selectionList.length"
+                   :disabled="detailData.seeDisabled"
                    @click="handleDelete">删 除
         </el-button>
       </template>

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

@@ -260,7 +260,7 @@ import edicode from '@/views/iosBasicData/AirtransportExport/bills/assembly/edic
 import filescenter from "@/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue";
 import DistributionBox from "@/views/iosBasicData/AirtransportExport/bills/assembly/DistributionBox.vue";
 import feecenter from '@/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue'
-import {getList as userGetList} from '@/api/system/user'
+import {getList, getList as userGetList} from '@/api/system/user'
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import bcorps from "@/views/iosBasicData/bcorps/index.vue";
@@ -292,7 +292,7 @@ import {
     aeabillsCheckBills,
     aeabillsCopyBills,
     aeabillsDetail,
-    aeabillsRevokeCheckBills
+    aeabillsRevokeCheckBills, aeabillsSubmit
 } from "@/api/iosBasicData/aeabills";
     export default {
         components:{
@@ -344,7 +344,7 @@ import {
                     srcType:'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
                     numberOfObl:'THREE', // 正本份数 默认 THREE
                     numberOfCopy:'ONE', // 副本份数 默认 ONE
-                    seaType:'E', // 进出口 默认出口 E=出口 I=进口"
+                    seaType:'直航', // 进出口 默认出口 E=出口 I=进口"
                     marks:'N/M',
                     filesList:[], // 文件中心
                     feeCenterListD:[], // 收
@@ -524,12 +524,12 @@ import {
                             },
                         ],
                         {
-                            label: "制单人",  // 操作id 用户管理下拉 模糊搜索
+                            label: "制单人",
                             text:"制单人",
                             prop: "createUserName",
                             type:'select',
                             dicData:[],
-                            disabled:true,
+                            disabled:false,
                             buttonIf:false,
                             forParameter:{
                                 key:'id',
@@ -548,22 +548,21 @@ import {
                                 buttonIf:false,
                                 forParameter:{
                                     key:'id',
-                                    label:'name',
-                                    value:'name',
+                                    label:'cnName',
+                                    value:'cnName',
                                 },
                             },
                             {
-                                label: "运输类型",
+                                label: "运输类型", // HB/L 付款方式 PP=预付, CC=到付, FPA, Other', 申请之后默认 PP
                                 text:"运输类型",
                                 prop: "transportType",
+                                disabled:false,
                                 type:'select',
                                 dicData:[],
-                                disabled:false,
-                                buttonIf:false,
                                 forParameter:{
-                                    key:'id',
-                                    label:'name',
-                                    value:'name',
+                                    key:'dictKey',
+                                    label:'dictValue',
+                                    value:'dictKey',
                                 },
                             },
                         ]
@@ -587,39 +586,30 @@ import {
                         value:'mblno',
                     },
                     {
-                        name:'外提单号',
+                        name:'Reference NO',
                         value:'refno',
                     },
                     {
-                        name:'船名(VSL)',
-                        value:'vesselCnName',
-                    },
-                    {
-                        name:'航次(VOY)',
+                        name:'航班号',
                         value:'voyageNo',
                     },
                     {
-                        name:'ETD',
-                        value:'etd',
-                    },
-                    {
                         name:'目的港',
-                        value:'destinationNamePrint',
+                        value:'finalDestinationName',
                     },
                     {
                         name:'包装单位',
                         value:'packingUnit',
                     },
                     {
-                        name:'船公司',
+                        name:'航空公司',
                         value:'carrierCnName',
                     },
                     {
-                        name:'场站',
+                        name:'航站',
                         value:'cyCnName',
                     },
                 ],
-
             }
         },
         watch:{
@@ -714,6 +704,12 @@ import {
                     }
                 })
             },
+            // 获取运输类型字典数据
+            transportTypeWorkDictsfun(){
+                getWorkDicts('transportation_type_los').then(res=>{
+                    this.columnforfun('transportType').dicData = res.data.data
+                })
+            },
             // 获取用户管理数据
             userGetListfun(account = undefined,type = false,){
                 userGetList(1,10,{account}).then(res=>{
@@ -739,6 +735,12 @@ import {
                     })
                 })
             },
+            // 获取委托人数据 往来单位数据
+            clientNameBcorpsListfun(cnName){
+                getBcorpsList(1,10,{cnName}).then(res=>{
+                    this.columnforfun('clientName').dicData = res.data.data.records
+                })
+            },
             // 获取客户联系人 客户OP
             getBcorpsattnListfun(cnName){
                 getBcorpsattnList(1,10,{pid:this.form.corpId,cnName}).then(res=>{
@@ -781,6 +783,12 @@ import {
                     this.columnforfun('srcCnName').dicData = res.data.data.records
                 })
             },
+            // 获取制单人数据 用户数据
+            createUserUserGetListfun(account){
+                userGetList(1,10,{account}).then(res=>{
+                    this.columnforfun('createUserName').dicData = res.data.data.records
+                })
+            },
             // 获取公司名称 用户管理左侧
             ownDeptLazyTreefun(){
                 getDeptLazyTree(0).then(res=>{
@@ -797,14 +805,17 @@ import {
             },
             // 申请B/L NO
             billsGetBillNofun(){
-                let billNoFormat = ''
-                if (this.form.cargoType == 'dry') {
-                    billNoFormat = 'KYCK-PH'
-                }else if (this.form.cargoType == 'danger') {
+                let billNoFormat = 'KYCK'
+                // if (this.form.cargoType == 'dry') {
+                //     billNoFormat = 'KYCK-PH'
+                // }else if (this.form.cargoType == 'danger') {
+                //     billNoFormat = 'KYCK-WXP'
+                // }else if (this.form.cargoType == 'reefer') {
+                //     billNoFormat = 'KYCK-DG'
+                // }else {}
+                if (this.form.cargoType) {
                     billNoFormat = 'KYCK-WXP'
-                }else if (this.form.cargoType == 'reefer') {
-                    billNoFormat = 'KYCK-DG'
-                }else {}
+                }
                 billsGetBillNo({
                     businessTypeCode:'KYCK',
                     billNoFormat:billNoFormat
@@ -826,7 +837,7 @@ import {
                     this.getBcorpsattnListfun(value)
                 }else if (name == 'srcType') {
                     this.srcTypeWorkDictsfun()
-                } else if (name == 'srcCnName') {
+                }else if (name == 'srcCnName') {
                     if (this.form.srcType == 'SALES') {
                         // 业务员
                         this.columnforfun('srcCnName').forParameter = { key:'id', label:'name', value:'name'}
@@ -840,8 +851,13 @@ import {
                         this.columnforfun('srcCnName').forParameter = { key:'id', label:'title', value:'title'}
                         this.ownDeptLazyTreefun()
                     }else {}
-                }else {
-
+                }else if (name == 'transportType') {
+                    this.transportTypeWorkDictsfun()
+                }else if (name == 'clientName') {
+                    this.clientNameBcorpsListfun(value)
+                }else if (name == 'createUserName') {
+                    this.createUserUserGetListfun(value)
+                } else {
                 }
 
             },
@@ -982,6 +998,22 @@ import {
                     // 分单付费方式
                     this.form[name] = value
                 }
+                else if (name == 'clientName') {
+                    for(let item of this.columnforfun('clientName').dicData) {
+                        if (item.cnName == value) {
+                            this.$set(this.form,'clientName',item.cnName)
+                            this.$set(this.form,'clientId',item.id)
+                        }
+                    }
+                }
+                else if (name == 'createUserName') {
+                    for(let item of this.columnforfun('createUserName').dicData) {
+                        if (item.cnName == value) {
+                            this.$set(this.form,'createUserName',item.name)
+                            this.$set(this.form,'createUserId',item.id)
+                        }
+                    }
+                }
                 else {
                     this.form[name] = value
                 }
@@ -1199,15 +1231,20 @@ import {
             },
             // 主表保存接口大保存
             billsSubmitfun(){
-                if (this.form.cargoType = 'dry') {
-                    // 普货
-                    this.form.billNoFormat = 'KYCK-PH'
-                }else if (this.form.cargoType = 'danger'){
-                    // 危险品
+                // if (this.form.cargoType = 'dry') {
+                //     // 普货
+                //     this.form.billNoFormat = 'KYCK-PH'
+                // }else if (this.form.cargoType = 'danger'){
+                //     // 危险品
+                //     this.form.billNoFormat = 'KYCK-WXP'
+                // }else if (this.form.cargoType = 'reefer') {
+                //     // 冻柜
+                //     this.form.billNoFormat = 'KYCK-DG'
+                // }else {
+                //
+                // }
+                if (this.form.cargoType) {
                     this.form.billNoFormat = 'KYCK-WXP'
-                }else if (this.form.cargoType = 'reefer') {
-                    // 冻柜
-                    this.form.billNoFormat = 'KYCK-DG'
                 }else {
                     this.form.billNoFormat = 'KYCK'
                 }
@@ -1308,7 +1345,7 @@ import {
                     }
                 })
                 this.pageLoading = true
-                billsSubmit(this.form).then(res=>{
+                aeabillsSubmit(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message({
                         type: "success",

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

@@ -1513,7 +1513,6 @@ import { getDeptTree } from "@/api/system/dept";
         aeabillsList(page.currentPage, page.pageSize, {
             ...Object.assign(params, this.query),
             businessType:'AE',
-            seaType:'E',
             status:this.query.billStatus == 3?3:undefined,
         }).then(res => {
           const data = res.data.data;

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

@@ -32,7 +32,7 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   :disabled="detailData.seeDisabled || selectionList.length"
+                   :disabled="detailData.seeDisabled"
                    @click="handleDelete">删 除
         </el-button>
       </template>

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -45,10 +45,10 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="原外提单号:" prop="refno">
+                            <el-form-item label="原ReferenceNO:" prop="refno" label-width="110px">
                                 <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
                                           size="small" autocomplete="off"
-                                          clearable placeholder="请输入原外提单号">
+                                          clearable placeholder="请输入原Reference NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -129,16 +129,16 @@
                         </el-col>
 
                         <el-col :span="5">
-                            <el-form-item label="船名:" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName"
+                            <el-form-item label="航空公司:" prop="vesselCnName">
+                                <el-input style="width: 100%;" v-model="form.carrierCnName"
                                           size="small" autocomplete="off"
                                           :disabled="true"
-                                          clearable placeholder="船名">
+                                          clearable placeholder="航空公司">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="航次:" prop="voyageNo">
+                            <el-form-item label="航班号:" prop="voyageNo">
                                 <el-input style="width: 100%;" v-model="form.voyageNo"
                                           size="small" autocomplete="off"
                                           :disabled="true"
@@ -365,6 +365,7 @@ import {
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
+import {aeabillsGetDetail} from "@/api/iosBasicData/aeabills";
 
 export default {
     components: {reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
@@ -1081,14 +1082,19 @@ export default {
             if (!this.form.mblno && !this.form.hblno && !this.form.refno && !this.form.bookingNo) {
                 return this.$message.warning('请填写至少一项检索条件')
             }
-            billsGetDetail({
+            aeabillsGetDetail({
                 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,
+                type:'AE',
             }).then(res => {
-                this.retrievePopupsType = true
                 this.retrievePopupsData = res.data.data
+                if (res.data.data.length == 1) {
+                    this.retrievePopupsSelect(this.retrievePopupsData[0])
+                }else {
+                    this.retrievePopupsType = true
+                }
             })
         },
         // 多选回调

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -407,7 +407,7 @@
                                     <!--            :loading="saveLoading" @click="ResetFilter">重置条件-->
                                     <!--</el-button>-->
                                     <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="editSave"
-                                                :loading="saveLoading" @click="finstlbillslistAccBillV1fun" >检 索
+                                                :loading="saveLoading" @click="retrievalfun" >检 索
                                     </el-button>
                                 </div>
                             </el-col>
@@ -484,6 +484,34 @@
         </div>
 
 
+        <!--选择数据弹窗-->
+        <el-dialog
+            title="选择数据"
+            class="el-dialogDeep"
+            :visible.sync="retrievePopupsType"
+            append-to-body
+            width="70%"
+            :close-on-click-modal="false">
+            <div>
+                <avue-crud
+                    :option="retrievePopupsOption"
+                    :data="retrievePopupsData"
+                    ref="retrievePopupsRef"
+                    id="out-table">
+                    <template slot="menu" slot-scope="{ row }">
+                        <el-button
+                            type="text"
+                            icon=""
+                            size="small"
+                            @click.stop="retrievePopupsSelect(row)"
+                        >选择
+                        </el-button>
+                    </template>
+                </avue-crud>
+            </div>
+        </el-dialog>
+
+
         <!--设计报表弹窗-->
         <el-dialog append-to-body title="设计报表" class="el-dialogDeep" :visible.sync="DesignreportDialog" width="70%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -529,7 +557,7 @@
         finstlbillsDetail,
         finstlbillslistAccBillV1, finstlbillsRevokeReconciliation, finstlbillsRevokeSignFor,
         finstlbillsSubmit,
-        finstlbillsitemsRemove
+        finstlbillsitemsRemove, finstlbillslistAccBillByCorp
     } from '@/api/iosBasicData/finstlbills'
     import expand from "@/components/basic-container/expand.vue";
     import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -550,6 +578,34 @@
         },
         data(){
             return {
+                retrievePopupsType:false, // 弹窗开启关闭
+                retrievePopupsData:[], // 选择弹窗数据
+                retrievePopupsOption: {
+                    border: true,
+                    calcHeight: 30,
+                    tip: false,
+                    height: 'auto',
+                    index: true,
+                    addBtn: false,
+                    viewBtn: false,
+                    delBtn: false,
+                    editBtn: false,
+                    refreshBtn: false,
+                    columnBtn: false,
+                    menuWidth: '60',
+                    column: [
+                        {
+                            label: "客户中文名",
+                            prop: "cnName",
+                            overHidden: true,
+                        },
+                        {
+                            label: "客户英文文名",
+                            prop: "cnName",
+                            overHidden: true,
+                        },
+                    ]
+                },
                 DesignreportDialog:false, // 设计报表弹窗
                 selectPrintingDialog:false, // 预览报表
                 statusType:false, // 确认发票
@@ -881,13 +937,72 @@
                 this.form = {}
 
             },
+            // 弹窗选择
+            retrievePopupsSelect(row){
+                this.form = row
+                this.$set(this.form,'corpId',row.id)
+                this.$set(this.form,'corpCnName',row.cnName)
+                this.$set(this.form,'corpEnName',row.enName)
+                this.$set(this.form,'corpArgreementNo',row.enName)
+                this.retrievePopupsType = false
+                this.finstlbillslistAccBillV1fun()
+            },
+            // 检索
+            retrievalfun(){
+                // 判断是否有对账单位
+                if (!this.form.corpId && (this.form.businessNo || this.form.accountNo || this.form.hblno || this.form.mblno)) {
+                    console.log('新接口')
+                    this.finstlbillslistAccBillByCorpfun()
+                }else {
+                    if (!this.form.corpId) {
+                        return this.$message.warning('请填写对账单位')
+                    }
+                    console.log('原来的接口')
+                    this.finstlbillslistAccBillV1fun()
+                }
+            },
+            // 检索出的弹窗
+            finstlbillslistAccBillByCorpfun(){
+                delete this.form.id
+                // let obj = JSON.parse(JSON.stringify(this.form))
+                let obj = {}
+                obj.type = '1'
+                obj.auditStatus = this.form.isApproved // 审核状态 0 新建费用 1 已请核 2 审核中 3 驳回 4 通过
+                obj.corpCnName = this.form.corpId // 对账单位
+                obj.isSignfor = this.form.isSignfor // 是否已签收（0 否 1是）
+                obj.dc = this.form.dc // 收付 D=收 C=付
+                obj.curCode = this.form.curCode // 币别
+                obj.srcType = this.form.srcType // 业务来源
+                obj.srcCnName = this.form.srcId // 业务员id
+                obj.isCleared = this.form.isCleared // 是否销账（0 未销账 3 部分销账 9 销账）
+                obj.accBillNo = this.form.accountNo // 账单编号  ACCT NO
+                obj.billNo = this.form.businessNo // 单据编号  JOB NO
+                obj.mblno = this.form.mblno // MB/L NO
+                obj.hblno = this.form.hblno // HB/L NO
+                obj.isChecked = this.form.isChecked // 是否对账（0 未对账 1 已对账）
+                obj.queryAmount = this.form.queryAmount // 查询金额
+                obj.businessType = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                obj.invoiceStatus = this.form.isInvoice // 发票状态 0 = 未开 9=已开 2 待开 3 不开
+                obj.vesselCnName = this.form.vesselCnName // 中文船名
+                obj.invoiceNo = this.form.invoiceNo // 发票号
+                obj.bookingNo = this.form.bookingNo // 订舱号 BKNO
+                obj.createUserName = this.form.updateUser // 操作员id
+                obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
+                obj.threeInspectionsNo = this.form.threeInspectionsNo // 三检单号
+                obj.voyageNo = this.form.voyageNo // 航次
+                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 // 审核结束日期
+                finstlbillslistAccBillByCorp(obj).then(res=>{
+                    this.retrievePopupsType = true
+                    this.retrievePopupsData = res.data.data
+                })
+            },
             // 检索接口
             finstlbillslistAccBillV1fun(){
-                // 对账单位
-                if (!this.form.corpId) {
-                    this.$message.warning('请选择对账单位');
-                    return
-                }
                 delete this.form.id
                 // let obj = JSON.parse(JSON.stringify(this.form))
                 let obj = {}