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

src/views/fancongcong/addsupplyCardBalance/addsupplyCardBalance.vue

 		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
 			<el-table-column prop="date" label="卡号" width="100px"/>
 			<el-table-column prop="name" label="需要补交的金额" />
-			<el-table-column prop="address" label="卡账生成时间" />
+			<el-table-column prop="regtime" label="卡账生成时间" />
 			<el-table-column prop="number" label="卡片所属渠道" />
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 			<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
 		</div>
 
-		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+		<el-dialog v-model="dialogFormVisible" title="补交详细">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
 	]
 
 	const tableData = [{
-			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
+			date: '52011750220200003674',
+			name: '100.00',
 			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
+			number: "黔通",
 			time: "2021-06-22T12:52:17",
 			type: "已启用",
 			regname: "xn18096012008",

src/views/fancongcong/advancepaymentaccount/advancepaymentaccount.vue

 			<el-form :inline="true" :model="formInline" class="demo-form-inline">
 				<el-form-item label="导入时间">
 					<div class="block">
-						<el-date-picker v-model="value1" type="datetime" placeholder="" />
+						<el-date-picker v-model="value1" type="datetime" placeholder="请选择申请开始时间" />
 					</div>
 					<el-icon>
 						<semi-select />
 					</el-icon>
 					<div class="block">
-						<el-date-picker v-model="value2" type="datetime" placeholder="" />
+						<el-date-picker v-model="value2" type="datetime" placeholder="请选择申请结束时间" />
 					</div>
 				</el-form-item>
 				<el-form-item label="对方账号">
 			</el-form>
 		</div>
 		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
-			<el-table-column prop="date" label="交易流水号" width="100px"/>
-			<el-table-column prop="name" label="交易时间" />
-			<el-table-column prop="address" label="支出金额" />
-			<el-table-column prop="number" label="收入金额" />
-			<el-table-column prop="time" label="对方账号" />
-			<el-table-column prop="type" label="对方户名" />
-			<el-table-column prop="regname" label="对方行名" />
-			<el-table-column prop="regtime" label="对公账户账号" />
-			<el-table-column prop="type" label="用途" />
-			<el-table-column prop="regname" label="附言" />
-			<el-table-column prop="regtime" label="摘要" />
+			<el-table-column prop="date" label="交易流水号" width="200px"/>
+			<el-table-column prop="name" label="交易时间" width="200px"/>
+			<el-table-column prop="address" label="支出金额" width="200px"/>
+			<el-table-column prop="number" label="收入金额" width="200px"/>
+			<el-table-column prop="time" label="对方账号" width="200px"/>
+			<el-table-column prop="type" label="对方户名" width="200px"/>
+			<el-table-column prop="regname" label="对方行名" width="200px"/>
+			<el-table-column prop="nonumber" label="对公账户账号" width="200px"/>
+			<el-table-column prop="use" label="用途" width="200px"/>
+			<el-table-column prop="nonumbers" label="附言" width="200px"/>
+			<el-table-column prop="usetype" label="摘要" width="200px"/>
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" disabled>已同意</el-button>
 		</div>
 
 		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
-			<template #footer>
-				<span class="dialog-footer">
+			<!-- <span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
 					<el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>
-				</span>
-			</template>
-			
+			</span> -->
 		</el-dialog>
 	</div>
 </template>
 		},
 	]
 
-	const tableData = [{
-			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
+	const tableData = [
 		{
-			date: '03',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
+			date: '34625032',
+			name: '2022-05-07',
+			address: '0.0',
+			number: "5000.0",
 			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
+			type: "23921001040002085",
+			regname: "贵州省黔西南州水文水资源局",
+			regtime: "中国农业银行股份有限公司兴义南盘江支行",
+			nonumber:"szm123456",
+			nonumbers:"贵E15389充ETC",
+			use:"测试",
+			usetype:"小额来账自动入账"
 		}
 	]
 </script>

src/views/fancongcong/cardrechargefix/cardrechargefix.vue

 				</el-form-item>
 				<el-form-item>
 					<el-button type="primary">读卡</el-button>
-					<el-button :icon="Search" type="primary">查询</el-button>	
+					<el-button :icon="Search" type="primary">查询</el-button>
 				</el-form-item>
 			</el-form>
 		</div>
-		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
+		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe>
 			<el-table-column prop="name" label="黔通卡号" />
 			<el-table-column prop="address" label="充值前余额(元)" />
 			<el-table-column prop="number" label="充值金额(元)" />
-			<el-table-column prop="time" label="充值后余额(元)<" />
-			<el-table-column prop="type" label="充值时间" />
+			<el-table-column prop="time" label="充值后余额(元)" />
+			<el-table-column prop="regtime" label="充值时间" />
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" @click="dialogFormVisible = true">查看详细</el-button>
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
+
 			<el-form :model="form" v-else>
 				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
 					<el-input v-model="form.number" autocomplete="off" disabled />
 					<el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>
 				</span>
 			</template>
-			
+
 		</el-dialog>
 	</div>
 </template>
 	const onSubmit = () => {
 		console.log('submit!')
 	}
-	
+
 	let title = ref("对公账户信息")
 
 	const options = [{
 	const value2 = ref('')
 	const value3 = ref('')
 	const value4 = ref('')
-	
+
 	const dialogTableVisible = ref(false)
 	const dialogFormVisible = ref(false)
 	const formLabelWidth = '140px'
-	
+
 	const form = reactive({
-	  phone: '13078580843',//手机号
-	  region: '',//验证码
-	  delivery: false,//是否展示详细
-	  number:''//对公账户资金账户编号
-	  
+		phone: '13078580843', //手机号
+		region: '', //验证码
+		delivery: false, //是否展示详细
+		number: '' //对公账户资金账户编号
+
 	})
-	
-	
+
+
 	const optiones = [{
 			value: '2',
 			label: '2',
 
 	const tableData = [{
 			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
+			name: '52011750220200003674',
+			address: '0.06',
+			number: "100.00",
+			time: "100.06",
 			type: "已启用",
 			regname: "xn18096012008",
 			regtime: "2021-06-23T15:08:39"
 
 		.table_box {
 			margin-top: 25px;
-			.table_btn{
+
+			.table_btn {
 				display: flex;
 				flex-direction: column;
 				align-self: stretch;

src/views/fancongcong/cardrefundcostManage/cardrefundcostManage.vue

 			</el-form>
 		</div>
 		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
-			<el-table-column prop="name" label="序号" />
+			<el-table-column prop="date" label="序号" />
 			<el-table-column prop="name" label="卡号" />
-			<el-table-column prop="address" label="用户名" />
-			<el-table-column prop="number" label="证件号" />
-			<el-table-column prop="time" label="注销时间" />
 			<el-table-column prop="type" label="退款状态" />
-			<el-table-column prop="type" label="退费金额(元)"/>
+			<el-table-column prop="regtime" label="注销时间" />
+			<el-table-column prop="numbers" label="卡账余额(元)" />
+			<el-table-column prop="number" label="卡内余额(元)" />
+			<el-table-column prop="numbers" label="交易后余额(元)"/>
+			<el-table-column prop="numbers" label="退费金额(元)"/>
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" @click="dialogFormVisible = true">查看详细</el-button>
 			<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
 		</div>
 
-		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+		<el-dialog v-model="dialogFormVisible" title="退款详细">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
 
 	const tableData = [{
 			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
+			name: '52011750220200003674',
 			address: '安顺市顺安防雷安全检测站平坝分站',
 			number: "91520421MA6EBM14XC",
 			time: "2021-06-22T12:52:17",
-			type: "已启用",
+			type: "已退款",
 			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
+			regtime: "2021-06-23T15:08:39",
+			number:"0.00",
+			numbers:"0.00"
 		}
 	]
 </script>

src/views/fancongcong/corporateaccountManage/corporateaccountManage.vue

 			<el-form :inline="true" :model="formInline" class="demo-form-inline">
 				<el-form-item label="申请时间">
 					<div class="block">
-						<el-date-picker v-model="start_time" type="datetime" placeholder="" />
+						<el-date-picker v-model="start_time" type="datetime" placeholder="请选择申请开始时间" />
 					</div>
 					<el-icon>
 						<semi-select />
 					</el-icon>
 					<div class="block">
-						<el-date-picker v-model="end_time" type="datetime" placeholder="" />
+						<el-date-picker v-model="end_time" type="datetime" placeholder="请选择申请结束时间" />
 					</div>
 				</el-form-item>
 				<el-form-item label="账号状态">
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
-					<el-button type="primary">取消</el-button>
-					<el-button type="primary" @click="dialogFormVisibles">确定</el-button>
+					<el-button type="primary" @click="dialogFormVisible = false">取消</el-button>
+					<el-button type="primary" @click="dialogFormVisible = false">确定</el-button>
 				</span>
 			</template>
 		</el-dialog>

src/views/fancongcong/supplyCardBalance/supplyCardBalance.vue

 					<el-button :icon="Search" type="primary">查询</el-button>
 					<el-button type="info">重置</el-button>
 					<el-button :icon="download" type="primary">人工录入</el-button>
-					
 				</el-form-item>
 			</el-form>
 		</div>
 			<el-table-column prop="name" label="卡号" />
 			<el-table-column prop="address" label="客户名称" />
 			<el-table-column prop="number" label="车牌号码" />
-			<el-table-column prop="time" label="车牌颜色" />
+			<el-table-column prop="regtime" label="车牌颜色" />
 			<el-table-column prop="type" label="补卡金额" />
-			<el-table-column prop="regname" label="录入时间" />
+			<el-table-column prop="regtime" label="录入时间" />
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" @click="dialogFormVisible = true">查看详细</el-button>
 			<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
 		</div>
 
-		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+		<el-dialog v-model="dialogFormVisible" title="补卡详细">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
 
 	const tableData = [{
 			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
+			name: '52011750220200003674',
 			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
+			number: "贵AC0263",
 			time: "2021-06-22T12:52:17",
-			type: "已启用",
+			type: "100.00",
 			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
+			regtime: "蓝色"
 		}
 	]
 </script>

src/views/weixingrong/OBUQuery/OBUQuery.vue

 <script lang='ts' setup>
-    import { reactive } from 'vue';
-    const OBUList = reactive({
+
+import { reactive } from 'vue';
+const labelWith = 68
+const OBUList = reactive({
         cno: '',
         carNo: '',
         carColors: '',
         OBUno: '',
+        pages: 10,
+        status:''
     })
 const options = [
   {
     label: 'Option5',
   },
 ]
+const pages =[
+    {
+        value: '10',
+        label: '10',
+    },
+    {
+        value: '20',
+        label: '20',
+    },
+    {
+        value: '30',
+        label: '30',
+    }
+]
 const colors = [{
             value: 'Option1',
             label: '蓝色',
                 <el-input v-model="OBUList.carNo" placeholder="车牌号码" />
             </el-form-item>
             <el-form-item label="车牌颜色">
-                <el-select v-model="OBUList.carColors" class="m-2" placeholder="Select">
+                <el-select v-model="OBUList.carColors" placeholder="请选择">
                     <el-option
                     v-for="item in colors"
                     :key="item.value"
             <el-form-item label="OBU编号">
                 <el-input v-model="OBUList.OBUno" placeholder="OBU编号" />
             </el-form-item>
-            <el-form-item><el-button type="primary">读OBU</el-button></el-form-item>
-            <el-form-item label="状态">
-                <el-select v-model="OBUList.carColors" class="m-2" placeholder="Select">
+            <el-form-item><el-button type="primary" icon="Tools">读OBU</el-button></el-form-item>
+            <el-form-item label="状态" :label-width="labelWith">
+                <el-select v-model="OBUList.status" placeholder="请选择">
                     <el-option
                     v-for="item in options"
                     :key="item.value"
                 </el-select>
             </el-form-item>
             <el-form-item label="每条页数">
-                <el-select v-model="OBUList.carColors" class="m-2" placeholder="Select">
+                <el-select v-model="OBUList.pages" placeholder="请选择" class="pageSelect">
                     <el-option
-                    v-for="item in options"
+                    v-for="item in pages"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
                 </el-select>
             </el-form-item>
             <el-form-item><el-button type="primary" icon="Search">查询</el-button></el-form-item>
-            <el-form-item><el-button type="warning" plain icon="Refresh">重置</el-button></el-form-item>
+            <el-form-item><el-button type="warning" icon="Refresh">重置</el-button></el-form-item>
         </el-form>
         <el-table :data="tableData" style="width: 100%">
             <el-table-column type="index" label="序号" width="64" fixed align="center" />
 .el-form--inline .el-form-item{
     margin-right: 16px;
 }
+
+.el-select{
+    width: 168px;    
+}
+.el-select-dropdown__item{
+    font-family: "Microsoft Yahei";
+}
+.pageSelect{
+    width: 80px;
+}
 </style>