货代bug 2024-1-25

src/api/iosBasicData/finstlbills.js

@@ -105,6 +105,22 @@ export const finstlbillsRevokeReconciliation = (row) => {
     data: row
   })
 }
+// 对账确认开票
+export const finstlbillsConfirmInvoicing = (row) => {
+  return request({
+    url: '/api/blade-los/finstlbills/confirmInvoicing',
+    method: 'post',
+    data: row
+  })
+}
+// 对账撤销开票
+export const finstlbillsRevokeInvoicing = (row) => {
+  return request({
+    url: '/api/blade-los/finstlbills/revokeInvoicing',
+    method: 'post',
+    data: row
+  })
+}
 // 新增
 export const finstlbillsitemsList = (current, size, params) => {
   return request({

src/views/billM/billingCenter/index.vue

@@ -621,6 +621,17 @@
               }]
             },
             {
+                label: "是否发票",
+                prop: "invoiceStatus",
+                type: 'select',
+                dicData:[],
+                props: {
+                    label: "dictValue",
+                    value: "dictKey"
+                },
+                overHidden:true,
+            },
+            {
               label: "账单状态",
               prop: "billStatus",
               type: 'select',
@@ -684,6 +695,10 @@
             getWorkDicts('business_type_los').then(res=>{
                 this.findObject(this.option.column, "businessType").dicData = res.data.data
             })
+            // 获取发票状态
+            getWorkDicts('reconciliation_invoice_los').then(res=>{
+                this.findObject(this.option.column, "invoiceStatus").dicData = res.data.data
+            })
         },
       getBcorpslistByTypefun(){
           getBcorpslistByType(1,10).then(res=>{
@@ -801,7 +816,10 @@
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
-          this.data = data.records;
+          this.data = data.records.map(item=>{
+              item.invoiceStatus = item.invoiceStatus + ''
+              return item
+          })
           this.loading = false;
           this.selectionClear();
         });

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

@@ -622,7 +622,7 @@
                         <el-checkbox size="medium" true-label="手册" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.manual">手册</el-checkbox>
                         <el-checkbox size="medium" true-label="核销单" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.writeoffDoc">核销单</el-checkbox>
                         <div style="width: 40px;font-size: 14px;">其他:</div>
-                        <el-input type="age" style="width: 200px;" v-model="comprehensiveForm.other"
+                        <el-input type="age" style="width: 200px;" v-model="assemblyForm.comprehensiveOther"
                                   size="mini" autocomplete="off"
                                   :disabled="detailData.seeDisabled"
                                   clearable placeholder="其他" >
@@ -781,7 +781,12 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             generateBillsfalse:{
                 type:Boolean,
                 default:false
-            }
+            },
+            // 下面的多选
+            comprehensiveForm:{
+                type:Object,
+                default:{}
+            },
         },
         components:{bcorps, SearchQuery, precontainers,bcorpstypedefine},
         data(){
@@ -799,8 +804,6 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
                 freightRateGradeData:[], // 运价等级数据
                 waybillTypeData:[], // 主运单类型
                 waybillCnNameData:[], // 主运单提供者
-                // 下面的多选
-                comprehensiveForm:{},
                 emailhash:emailhash, // 邮箱跳转地址
                 // 多选的数据
                 tabsMultipleChoice:[],

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

@@ -201,6 +201,7 @@
                                     <entrustment-lnformation :assemblyForm="form"
                                                              :detailData="detailData"
                                                              :generateBillsfalse="generateBillsfalse"
+                                                             :comprehensiveForm="comprehensiveForm"
                                                              @billsDetailfun="billsDetailfun(form.id)">
                                     </entrustment-lnformation>
                                 </el-tab-pane>
@@ -321,6 +322,7 @@ import {
         },
         data() {
             return {
+                comprehensiveForm:{}, // 多选集合数据
                 previewDialog:false, // 预览报表弹窗开启
                 generateBillsfalse:false, // 如果生成账单就禁用
                 pleasereviewType:false, // 如果请核就禁用
@@ -713,7 +715,7 @@ import {
             // 获取用户管理数据
             userGetListfun(account = undefined,type = false,){
                 userGetList(1,10,{account}).then(res=>{
-                    this.columnforfun('operatorName').dicData = res.data.data.records
+                    // this.columnforfun('operatorName').dicData = res.data.data.records
                 })
             },
             // 获取付款方式字典数据
@@ -1252,6 +1254,9 @@ import {
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
+                console.log(Object.values(this.comprehensiveForm).join(','),1257)
+                // 多选集合转换成字符串赋值
+                this.form.comprehensive = Object.values(this.comprehensiveForm).join(',')
                 // 费用 收 赋值数据
                 this.form.feeCenterListD.map((row,index)=>{
                     row.dc = 'D'
@@ -1431,6 +1436,25 @@ import {
                 // }else {
                 //     this.detailData.seeDisabled = false
                 // }
+                // 把字符串集合转换一下
+                // 是否随机
+                this.comprehensiveForm.random = this.form.comprehensive.split(',').indexOf('随机') != -1?'随机':null
+                // 合同
+                this.comprehensiveForm.contract = this.form.comprehensive.split(',').indexOf('合同') != -1?'合同':null
+                // 发票
+                this.comprehensiveForm.invoice = this.form.comprehensive.split(',').indexOf('发票') != -1?'发票':null
+                // 装箱单
+                this.comprehensiveForm.Packing = this.form.comprehensive.split(',').indexOf('装箱单') != -1?'装箱单':null
+                // 配额证
+                this.comprehensiveForm.quota = this.form.comprehensive.split(',').indexOf('配额证') != -1?'配额证':null
+                // 许可证
+                this.comprehensiveForm.license = this.form.comprehensive.split(',').indexOf('许可证') != -1?'许可证':null
+                // 产地证
+                this.comprehensiveForm.producer = this.form.comprehensive.split(',').indexOf('产地证') != -1?'产地证':null
+                // 手册
+                this.comprehensiveForm.manual = this.form.comprehensive.split(',').indexOf('手册') != -1?'手册':null
+                // 核销单
+                this.comprehensiveForm.writeoffDoc = this.form.comprehensive.split(',').indexOf('核销单') != -1?'核销单':null
                 if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                     this.columnforfun('corpCnName').disabled = true
                     this.columnforfun('srcType').disabled = true

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -580,7 +580,7 @@ export default {
                 this.handleSelectionData.forEach((item)=>{
                     for (let index in this.tableData) {
                         if (item.accBillNo == this.tableData[index].accBillNo) {
-                            this.tableData.splice(index,1)
+                            this.tableData.splice(Number(index),1)
                         }
                     }
                 })

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

@@ -409,7 +409,7 @@
             },
             // 发票
             invoicelosWorkDictsfun(){
-                getWorkDicts('invoice_los').then(res=>{
+                getWorkDicts('reconciliation_invoice_los').then(res=>{
                     this.invoicelosDara = res.data.data
                 })
             },

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -467,11 +467,11 @@
                                 :loading="saveLoading" @click="batchDeletefun" >一键删除
                     </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">是否撤销开票
                     </el-button>
-                    <!--<el-button  size="small" type="primary" style="margin-right: 8px" :disabled="editSave"-->
-                    <!--            :loading="saveLoading" @click="Notinvoicingfun">不开发票-->
-                    <!--</el-button>-->
                 </div>
 
                 <finstlbillsitems :tableData="tableData"
@@ -557,7 +557,7 @@
         finstlbillsDetail,
         finstlbillslistAccBillV1, finstlbillsRevokeReconciliation, finstlbillsRevokeSignFor,
         finstlbillsSubmit,
-        finstlbillsitemsRemove, finstlbillslistAccBillByCorp
+        finstlbillsitemsRemove, finstlbillslistAccBillByCorp, finstlbillsConfirmInvoicing, finstlbillsRevokeInvoicing
     } from '@/api/iosBasicData/finstlbills'
     import expand from "@/components/basic-container/expand.vue";
     import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -862,7 +862,6 @@
                         item.lineNo = Number(index) + 1
                         item.pType = item.businessType
                         item.accBillId = item.id
-                        item.accBillNo = item.billNo
                         item.accDate = item.billDate
                         if (item.currentStlCurCode == 'CNY') {
                             item.currentStlAmount = item.currentStlAmountRMB
@@ -1041,6 +1040,7 @@
                         item.lineNo = Number(index) + 1
                         this.$set(item,'currentStlCurCode',item.curCode)
                         this.$set(item,'currentStlExrate',item.exrate)
+                        item.accBillNo = item.billNo
                         item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
                         item.dc = item.accountDc // 收付
                         if(item.curCode == 'CNY') {
@@ -1065,11 +1065,79 @@
             },
             // 确认发票
             Confirminvoicefun(){
-
+                if (this.handleSelectionData.length === 0) {
+                    this.$message.warning("请选择至少一条数据");
+                    return;
+                }
+                this.$confirm("确定将选择数据确认开票?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(()=>{
+                    this.finstlbillsConfirmInvoicingfun()
+                })
             },
             // 不开发票
             Notinvoicingfun(){
+                if (this.handleSelectionData.length === 0) {
+                    this.$message.warning("请选择至少一条数据");
+                    return;
+                }
+                this.$confirm("确定将选择数据撤销签收?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(()=>{
+                    this.finstlbillsRevokeInvoicingfun()
+                })
+            },
+            // 确认发票接口
+            finstlbillsConfirmInvoicingfun(){
+                this.form.billNoFormat = 'HYDZ'
+                this.form.businessTypeCode = 'HYDZ'
+                this.form.businessType = 'CHK' //对账单
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.auditDateFrom = this.form.auditDateFrom?this.form.auditDateFrom.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
+                // 保留id
+                this.form.finStlBillsItemsList = this.handleSelectionData
+                this.pageLoading = true
+                finstlbillsConfirmInvoicing(this.form).then(res=>{
+                    this.pageLoading = false
+                    this.$message.success('操作成功');
+                    this.finstlbillsDetailfun(res.data.data.id)
+                }).catch(err=>{
+                    this.pageLoading = false
+                })
+            },
+            // 撤销发票接口
+            finstlbillsRevokeInvoicingfun(){
+                this.form.billNoFormat = 'HYDZ'
+                this.form.businessTypeCode = 'HYDZ'
+                this.form.businessType = 'CHK' // 对账单
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.auditDateFrom = this.form.auditDateFrom?this.form.auditDateFrom.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
 
+                this.form.finStlBillsItemsList = this.handleSelectionData
+                this.pageLoading = true
+                finstlbillsRevokeInvoicing(this.form).then(res=>{
+                    this.pageLoading = false
+                    this.$message.success('操作成功');
+                    this.finstlbillsDetailfun(res.data.data.id)
+                }).catch(err=>{
+                    this.pageLoading = false
+                })
             },
             // 对账确认
             finstlbillsConfirmReconciliationfun(){
@@ -1213,6 +1281,13 @@
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' //对账单
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.auditDateFrom = this.form.auditDateFrom?this.form.auditDateFrom.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                 // 保留id
                 this.form.finStlBillsItemsList = this.handleSelectionData
                 this.pageLoading = true
@@ -1230,6 +1305,13 @@
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账单
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.auditDateFrom = this.form.auditDateFrom?this.form.auditDateFrom.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
 
                 this.form.finStlBillsItemsList = this.handleSelectionData
                 this.pageLoading = true

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -214,8 +214,8 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="" prop="billNo" label-width="50px">
+                        <el-col :span="8">
+                            <el-form-item label="" label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                            :loading="saveLoading" @click="emptyConditionfun">一键清空
                                 </el-button>
@@ -284,7 +284,6 @@
                     <template slot="menu" slot-scope="{ row }">
                         <el-button
                             type="text"
-                            icon=""
                             size="small"
                             @click.stop="retrievePopupsSelect(row)"
                         >选择
@@ -417,12 +416,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "BOOKING NO",
-                        prop: "bookingNo",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
                         label: "船名",
                         prop: "vesselCnName",
                         overHidden: true,

src/views/system/user.vue

@@ -620,7 +620,7 @@
                   }]
                 },
                 {
-                  label: "所属岗位",
+                  label: "岗位(团队)",
                   prop: "postId",
                   type: "tree",
                   multiple: true,