货代bug 2024-1-26

src/views/billM/billingCenter/index.vue

@@ -349,6 +349,21 @@
                   prop: "appliedInvoiceAmountStl",
                   overHidden:true,
               },
+              {
+                  label: "已对账金额",
+                  prop: "reconciliationAmountUsd",
+                  overHidden:true,
+              },
+              {
+                  label: "已申请结算金额",
+                  prop: "appliedAmountStlUsd",
+                  overHidden:true,
+              },
+              {
+                  label: "已申请发票结算金额",
+                  prop: "appliedInvoiceAmountStlUsd",
+                  overHidden:true,
+              },
             {
               label: "CNY应收",
               prop: "amountDr",

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

@@ -270,22 +270,22 @@
                                           @blur="textareaBlur('commodityDescr')" ></el-input>
                             </div>
                         </el-row>
-                        <el-form-item label="制单人" prop="voyageNo" label-width="80px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">制单人</span>
-                            </span>
-                            <search-query :datalist="cargoTypeData"
-                                          :selectValue="assemblyForm.createUserName"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          @remoteMethod="remoteMethod($event,'createUserName')"
-                                          @corpChange="corpChange($event,'createUserName')"
-                                          @corpFocus="remoteMethod($event,'createUserName')" >
-                            </search-query>
-                        </el-form-item>
+                        <!--<el-form-item label="制单人" prop="voyageNo" label-width="80px" >-->
+                        <!--    <span slot="label">-->
+                        <!--        <span style="color: #1e9fff">制单人</span>-->
+                        <!--    </span>-->
+                        <!--    <search-query :datalist="cargoTypeData"-->
+                        <!--                  :selectValue="assemblyForm.createUserName"-->
+                        <!--                  :filterable="true"-->
+                        <!--                  :clearable="true"-->
+                        <!--                  :remote="true"-->
+                        <!--                  :disabled="detailData.seeDisabled"-->
+                        <!--                  :buttonIf="false"-->
+                        <!--                  @remoteMethod="remoteMethod($event,'createUserName')"-->
+                        <!--                  @corpChange="corpChange($event,'createUserName')"-->
+                        <!--                  @corpFocus="remoteMethod($event,'createUserName')" >-->
+                        <!--    </search-query>-->
+                        <!--</el-form-item>-->
                         <el-form-item label="出口代理" prop="voyageNo" label-width="80px" >
                             <span slot="label">
                                 <span style="color: #1e9fff">出口代理</span>
@@ -608,7 +608,7 @@
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isStorage">需仓储</el-checkbox>
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedLand">需陆运</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isGoodsTracking">需货物跟踪</el-checkbox>
+                        <!--<el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isGoodsTracking">需货物跟踪</el-checkbox>-->
                     </el-col>
                 </el-col>
                 <el-col :span="24">

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

@@ -36,17 +36,6 @@
                                       clearable placeholder="箱型箱量" ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="booking NO" prop="bookingNo" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">booking NO</span>
-                            </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingNo"
-                                      size="small" autocomplete="off"
-                                      disabled
-                                      clearable placeholder="booking NO" ></el-input>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
             </el-form>
         </div>
@@ -2033,13 +2022,17 @@
             feecenterEditfun(dc){
                 if (dc == 'D') {
                     for(let item of this.assemblyForm.feeCenterListD) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }else {
                     for(let item of this.assemblyForm.feeCenterListC) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }
             },

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

@@ -408,7 +408,7 @@
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
                                   size="small" autocomplete="off"
                                   :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入预付总额" ></el-input>
+                                  clearable placeholder="请输入运输条款" ></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">

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

@@ -336,6 +336,8 @@ import {
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
                     operatorName:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
                     operatorId:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
+                    createUserName:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // 默认登录人
+                    createUserId:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // 默认登录人
                     businessType:'AE', // 业务类型 默认
                     billType:'DD', // 单据类型 默认 直单
                     issueType:'正本', // 签单方式 默认 正本
@@ -1147,6 +1149,9 @@ import {
                 if (popupReminder(this.form,this.messageData)) {
                     return;
                 }
+                if (this.form.feeCenterListC.length == 0 && this.form.feeCenterListD == 0) {
+                    return this.$message.warning('请添加费用信息')
+                }
                 this.$confirm("确定要请核数据?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",

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

@@ -270,22 +270,22 @@
                                           @blur="textareaBlur('commodityDescr')" ></el-input>
                             </div>
                         </el-row>
-                        <el-form-item label="制单人" prop="voyageNo" label-width="80px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">制单人</span>
-                            </span>
-                            <search-query :datalist="cargoTypeData"
-                                          :selectValue="assemblyForm.createUserName"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          @remoteMethod="remoteMethod($event,'createUserName')"
-                                          @corpChange="corpChange($event,'createUserName')"
-                                          @corpFocus="remoteMethod($event,'createUserName')" >
-                            </search-query>
-                        </el-form-item>
+                        <!--<el-form-item label="制单人" prop="voyageNo" label-width="80px" >-->
+                        <!--    <span slot="label">-->
+                        <!--        <span style="color: #1e9fff">制单人</span>-->
+                        <!--    </span>-->
+                        <!--    <search-query :datalist="cargoTypeData"-->
+                        <!--                  :selectValue="assemblyForm.createUserName"-->
+                        <!--                  :filterable="true"-->
+                        <!--                  :clearable="true"-->
+                        <!--                  :remote="true"-->
+                        <!--                  :disabled="detailData.seeDisabled"-->
+                        <!--                  :buttonIf="false"-->
+                        <!--                  @remoteMethod="remoteMethod($event,'createUserName')"-->
+                        <!--                  @corpChange="corpChange($event,'createUserName')"-->
+                        <!--                  @corpFocus="remoteMethod($event,'createUserName')" >-->
+                        <!--    </search-query>-->
+                        <!--</el-form-item>-->
                         <el-form-item label="出口代理" prop="voyageNo" label-width="80px" >
                             <span slot="label">
                                 <span style="color: #1e9fff">出口代理</span>
@@ -607,7 +607,7 @@
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isStorage">需仓储</el-checkbox>
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedLand">需陆运</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isGoodsTracking">需货物跟踪</el-checkbox>
+                        <!--<el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isGoodsTracking">需货物跟踪</el-checkbox>-->
                     </el-col>
                 </el-col>
                 <el-col :span="24">
@@ -821,8 +821,6 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 destinationData:[],
                 // 目的港
                 finalDestinationData:[],
-                // 中转港
-                potData:[],
                 // 商品 HS-CODE
                 commodityData:[],
                 // 货物类别
@@ -1268,15 +1266,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/AirtransportImport/bills/assembly/feecenter.vue

@@ -36,17 +36,6 @@
                                       clearable placeholder="箱型箱量" ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="booking NO" prop="bookingNo" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">booking NO</span>
-                            </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingNo"
-                                      size="small" autocomplete="off"
-                                      disabled
-                                      clearable placeholder="booking NO" ></el-input>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
             </el-form>
         </div>
@@ -1043,7 +1032,7 @@
                         value:'mblno',
                     },
                     {
-                        name:'Reference NO',
+                        name:'RET MBLNO',
                         value:'refno',
                     },
                     {
@@ -2033,13 +2022,17 @@
             feecenterEditfun(dc){
                 if (dc == 'D') {
                     for(let item of this.assemblyForm.feeCenterListD) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }else {
                     for(let item of this.assemblyForm.feeCenterListC) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }
             },

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

@@ -408,7 +408,7 @@
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
                                   size="small" autocomplete="off"
                                   :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入预付总额" ></el-input>
+                                  clearable placeholder="请输入运输条款" ></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -520,6 +520,8 @@
                 mpayplaceData:[],
                 // 签单地点
                 issueAtData:[],
+                // 中转港
+                potData:[],
 
             }
         },
@@ -557,6 +559,9 @@
                 else if (payplaceArr.indexOf(name) != -1) {
                     this[name + 'BportsListfun'](value)
                 }
+                else if (name == 'pot') {
+                    this.potBportsListfun()
+                }
                 else {}
 
             },
@@ -647,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
                 }
@@ -654,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/billsDetails.vue

@@ -337,6 +337,8 @@ import {
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
                     operatorName:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
                     operatorId:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
+                    createUserName:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // 默认登录人
+                    createUserId:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // 默认登录人
                     businessType:'AI', // 业务类型 默认
                     billType:'DD', // 单据类型 默认 直单
                     issueType:'正本', // 签单方式 默认 正本
@@ -1148,6 +1150,9 @@ import {
                 if (popupReminder(this.form,this.messageData)) {
                     return;
                 }
+                if (this.form.feeCenterListC.length == 0 && this.form.feeCenterListD == 0) {
+                    return this.$message.warning('请添加费用信息')
+                }
                 this.$confirm("确定要请核数据?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -2041,13 +2041,17 @@
             feecenterEditfun(dc){
                 if (dc == 'D') {
                     for(let item of this.assemblyForm.feeCenterListD) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }else {
                     for(let item of this.assemblyForm.feeCenterListC) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }
             },

src/views/iosBasicData/OceanFreightImport/bills/assembly/formbottom.vue

@@ -94,7 +94,7 @@
                                       :filterable="true"
                                       :clearable="true"
                                       :remote="true"
-                                      :disabled="detailData.seeDisabled"
+                                      :disabled="true"
                                       :buttonIf="false"
                                       @corpChange="corpChange($event,'businessType')">
                         </search-query>

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

@@ -1191,6 +1191,9 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (popupReminder(this.form,this.messageData)) {
                     return;
                 }
+                if (this.form.feeCenterListC.length == 0 && this.form.feeCenterListD == 0) {
+                    return this.$message.warning('请添加费用信息')
+                }
                 this.$confirm("确定要请核数据?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",

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

@@ -26,6 +26,7 @@
             <el-table-column
                 prop="lineNo"
                 label="行号" width="50px">
+                <template slot-scope="scope" >{{Number(scope.$index) + 1}}</template>
             </el-table-column>
             <el-table-column
                 prop="isCleared"

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

@@ -2059,13 +2059,17 @@
             feecenterEditfun(dc){
                 if (dc == 'D') {
                     for(let item of this.assemblyForm.feeCenterListD) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }else {
                     for(let item of this.assemblyForm.feeCenterListC) {
-                        this.$delete(item, 'edit')
-                        this.$set(item,'edit',true)
+                        if (item.accStatus != 1) {
+                            this.$delete(item, 'edit')
+                            this.$set(item,'edit',true)
+                        }
                     }
                 }
             },

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

@@ -94,7 +94,7 @@
                                       :filterable="true"
                                       :clearable="true"
                                       :remote="true"
-                                      :disabled="detailData.seeDisabled"
+                                      :disabled="true"
                                       :buttonIf="false"
                                       @corpChange="corpChange($event,'businessType')">
                         </search-query>

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

@@ -1246,6 +1246,9 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (popupReminder(this.form,this.messageData)) {
                     return;
                 }
+                if (this.form.feeCenterListC.length == 0 && this.form.feeCenterListD == 0) {
+                    return this.$message.warning('请添加费用信息')
+                }
                 this.$confirm("确定要请核数据?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",

src/views/iosBasicData/aeamends/index.vue

@@ -52,7 +52,7 @@
                   </el-button>
               </template>
               <template slot="billNo" slot-scope="{ row }">
-                  <span style="color: #1e9fff;" @click="rowEdit(row)">{{row.billNo}}</span>
+                  <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{row.billNo}}</span>
               </template>
           </avue-crud>
       </basic-container>

src/views/iosBasicData/aiamends/index.vue

@@ -52,7 +52,7 @@
                   </el-button>
               </template>
               <template slot="billNo" slot-scope="{ row }">
-                  <span style="color: #1e9fff;" @click="rowEdit(row)">{{row.billNo}}</span>
+                  <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{row.billNo}}</span>
               </template>
           </avue-crud>
       </basic-container>

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -466,11 +466,14 @@
                     <el-button  size="small" type="danger" style="margin-left: 10px" :disabled="editSave"
                                 :loading="saveLoading" @click="batchDeletefun" >一键删除
                     </el-button>
+                    <el-button  size="small" type="primary" style="margin-left: 10px"
+                                :loading="saveLoading" @click="editHandle" >一键编辑
+                    </el-button>
                     <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="editSave"
-                                :loading="saveLoading" @click="Confirminvoicefun">是否确认开票
+                                :loading="saveLoading" @click="Confirminvoicefun">禁止开票
                     </el-button>
                     <el-button  size="small" type="warning" style="margin-right: 8px" :disabled="editSave"
-                                :loading="saveLoading" @click="Notinvoicingfun">是否撤销开票
+                                :loading="saveLoading" @click="Notinvoicingfun">取消禁止开票
                     </el-button>
                 </div>
 
@@ -876,7 +879,7 @@
                         return item
                     })
                 }else {
-                    this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
+                    this.form.finStlBillsItemsList = this.form.finStlBillsItemsList.map((item,index)=>{
                         if (item.currentStlCurCode == 'CNY') {
                             item.currentStlAmount = item.currentStlAmountRMB
                         }else {