Merge branch 'master' of https://gitee.com/dmc_qq/etc-project into master

src/components/exportTable/exportTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-content">
     <el-button ref="hwcell" size="small" type="primary" @click="exportExcel"  v-if="isShow">文件导出</el-button>
-    <el-table :data="tableData" style="width: 100%" border>
+    <!-- <el-table :data="tableData" style="width: 100%" border>
       <el-table-column type="index" label="序号" width="60" />
       <el-table-column prop="etcCardNumber" label="ETC卡号" width="145" />
       <el-table-column prop="licensePlateNumber" label="车牌号" width="100" />
@@ -13,7 +13,7 @@
       <el-table-column prop="balanceBeforeTransaction" label="交易前余额（元）" width="140" />
       <el-table-column prop="transactionAmount" label="交易金额（元）" width="125" />
       <el-table-column prop="postransactionalance" label="交易后余额（元）" width="140" />
-    </el-table>
+    </el-table> -->
   </div>
   <!-- <div style="padding-top: 12px" class="as-gravity-center-end">
       <el-pagination :page-sizes="7" :total="100" :current-page="2" />

src/views/fancongcong/advancepaymentaccount/advancepaymentaccount.vue

@@ -56,7 +56,7 @@
             <el-button type="warning" @click="agree(scope.row)">同意</el-button>
           </el-tooltip>
           <el-tooltip content="请输入对公账号" placement="top" v-if="scope.row.status == null">
-            <el-button type="warning" @click="opendialo">请输入对公账号</el-button>
+            <el-button type="warning" @click="opendialo(scope.row)">请输入对公账号</el-button>
           </el-tooltip>
            <el-tooltip :content="filterType(scope.row.status)" placement="top" v-if="scope.row.status != null">
             <el-button type="primary" @click="opendialo" disabled>{{filterType(scope.row.status)}}</el-button>
@@ -223,7 +223,7 @@ const tableData = ref([
     snippet: 'PPFAKYCKG',
     staffId: 'MQWJVIMRO',
     staffName: 'JQLOMWANP',
-    status: 1,
+    status: null,
     transTime: 'MYHFJBLCP',
     updateTime: '1982/10/14 13:50:50',
     useage: 'OYQYKVWPG'
@@ -270,6 +270,7 @@ const agree = (row) => {
 }
 //驳回申请
 const опровергать = (row) => {
+  console.log(row,row.id)
   dialogFormVisible.value = false;
   form.data_id = row.id
   ElMessageBox.confirm('确定驳回这个申请?', '警告', {
@@ -289,9 +290,9 @@ const опровергать = (row) => {
 }
 //驳回申请原因
 const getMsg = () => {
-  proxy.$request.post('reason', {
+  proxy.$request.post('/advancepayment/confirm', {
     id: form.data_id,
-    reason: form.data_msg,
+    message: form.data_msg,
     value: 1
   }, {
     //baseURL: 'http://localhost:8089',
@@ -368,9 +369,9 @@ const account = () => {
     //baseURL: 'http://localhost:8089'
   }
   console.log(data)
-  return
-
-  proxy.$request.post('/advancepayment/account', data,{}).then((res) => {
+  
+  if(form.phone != ''){
+    proxy.$request.post('/advancepayment/account', data,{}).then((res) => {
     console.log(res, form.data_id, form.value)
     if (res.data.success) {
       dialogFormVisible.value = false;
@@ -380,6 +381,14 @@ const account = () => {
     .catch((err) => {
       console.log(err)
     })
+  }else{
+     ElMessage({
+    message: '请填入对公账号！',
+    type: 'warning',
+  })
+  }
+
+  
 }
 //打开填写对公账户的弹窗
 const opendialo = (row) => {
@@ -393,8 +402,10 @@ const filterType = (type: Number) => {
     return '审核通过'
   } else if (type == 2) {
     return '已驳回'
-  } else {
+  } else if(type == null){
     return '未审核'
+  } else{
+    return '请联系管理员'
   }
 }
 

src/views/fancongcong/corporateaccountManage/corporateaccountManage.vue

@@ -70,8 +70,8 @@
     </el-table>
 
     <div class="page_box">
-      <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="pageCount"
-       v-model="pageNo"/>
+      <el-pagination :pager-count="pageCount" :current-page="pageNo"  :hide-on-single-page="false" layout="prev, pager, next" 
+       @update:current-page="pagechange"/>
     </div>
 
     <el-dialog v-model="dialogFormVisible" :title="title" :show-close="false">
@@ -327,6 +327,11 @@ let tableData: any = ref([
   }
 ]);
 
+//watch 监听当前页变化
+watch(pageNo, (newValue, oldValue) => {
+    console.log('watch 已触发', newValue)
+})
+
 //事件处理
 const onSubmit = () => {
   console.log('submit!')
@@ -633,6 +638,8 @@ const filterType = (type: Number) => {
     return '其他'
   }
 }
+
+
 </script>
 
 <style lang="scss">

src/views/shengbo/trafficFlow/trafficFlow.vue

@@ -44,6 +44,19 @@
     </div>
 
     <div style="padding-top: 12px">
+       <el-table :data="tableData1" style="width: 100%" border>
+      <el-table-column type="index" label="序号" width="60" />
+      <el-table-column prop="etcCardNumber" label="ETC卡号" width="145" />
+      <el-table-column prop="licensePlateNumber" label="车牌号" width="100" />
+      <el-table-column prop="consumptionType" label="消费类型" width="90" />
+      <el-table-column prop="entranceTime" label="入口时间" width="110" />
+      <el-table-column prop="entryStationName" label="入口站名" width="110" />
+      <el-table-column prop="exportTime" label="出口时间" width="110" />
+      <el-table-column prop="exitStationName" label="出口站名" width="110" />
+      <el-table-column prop="balanceBeforeTransaction" label="交易前余额（元）" width="140" />
+      <el-table-column prop="transactionAmount" label="交易金额（元）" width="125" />
+      <el-table-column prop="postransactionalance" label="交易后余额（元）" width="140" />
+    </el-table>
       <exportTable ref="exportTS" :tableData="tableData1"></exportTable>
     </div>
     <div style="padding-top: 12px" class="as-gravity-center-end">
@@ -303,150 +316,7 @@ const tableData1 = [
     balanceBeforeTransaction: '38.25',
     transactionAmount: '0.00',
     postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },{
-    etcCardNumber: '52011328220200481698',
-    licensePlateNumber: '贵A710AE',
-    consumptionType: '省内流水',
-    entranceTime: '2019-12-27 20:14:02',
-    entryStationName: '贵阳西主线站',
-    exportTime: '2019-12-27 20:18:20',
-    exitStationName: '贵阳西主线站',
-    balanceBeforeTransaction: '38.25',
-    transactionAmount: '0.00',
-    postransactionalance: '38.25',
-  },
+  }
 ]
 </script>
 <style lang="scss" scoped>