工单批次，开票信息修改

src/api/mine.js

@@ -253,6 +253,42 @@ export function createBatch(data) {
     })
 }
 
+// 开票信息列表
+export function getFinanceBatchList(data) {
+    return request({
+        url:'/order/taskInvoiceFinanceBatch/selectFinanceBatchPageList',
+        method:'POST',
+        data,
+    })
+}
+
+// 批次对应发票信息列表
+export function financeInvoiceList(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/selectInvoicePageList',
+        method:'POST',
+        data,
+    })
+}
+
+// 查看发票
+export function selectInvoiceDetailInfo(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/selectInvoiceDetailInfo',
+        method:'POST',
+        data,
+    })
+}
+
+// 填写快递
+export function saveBatchCourierNumber(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/supplierSaveBatchCourierNumber',
+        method:'POST',
+        data,
+    })
+}
+
 // 获取服务商发票信息
 export function getBillingInfo(url, data) {
     return request({

src/router/index.js

@@ -88,6 +88,14 @@ const routes = [
         title: '工单批次'
       }
     },
+    {
+        path: "/invoiceListInfo",
+        name: 'invoiceListInfo',
+        component: () => import('@/views/index/invoiceListInfo.vue'),
+        meta: {
+            title: '开票信息'
+        }
+    },
     {
         path: "/invoiceInfo",
         name: 'invoiceInfo',

src/views/index/invoiceInfo.vue

@@ -8,7 +8,7 @@
         :border="false"
         :fixed="true"
         :safe-area-inset-top="true"
-        @click-left="goBack"
+        @click-left="h5GoBack"
       />
     </div>
     <div class="contentWrap">
@@ -18,8 +18,8 @@
           <div class="item_wrap">
             <div class="item_label">财务编号</div>
             <div class="item_content">
-              <span id="copyText">11</span>
+              <span id="copyText">{{invoiceInfo.financeBatchCode}}</span>
-              <img class="copyIcon" @click="copyHandler()" src="@/assets/copy.png" />
+              <img class="copyIcon" @click="copyHandler(invoiceInfo.financeBatchCode)" src="@/assets/copy.png" />
             </div>
           </div>
           <div class="item_wrap">
@@ -31,7 +31,7 @@
           <div class="item_wrap">
             <div class="item_label">总金额</div>
             <div class="item_content">
-              {{invoiceInfo.orderNum}}
+              {{invoiceInfo.totalMoney}}
             </div>
           </div>
           <div class="item_wrap">
@@ -61,7 +61,7 @@
           <div class="item_wrap">
             <div class="item_label">失败原因</div>
             <div class="item_content">
-              {{invoiceInfo.remark || ''}}
+              {{invoiceInfo.failRemark || ''}}
             </div>
           </div>
           <div class="item_wrap">
@@ -73,86 +73,145 @@
           <div class="item_wrap">
             <div class="item_label">对账状况</div>
             <div class="item_content">
-              {{invoiceInfo.statusString}}
+              {{ statusStr(invoiceInfo.status, invoiceInfo.createTime) }}
             </div>
           </div>
         </div>
       </div>
-      <div class="content_tab">
+      <div class="content_tab mt10">
-        <div class="tab_title">批次信息</div>
+        <div class="tab_title">发票信息</div>
-        <div class="tab_content">
+        <div class="itemWrap" v-for="(item,index) in invoiceList" :key="index">
-          <div class="item_wrap">
+          <div class="item line1">
-            <div class="item_label">财务编号</div>
+            <div class="title own_title">{{item.accountName}}</div>
-            <div class="item_content">
+            <div class="checkBtn" @click="goShowInvoice(item)">查看</div>
-              <span>11</span>
-              <img class="copyIcon" @click="copyHandler()" src="@/assets/copy.png" />
-            </div>
           </div>
-          <div class="item_wrap">
+          <div class="item">
-            <div class="item_label">工单数量</div>
+            <span class="title">发票号码:</span>
-            <div class="item_content">
+            <span class="content">{{item.financeBatchCode}}</span>
-              {{invoiceInfo.orderNum}}
-            </div>
           </div>
-          <div class="item_wrap">
+          <div class="item">
-            <div class="item_label">总金额</div>
+            <span class="title">发票金额:</span>
-            <div class="item_content">
+            <span class="content">￥{{item.invoiceMoney}}元</span>
-              {{invoiceInfo.orderNum}}
-            </div>
           </div>
-          <div class="item_wrap">
+          <div class="item">
-            <div class="item_label">扣款</div>
+            <span class="title">开票日期:</span>
-            <div class="item_content">
+            <span class="content">{{ item.invoiceDate }}</span>
-              {{invoiceInfo.cutMoney || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">税额扣款</div>
-            <div class="item_content">
-              {{invoiceInfo.taxCutMoney || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">开票金额</div>
-            <div class="item_content">
-              {{invoiceInfo.invoiceMoney || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">备注</div>
-            <div class="item_content">
-              {{invoiceInfo.remark || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">失败原因</div>
-            <div class="item_content">
-              {{invoiceInfo.remark || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">创建时间</div>
-            <div class="item_content">
-              {{invoiceInfo.createTime}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">对账状况</div>
-            <div class="item_content">
-              {{invoiceInfo.statusString}}
-            </div>
           </div>
         </div>
       </div>
+
+      <div class="content_tab mt10">
+        <div class="tab_title">快递信息</div>
+        <div class="itemWrap bg_cls pd_cls">
+          <div class="item mb10">
+            <span class="title width_cls">发票类型:</span>
+            <span class="content">
+              <van-radio-group v-model="invoiceType" disabled direction="horizontal">
+                <van-radio :name="1" icon-size="16px">电子发票</van-radio>
+                <van-radio :name="2" icon-size="16px">纸质发票</van-radio>
+              </van-radio-group>
+            </span>
+          </div>
+          <div class="item">
+            <span class="title width_cls">补录快递单号:</span>
+            <span class="content" style="flex: 1">
+              <van-field v-model="courierNumber" label="" />
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div class="invoice_btn_wrap">
+        <div class="btn" @click="saveHandler">保存</div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
   import {myMixins} from "@/utils/myMixins"
+  import { financeInvoiceList, selectInvoiceDetailInfo, saveBatchCourierNumber } from  "@/api/mine"
+  import {Dialog} from "vant";
   export default {
     name: "invoiceInfo",
     mixins: [ myMixins ],
+    data() {
+      return {
+        invoiceInfo: {},
+        invoiceList: [],
+        invoiceType: '',
+        courierNumber: '',
+        id: ''
+      }
+    },
+    async mounted() {
+      let showItemInfo = localStorage.getItem('showItemInfo');
+      this.invoiceInfo = showItemInfo ? JSON.parse(showItemInfo) : {};
+      console.log('this.invoiceInfo', this.invoiceInfo)
+      this.invoiceType = this.invoiceInfo.invoiceType
+      this.id = this.$route.query.id;
+      await this.getInvoiceHandler()
+    },
+    methods: {
+      async saveHandler() {
+        await saveBatchCourierNumber({
+          invoiceBatchId: this.id,
+          courierNumber: this.courierNumber,
+        })
+        Dialog.alert({
+          title: '提示',
+          message: '操作成功!',
+        }).then(() => {
+          this.h5GoBack()
+        });
+      },
+      async goShowInvoice(item) {
+        let res = await selectInvoiceDetailInfo({
+          id: item.id
+        })
+        localStorage.setItem('invoiceDetail', JSON.stringify(res.data));
+        this.goPage('showInvoice')
+      },
+      statusStr(status,date) {
+        if(new Date('2024-01-01 00:00:00') > new Date(date)){
+          return ''
+        }
+        if( status == 1 ) {
+          return '待审核'
+        } else if( [2 ,3].includes(status)) {
+          return '审核通过'
+        } else if( status == 7 ) {
+          return '审核失败'
+        } else if( status == 4 ) {
+          return '已打款'
+        } else if( status == 8 ) {
+          return '打款中'
+        } else {
+          return ''
+        }
+      },
+      async getInvoiceHandler() {
+        let res = await financeInvoiceList({
+          current: 1,
+          pageSize: 1000,
+          total: 0,
+          pageNum: 1,
+          invoiceBatchId: this.id
+        });
+        this.invoiceList = res.data;
+        console.log('current', res)
+      },
+      copyHandler(copyText){
+        let inputNode = document.createElement('input')  // 创建input
+        inputNode.value = copyText // 赋值给 input 值
+        document.body.appendChild(inputNode) // 插入进去
+        inputNode.select() // 选择对象
+        document.execCommand('Copy') // 原生调用执行浏览器复制命令
+        inputNode.className = 'oInput'
+        inputNode.style.display = 'none' // 隐藏
+        this.$toast('复制成功')
+      },
+    }
   }
 </script>
 
@@ -164,7 +223,6 @@
     background-color: #F4F5F7;
     overflow-y: auto;
     box-sizing: border-box;
-    padding-bottom: 30px;
   }
   .navBar{
     margin-bottom: 46px;
@@ -175,6 +233,7 @@
       background-color: #fff;
       width: 100%;
       padding: 15px 15px;
+      box-sizing: border-box;
       .tab_title {
         font-size: 14px;
         font-weight: bold;
@@ -184,7 +243,7 @@
         .item_wrap {
           display: flex;
           align-items: center;
-          line-height: 30px;
+          line-height: 26px;
           font-size: 12px;
           .item_label {
             color: rgba(0,0,0,0.5);
@@ -204,4 +263,82 @@
     height: 15px;
     margin-left: 10px
   }
+
+  .itemWrap{
+    /*background: #FFFFFF;*/
+    background-color: #EBF2F7;
+    padding: 10px 20px;
+    border: 1px solid #EBF2F7;
+    border-radius: 4px;
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    line-height: 26px;
+    @include flexBetween;
+    margin-bottom: 10px;
+    .line1{
+      width: 100%;
+      @include flexColBet;
+      .checkBtn{
+        @include bgFontColor(#FFFFFF,#354D93);
+        @include wh(48px,18px);
+        border-radius: 3px;
+        line-height: 18px;
+        text-align: center;
+      }
+    }
+  }
+  .item{
+    display: flex;
+    @include fontWeightSize(400,12px);
+    span{
+      display: inline-block;
+    }
+    .title{
+      opacity: 0.5;
+      margin-right: 5px;
+    }
+    .own_title {
+      font-weight: bold;
+      font-size: 14px;
+      opacity: 1;
+    }
+  }
+  .mt10 {
+    margin-top: 10px;
+  }
+  .bg_cls {
+    background-color: #fff;
+  }
+  .pd_cls {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+  ::v-deep .van-cell {
+    padding: 0;
+    border: 1px solid #EBF2F7;
+  }
+  .width_cls {
+    width: 80px;
+  }
+  .invoice_btn_wrap {
+    width: 100%;
+    padding: 20px;
+    box-sizing: border-box;
+    background-color: #fff;
+    .btn {
+      width: 100%;
+      background-color: #2C395F;
+      color: #fff;
+      padding: 15px 0;
+      text-align: center;
+      border-radius: 6px;
+    }
+  }
+  .mb10 {
+    margin-bottom: 10px;
+  }
+  ::v-deep .van-radio__icon {
+    margin-right: 10px;
+  }
 </style>

src/views/index/invoiceListInfo.vue

@@ -0,0 +1,262 @@
+<template>
+  <div class="wrap">
+    <div class="navBar">
+      <van-nav-bar
+        title="开票信息"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="goBack"
+      />
+    </div>
+    <div class="search_wrap">
+      <div class="search_left">
+        <el-select v-model="form.statusValue" size="mini" clearable placeholder="请选择审核状态">
+          <el-option
+            v-for="item in statusValueOptions"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+      <div class="search_right">
+        <van-search
+          v-model="form.financeBatchCode"
+          show-action
+          placeholder="请输入搜索关键词"
+          @search="onSearch"
+        >
+          <template #action>
+            <div @click="onSearch">搜索</div>
+          </template>
+        </van-search>
+      </div>
+    </div>
+    <div class="contentWrap">
+      <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getMore"
+        >
+          <div class="itemWrap" v-for="(item,index) in invoiceList" :key="index">
+            <div class="item line1">
+              <div class="itemTime">
+                <span class="title">开票编号:</span>
+                <span class="content">{{ item.financeBatchCode }}</span>
+              </div>
+              <div class="checkBtn" @click="getInvoiceInfo(item)">查看</div>
+            </div>
+            <div class="item">
+              <span class="title">工单数量:</span>
+              <span class="content">{{ item.orderNum }}元</span>
+            </div>
+            <div class="item">
+              <span class="title">开票金额:</span>
+              <span class="content">{{ item.invoiceMoney || 0 }}元</span>
+            </div>
+            <div class="item">
+              <span class="title">创建时间:</span>
+              <span class="content">{{ item.createTime }}</span>
+            </div>
+            <div class="item">
+              <span class="title">对账状态:</span>
+              <span class="content">{{ statusStr(item.status, item.createTime) }}</span>
+            </div>
+          </div>
+        </van-list>
+      </van-pull-refresh>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import { myMixins } from "@/utils/myMixins"
+  import { getFinanceBatchList } from  "@/api/mine"
+  export default {
+    name: "invoiceListInfo",
+    mixins: [ myMixins ],
+    data() {
+      return {
+        form: {
+          statusValue: '',
+          financeBatchCode: '',
+          statusList: [],
+        },
+        invoiceList: [],
+        isLoading: false,
+        loading: false,
+        finished: false,
+        page: {
+          current: 1,
+          pageSize: 10,
+          total: 0,
+          pageNum: 1,
+        },
+        supplierId: '',
+        statusValueOptions:[{name:'待审核',value:1},{name:'审核通过待打款',value: 2},{name:'审核失败',value: 3},{name:'打款中',value: 4},{name:'已打款',value: 5}],
+      }
+    },
+    watch:{
+      async 'form.statusValue' (){
+        if( this.form.statusValue == 1 ) {
+          this.form.statusList = [1]
+        } else if( this.form.statusValue == 2 ) {
+          this.form.statusList = [2, 3]
+        } else if( this.form.statusValue == 3 ) {
+          this.form.statusList = [7]
+        } else if( this.form.statusValue == 4 ) {
+          this.form.statusList = [8]
+        } else if( this.form.statusValue == 5 ) {
+          this.form.statusList = [4]
+        } else {
+          this.form.statusList = []
+        }
+      }
+    },
+    async mounted() {
+      this.supplierId = this.$route.query.supplierId;
+    },
+    methods: {
+      async onSearch() {
+        this.page.pageNum=1;
+        await this.getList()
+      },
+      onRefresh() {
+        this.page.pageNum=1;
+        this.getList();
+        setTimeout(() => {
+          this.$toast('刷新成功');
+          this.isLoading = false;
+        }, 1000);
+      },
+      async getMore(){
+        await this.getList()
+        this.page.pageNum++;
+        // 加载状态结束
+        this.loading = false;
+        // 数据全部加载完成
+        if (this.invoiceList.length >= this.page.total) {
+          this.finished = true;
+        }
+      },
+      async getList() {
+        let res = await getFinanceBatchList({
+          ...this.page,
+          ...this.form,
+          supplierId: this.supplierId
+        });
+        if(res.code == 200){
+          this.page.total = res.total;
+          if(this.page.pageNum == 1){
+            this.invoiceList = res.data;
+          }else{
+            let preList = this.invoiceList;
+            let arr = res.data;
+            this.invoiceList = preList.concat(arr)
+          }
+          if (this.invoiceList.length === 0) {
+            this.show=true
+          }else{
+            this.show=false
+          }
+        }
+      },
+      getInvoiceInfo(item) {
+        localStorage.setItem('showItemInfo', JSON.stringify(item));
+        this.goPage('invoiceInfo', {
+          id: item.id
+        })
+      },
+      statusStr(status,date) {
+        if(new Date('2024-01-01 00:00:00') > new Date(date)){
+          return ''
+        }
+        if( status == 1 ) {
+          return '待审核'
+        } else if( [2 ,3].includes(status)) {
+          return '审核通过'
+        } else if( status == 7 ) {
+          return '审核失败'
+        } else if( status == 4 ) {
+          return '已打款'
+        } else if( status == 8 ) {
+          return '打款中'
+        } else {
+          return ''
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .wrap{
+    @include wh(100%,100%);
+    background-color: #F4F5F7;
+    overflow-y: auto;
+    box-sizing: border-box;
+  }
+  .navBar{
+    margin-bottom: 46px;
+  }
+  .contentWrap {
+    background-color: #F4F5F7;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+  .search_wrap {
+    display: flex;
+    align-items: center;
+    padding-left: 10px;
+    background-color: #fff;
+    .search_left {
+      width: 100px;
+      font-size: 12px;
+    }
+    .search_right {
+      flex: 1;
+    }
+  }
+
+  .itemWrap{
+    background: #FFFFFF;
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 15px;
+    border-radius: 6px;
+    line-height: 26px;
+    @include flexBetween;
+    margin-bottom: 10px;
+    .item{
+      @include fontWeightSize(400,12px);
+      span{
+        display: inline-block;
+      }
+      .title{
+        opacity: .5;
+        margin-right: 5px;
+      }
+    }
+    .line1{
+      width: 100%;
+      @include flexColBet;
+      .checkBtn{
+        @include bgFontColor(#FFFFFF,#354D93);
+        @include wh(48px,18px);
+        border-radius: 3px;
+        line-height: 18px;
+        text-align: center;
+      }
+    }
+  }
+</style>

src/views/index/invoicingNotify.vue

@@ -184,6 +184,7 @@ export default {
         dispatchAppSearchInvoiced: this.dispatchAppSearchInvoiced,
         total: this.total,
         batchCode: this.batchCode,
+        supplierId: this.supplierId,
         current: 1,
       })
       if(res.code == 200){

src/views/index/showInvoice.vue

@@ -16,11 +16,11 @@
         <div class="tab_content">
           <div class="item_wrap">
             <div class="item_label">付款方</div>
-            <div class="item_content">{{invoiceInfo.accountName}}</div>
+            <div class="item_content">中道汽车救援股份有限公司</div>
           </div>
           <div class="item_wrap">
             <div class="item_label">收款方</div>
-            <div class="item_content">{{invoiceInfo.payName}}</div>
+            <div class="item_content">{{invoiceInfo.accountName}}</div>
           </div>
           <div class="item_wrap">
             <div class="item_label">发票号码</div>

src/views/index/uploadInvoice.vue

@@ -97,21 +97,16 @@
         form: {
           courierNumber: '',
           invoiceType: '', //电子发票还是纸质发票
-        }
+        },
+        show: true,
       }
     },
     async mounted() {
-      this.list = JSON.parse(localStorage.getItem('list'));
+      await this.initData();
-      this.batchIds = [];
+    },
-      this.list.map(a => {
+    async activated() {
-        this.batchIds.push(a.id)
+      await this.initData();
-      })
+      this.show = true;
-      console.log('this.batchIds', this.batchIds)
-      this.shouldRate = this.list[0]?.shouldRate
-      this.realRate = this.list[0]?.realRate
-      this.invoiceType = this.list[0]?.invoiceType
-      this.supplierId = this.list[0]?.supplierId
-      await this.getInfo();
     },
     watch: {
       tableData: {
@@ -130,7 +125,25 @@
         return total
       }
     },
+    deactivated() {
+      if (this.show) {
+        this.tableData = [];
+      }
+    },
     methods: {
+      async initData() {
+        this.list = JSON.parse(localStorage.getItem('list'));
+        this.batchIds = [];
+        this.list.map(a => {
+          this.batchIds.push(a.id)
+        })
+        console.log('this.batchIds', this.batchIds)
+        this.shouldRate = this.list[0]?.shouldRate
+        this.realRate = this.list[0]?.realRate
+        this.invoiceType = this.list[0]?.invoiceType
+        this.supplierId = this.list[0]?.supplierId
+        await this.getInfo();
+      },
       async getInfo() {
         if(this.supplierId) {
           let res = await getBillingInfo('/supplier/info/billing/getBySupplierId/' + this.supplierId )
@@ -325,6 +338,7 @@
       },
       goInvoiceDetail (item) {
         localStorage.setItem('invoiceDetail', JSON.stringify(item))
+        this.show = false;
         this.goPage('showInvoice')
       },
       getInvoiceMoney() {