bug

src/views/billManagement/reconciledBill.vue

@@ -30,7 +30,7 @@
           <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
           <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
           <el-table-column prop="bill_sn" label="账单号" width="120" :show-overflow-tooltip="true" align="center">
           <el-table-column prop="bill_sn" label="账单号" width="120" :show-overflow-tooltip="true" align="center">
             <template slot-scope="scope">
             <template slot-scope="scope">
-              <el-link type="primary" :underline="false" @click="$router.push({path: '/reconciledBillDetail', query: {bill_id: scope.row.bill_id}})" style="font-size: 12px;">{{ scope.row.bill_sn }}</el-link>
+              <el-link type="primary" :underline="false" @click="$router.push({path: '/reconciledBillDetail', query: {bill_id: scope.row.bill_id,bill_sn:scope.row.bill_sn}})" style="font-size: 12px;">{{ scope.row.bill_sn }}</el-link>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column prop="bill_name" label="账单名称" min-width="170" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="bill_name" label="账单名称" min-width="170" :show-overflow-tooltip="true" align="center"></el-table-column>
@@ -160,7 +160,7 @@ export default {
      */
      */
     exportVerifiedBill() {
     exportVerifiedBill() {
       let bill_id = this.multipleSelection.map(item => item.bill_id).join(',');
       let bill_id = this.multipleSelection.map(item => item.bill_id).join(',');
-      let url = NODE_ENVS + '/api/bill/exportVerifiedBill?bill_id=' + bill_id + '&token=' + Tool.getCookie('token');
+      let url = NODE_ENVS + '/api/bill/exportVerifiedBill?type=2&bill_id=' + bill_id + '&token=' + Tool.getCookie('token');
       Tool.openNewWindow(url);
       Tool.openNewWindow(url);
     }
     }
   },
   },

src/views/billManagement/reconciledBillDetail.vue

@@ -59,16 +59,19 @@ export default {
       total: 0,
       total: 0,
       page: 1,
       page: 1,
       limit: 10,
       limit: 10,
-      list: []
+      list: [],
+      bill_id: '',
+      bill_sn: ''
     };
     };
   },
   },
   created() {
   created() {
     this.bill_id = this.$route.query.bill_id;
     this.bill_id = this.$route.query.bill_id;
+    this.bill_sn = this.$route.query.bill_sn;
     this.getData()
     this.getData()
   },
   },
   methods: {
   methods: {
     getData() {
     getData() {
-      this.$http('GET', "/api/bill/getVerifiedBillDetail", {bill_id: this.bill_id, page: this.page, limit: this.limit}).then(res => {
+      this.$http('GET', "/api/bill/getVerifiedBillDetail", {bill_id: this.bill_id, bill_sn: this.bill_sn, page: this.page, limit: this.limit}).then(res => {
         if (res.code === 0) {
         if (res.code === 0) {
           this.detailData = res.data.bill_info;
           this.detailData = res.data.bill_info;
           this.list = res.data.list;
           this.list = res.data.list;