货代bug 2024-1-26

src/views/approveDataH/index.vue

@@ -75,6 +75,16 @@
                      @click.stop="printWindowfun(scope.row,'sia-approve')">审批
           </el-button>
           <el-button type="text" size="small"
+                     v-else-if="scope.row.checkType == 'aea-approve'"
+                     :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="printWindowfun(scope.row,'aea-approve')">审批
+          </el-button>
+          <el-button type="text" size="small"
+                     v-else-if="scope.row.checkType == 'aia-approve'"
+                     :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="printWindowfun(scope.row,'aia-approve')">审批
+          </el-button>
+          <el-button type="text" size="small"
                      v-else
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="openCheck(scope.row)">审批

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

@@ -290,16 +290,17 @@
                             <span slot="label">
                                 <span style="color: #1e9fff">出口代理</span>
                             </span>
-                            <search-query :datalist="cargoTypeData"
+                            <search-query :datalist="bookingAgentData"
                                           :selectValue="assemblyForm.bookingAgentCnName"
                                           :filterable="true"
                                           :clearable="true"
                                           :remote="true"
                                           :disabled="detailData.seeDisabled"
                                           :buttonIf="false"
-                                          @remoteMethod="remoteMethod($event,'bookingAgentCnName')"
-                                          @corpChange="corpChange($event,'bookingAgentCnName')"
-                                          @corpFocus="remoteMethod($event,'bookingAgentCnName')" >
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="remoteMethod($event,'bookingAgent')"
+                                          @corpChange="corpChange($event,'bookingAgent')"
+                                          @corpFocus="remoteMethod($event,'bookingAgent')" >
                             </search-query>
                         </el-form-item>
 
@@ -821,8 +822,6 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 destinationData:[],
                 // 目的港
                 finalDestinationData:[],
-                // 中转港
-                potData:[],
                 // 商品 HS-CODE
                 commodityData:[],
                 // 货物类别
@@ -1268,15 +1267,6 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 })
             },
 
-            // 中转港
-            potBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.potData = res.data.data.records.map(item=>{
-                        item.enName = item.enName + ' - ' + item.code
-                        return item
-                    })
-                })
-            },
             // 获取类别 COLOADER 数据
             bcorpstypedefineListfun(cnName){
                 let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'

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

@@ -230,22 +230,14 @@
                                       @corpFocus="remoteMethod($event,'pot')" >
                         </search-query>
                     </el-form-item>
-                    <el-form-item label="中转航班" prop="potEnName" >
+                    <el-form-item label="中转航班" prop="potVoyageNo" >
                             <span slot="label">
                                 <span style="color: #1e9fff">中转航班</span>
                             </span>
-                        <search-query :datalist="potData"
-                                      :selectValue="assemblyForm.potVoyageNo"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'pot')"
-                                      @corpChange="corpChange($event,'pot')"
-                                      @corpFocus="remoteMethod($event,'pot')" >
-                        </search-query>
+                            <el-input style="width: 100%;" v-model="assemblyForm.potVoyageNo"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="请输入中转航班" ></el-input>
                     </el-form-item>
                     <el-form-item label="中转ETD" prop="potEnName" >
                             <span slot="label">
@@ -528,6 +520,8 @@
                 mpayplaceData:[],
                 // 签单地点
                 issueAtData:[],
+                // 中转港
+                potData:[],
 
             }
         },
@@ -565,6 +559,9 @@
                 else if (payplaceArr.indexOf(name) != -1) {
                     this[name + 'BportsListfun'](value)
                 }
+                else if (name == 'pot') {
+                    this.potBportsListfun()
+                }
                 else {}
 
             },
@@ -655,6 +652,17 @@
                         }
                     }
                 }
+                // 中转港
+                else if (name == 'pot') {
+                    for (let item of this.potData) {
+                        if (item.enName == value) {
+                            this.$set(this.assemblyForm,'potId',item.id)
+                            this.$set(this.assemblyForm,'potCode',item.code)
+                            this.$set(this.assemblyForm,'potCnName',item.cnName)
+                            this.$set(this.assemblyForm,'potEnName',item.enName)
+                        }
+                    }
+                }
                 else {
                     this.assemblyForm[name] = value
                 }
@@ -662,6 +670,15 @@
 
 
             // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
+            // 中转港
+            potBportsListfun(enName){
+                bportsList(1,10,{enName}).then(res=>{
+                    this.potData = res.data.data.records.map(item=>{
+                        item.enName = item.enName + ' - ' + item.code
+                        return item
+                    })
+                })
+            },
             // 获取船名数据
             vesselBvesselsListfun(cnName){
                 getBvesselsList(1,10,{cnName}).then(res=>{

src/views/iosBasicData/AirtransportImport/bills/assembly/mbinformation.vue

@@ -230,22 +230,14 @@
                                       @corpFocus="remoteMethod($event,'pot')" >
                         </search-query>
                     </el-form-item>
-                    <el-form-item label="中转航班" prop="potEnName" >
+                    <el-form-item label="中转航班" prop="potVoyageNo" >
                             <span slot="label">
                                 <span style="color: #1e9fff">中转航班</span>
                             </span>
-                        <search-query :datalist="potData"
-                                      :selectValue="assemblyForm.potVoyageNo"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'pot')"
-                                      @corpChange="corpChange($event,'pot')"
-                                      @corpFocus="remoteMethod($event,'pot')" >
-                        </search-query>
+                        <el-input style="width: 100%;" v-model="assemblyForm.potVoyageNo"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="请输入中转航班" ></el-input>
                     </el-form-item>
                     <el-form-item label="中转ETD" prop="potEnName" >
                             <span slot="label">

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -387,6 +387,7 @@ 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 reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
+import {aeabillsGetDetail} from "@/api/iosBasicData/aeabills";
 
 export default {
     components: {reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
@@ -1135,7 +1136,7 @@ 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,