货代bug 2024-1-27

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

@@ -1251,7 +1251,8 @@
                 this.templateVisible = true
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
-                    status:0
+                    status:0,
+                    type:'AE'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细
@@ -1494,7 +1495,6 @@
                 // 判断必填项
                 let sum = '请输入'
                 for (let item of selectionArr) {
-                    console.log(item,1339)
                     if (!item.id) {
                         this.$message.warning(`序号${item.$index + 1}请先保存再进行生成账单`)
                         return
@@ -1528,16 +1528,12 @@
                     let billList = []
                     if (dc == 'D') {
                         for(let item of this.selectionDList) {
-                            if (item.accStatus == 0){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsGenerateBillfun(billList)
                     }else {
                         for(let item of this.selectionCList) {
-                            if (item.accStatus == 0){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsGenerateBillfun(billList)
                     }
@@ -1553,16 +1549,12 @@
                     let billList = []
                     if (dc == 'D') {
                         for(let item of this.selectionDList) {
-                            if (item.accStatus == 1){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsRevokeBillfun(billList)
                     }else {
                         for(let item of this.selectionCList) {
-                            if (item.accStatus == 1){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsRevokeBillfun(billList)
                     }

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

@@ -1251,7 +1251,8 @@
                 this.templateVisible = true
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
-                    status:0
+                    status:0,
+                    type:'AI'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细
@@ -1494,7 +1495,6 @@
                 // 判断必填项
                 let sum = '请输入'
                 for (let item of selectionArr) {
-                    console.log(item,1339)
                     if (!item.id) {
                         this.$message.warning(`序号${item.$index + 1}请先保存再进行生成账单`)
                         return
@@ -1528,16 +1528,12 @@
                     let billList = []
                     if (dc == 'D') {
                         for(let item of this.selectionDList) {
-                            if (item.accStatus == 0){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsGenerateBillfun(billList)
                     }else {
                         for(let item of this.selectionCList) {
-                            if (item.accStatus == 0){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsGenerateBillfun(billList)
                     }
@@ -1553,16 +1549,12 @@
                     let billList = []
                     if (dc == 'D') {
                         for(let item of this.selectionDList) {
-                            if (item.accStatus == 1){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsRevokeBillfun(billList)
                     }else {
                         for(let item of this.selectionCList) {
-                            if (item.accStatus == 1){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsRevokeBillfun(billList)
                     }

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -613,6 +613,11 @@ export default {
         corpChange(value,name){
             // 结算单位
             if (name == 'corpCnName') {
+                // 开户银行
+                this.$set(this.form,'bankId','')
+                this.$set(this.form,'bankAccountName','')
+                this.$set(this.form,'bankAccountBank','')
+                this.$set(this.form,'bankAccountNo','')
                 if (!value) {
                     this.$set(this.form,'corpId','')
                     this.$set(this.form,'corpCnName','')
@@ -625,6 +630,7 @@ export default {
                         this.$set(this.form,'corpCnName',item.cnName)
                         this.$set(this.form,'corpEnName',item.enName)
                         this.$set(this.form,'corpArgreementNo',item.enName)
+                        this.bcorpsbankListfun()
                     }
                 }
             }
@@ -1110,6 +1116,12 @@ export default {
                     item.accountBankNo = item.accountBank + ' - ' + item.accountNo
                     return item
                 })
+                if (!this.form.bankId) {
+                    this.$set(this.form,'bankId',res.data.data.records[0].id)
+                    this.$set(this.form,'bankAccountName',res.data.data.records[0].accountName)
+                    this.$set(this.form,'bankAccountBank',res.data.data.records[0].accountBank)
+                    this.$set(this.form,'bankAccountNo',res.data.data.records[0].accountNo)
+                }
             })
         },
         // 预览报表

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

@@ -1271,7 +1271,8 @@
                 this.templateVisible = true
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
-                    status:0
+                    status:0,
+                    type:'SI'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细
@@ -1514,7 +1515,6 @@
                 // 判断必填项
                 let sum = '请输入'
                 for (let item of selectionArr) {
-                    console.log(item,1339)
                     if (!item.id) {
                         this.$message.warning(`序号${item.$index + 1}请先保存再进行生成账单`)
                         return
@@ -1548,16 +1548,12 @@
                     let billList = []
                     if (dc == 'D') {
                         for(let item of this.selectionDList) {
-                            if (item.accStatus == 0){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsGenerateBillfun(billList)
                     }else {
                         for(let item of this.selectionCList) {
-                            if (item.accStatus == 0){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsGenerateBillfun(billList)
                     }
@@ -1573,16 +1569,12 @@
                     let billList = []
                     if (dc == 'D') {
                         for(let item of this.selectionDList) {
-                            if (item.accStatus == 1){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsRevokeBillfun(billList)
                     }else {
                         for(let item of this.selectionCList) {
-                            if (item.accStatus == 1){
-                                billList.push(item)
-                            }
+                            billList.push(item)
                         }
                         this.finaccbillsRevokeBillfun(billList)
                     }

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

@@ -1288,7 +1288,8 @@
                 this.templateVisible = true
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
-                    status:0
+                    status:0,
+                    type:'SE'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -136,7 +136,7 @@
                             </el-col>
                             <el-col :span="4">
                                 <el-form-item label="对账" prop="isChecked" label-width="50px">
-                                    <search-query :datalist="allyesnoData"
+                                    <search-query :datalist="isCheckedData"
                                                   :selectValue="form.isChecked"
                                                   :clearable="true"
                                                   :disabled="editSave"
@@ -642,6 +642,7 @@
                 handleSelectionData:[], // 表格选择的数据
                 corpData:[], // 对账单位 数据
                 allyesnoData:[], // 全部是否字典数据
+                isCheckedData:[], // 对账状态字典数据
                 isClearedData:[], // 销项
                 isInvoiceData:[],// 发票字典
                 // 收 / 付
@@ -1349,12 +1350,12 @@
             // 获取 全部是否 接口
             allyesnoWorkDictsfun(){
                 // 全部/是/否
-                // getWorkDicts('all_yes_no').then(res=>{
-                //     this.allyesnoData = res.data.data;
-                // })
+                getWorkDicts('all_yes_no').then(res=>{
+                    this.allyesnoData = res.data.data;
+                })
                 // 对账字典
                 getWorkDicts('los_check_status').then(res=>{
-                    this.allyesnoData = res.data.data;
+                    this.isCheckedData = res.data.data;
                 })
                 // 销账(F)
                 getWorkDicts('write_off_los').then(res=>{

src/views/iosBasicData/finstlbills/index.vue

@@ -702,9 +702,12 @@
             getWorkDicts('ifInvoice').then(res=>{
                 this.findObject(this.option.column, "isApproved").dicData = res.data.data
                 this.findObject(this.option.column, "isSignfor").dicData = res.data.data
-                this.findObject(this.option.column, "isChecked").dicData = res.data.data
                 this.findObject(this.option.column, "isCleared").dicData = res.data.data
             })
+            // 对账状态字典
+            getWorkDicts('los_check_status').then(res=>{
+                this.findObject(this.option.column, "isChecked").dicData = res.data.data
+            })
             // 是否开发票
             getWorkDicts('invoice_los').then(res=>{
                 this.findObject(this.option.column, "isInvoice").dicData = res.data.data