更新

.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 

mock/index.js

@@ -3,10 +3,12 @@ const { param2Obj } = require('./utils')
 
 const user = require('./user')
 const table = require('./table')
+const driverManagement = require('./driverManagement')
 
 const mocks = [
   ...user,
-  ...table
+  ...table,
+  ...driverManagement,
 ]
 
 // for front mock

src/api/cargoOwnerManagement.js

@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+// 货主身份列表
+export function getList(data) {
+  return request({
+    url: '/cargoOwnerInfo/selectCargoOwnerInfoPage',
+    method: 'get',
+     params: data,
+  })
+}
+// 货主身份审核
+export function toExamine(data) {
+  return request({
+    url: '/cargoOwnerInfo/api/examine',
+    method: 'post',
+     params: data,
+  })
+}
+// 货主消息发送
+export function postNews(data) {
+  return request({
+    url: '/newsInfo/api/addNewsInfo',
+    method: 'post',
+     params: data,
+  })
+}
+// 货主任务列表
+export function getListLook(data) {
+  return request({
+    url: '/publishTaskInfo/selectTask',
+    method: 'get',
+     params: data,
+  })
+}
+// 货主任务审核
+export function toTaskExamine(data) {
+  return request({
+    url: '/publishTaskInfo/api/examine',
+    method: 'post',
+     params: data,
+  })
+}
+// 货主授权审核
+export function GrantList(data) {
+  return request({
+    url: '/cargoOwnerCompInfo/selectCargoOwnerCompInfoPage',
+    method: 'get',
+     params: data,
+  })
+}
+
+// 货主授权审核
+export function toGrantExamine(data) {
+  return request({
+    url: '/cargoOwnerCompInfo/api/examine',
+    method: 'post',
+     params: data,
+  })
+}

src/api/driverManagement.js

@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+// 身份审核列表
+export function getList(data) {
+  return request({
+    url: '/driverInfo/selectDriverInfoPage',
+    method: 'get',
+     params: data,
+  })
+}
+// 身份审核
+export function toExamine(data) {
+  return request({
+    url: '/driverInfo/api/examine',
+    method: 'post',
+     params: data,
+  })
+}
+// 消息
+export function postNews(data) {
+  return request({
+    url: '/newsInfo/api/addNewsInfo',
+    method: 'post',
+     params: data,
+  })
+}
+// 车辆审核列表
+export function getCarList(data) {
+  return request({
+    url: '/driverCarInfo/selectCar',
+    method: 'get',
+     params: data,
+  })
+}
+// 车辆审核
+export function toCarExamine(data) {
+  return request({
+    url: '/driverCarInfo/api/examine',
+    method: 'post',
+     params: data,
+  })
+}

src/api/enterpriseManagement.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+// 企业审核列表
+export function getList(data) {
+  return request({
+    url: '/companyInfo/selectCompanyPage',
+    method: 'get',
+     params: data,
+  })
+}
+// 企业审核
+export function toallowExamine(data) {
+  return request({
+    url: '/companyInfo/api/examine',
+    method: 'post',
+     params: data,
+  })
+}

src/api/orderManagement.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+// 订单列表
+export function getListData(data) {
+  return request({
+    url: '/orderInfo/selectOrderInfoPage',
+    method: 'get',
+     params: data,
+  })
+}
+// 订单单个查看
+export function getData(data) {
+  return request({
+    url: '/orderInfo/getOrderInfo',
+    method: 'get',
+     params: data,
+  })
+}
+// 订单审核
+export function auditData(data) {
+  return request({
+    url: '/orderInfo/api/examine',
+    method: 'post',
+     params: data,
+  })
+}
+
+// 订单审核
+export function endData(data) {
+  return request({
+    url: '/orderInfo/api/end',
+    method: 'post',
+     params: data,
+  })
+}
+
+// 订单完结
+export function editEndData(data) {
+  return request({
+    url: '/orderInfo/api/editEnd',
+    method: 'post',
+     params: data,
+  })
+}

src/api/platformManagement.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+// 规定记录列表
+export function getList(data) {
+  return request({
+    url: '/patformAnagementEgulations/selectPage',
+    method: 'get',
+     params: data,
+  })
+}
+
+// 新增规定记录列表
+export function addFormData(data) {
+  return request({
+    url: '/patformAnagementEgulations/api/add',
+    method: 'post',
+     params: data,
+  })
+}
+
+// 查看规定记录列表
+export function seeData(data) {
+  return request({
+    url: '/patformAnagementEgulations/show',
+    method: 'get',
+     params: data,
+  })
+}
+
+// 新增规定记录列表
+export function editFormData(data) {
+  return request({
+    url: '/patformAnagementEgulations/api/edit',
+    method: 'post',
+     params: data,
+  })
+}
+
+// 删除规定记录列表
+export function delFormData(data) {
+  return request({
+    url: '/patformAnagementEgulations/api/delete',
+    method: 'post',
+     params: data,
+  })
+}
+
+// 审核规定记录
+export function auditFormData(data) {
+  return request({
+    url: '/patformAnagementEgulations/api/examine',
+    method: 'post',
+     params: data,
+  })
+}

src/main.js

@@ -23,10 +23,10 @@ import '@/permission' // permission control
  * Currently MockJs will be used in the production environment,
  * please remove it before going online ! ! !
  */
-if (process.env.NODE_ENV === 'production') {
-  const { mockXHR } = require('../mock')
-  mockXHR()
-}
+// if (process.env.NODE_ENV === 'production') {
+//   const { mockXHR } = require('../mock')
+//   mockXHR()
+// }
 
 // set ElementUI lang to EN
 Vue.use(ElementUI, { locale })

src/router/platformManagement/index.js

@@ -13,14 +13,34 @@ const platformManagementRouter = {
     },
     alwaysShow: true,
     children: [{
-        path: 'regulationsModel',
-        name: 'regulationsModel',
-        component: () => import('@/views/platformManagement/regulationsModel'),
+        path: 'specifiedRecords',
+        name: 'specifiedRecords',
+        component: () => import('@/views/platformManagement/specifiedRecords'),
         meta: {
-            title: '规定模板',
+            title: '规定记录',
             icon: 'table'
         }
-    }
+    },
+	{
+		path: 'specifiedRecordsAdd',
+		name: 'specifiedRecordsAdd',
+		component: () => import('@/views/platformManagement/specifiedRecordsAdd'),
+		meta: {
+		    title: '新增规定记录',
+		    icon: 'table'
+		},
+		hidden: true
+	},
+	{
+		path: 'specifiedRecordsLook',
+		name: 'specifiedRecordsLook',
+		component: () => import('@/views/platformManagement/specifiedRecordsLook'),
+		meta: {
+		    title: '规定记录查看',
+		    icon: 'table'
+		},
+		hidden: true
+	}
     ]
 }
 

src/store/modules/user.js

@@ -38,7 +38,7 @@ const actions = {
         // setToken(data.token)
         commit('SET_TOKEN', 'Admin-Token')
         setToken('Admin-Token')
-        resolve()
+        resolve(response)
       }).catch(error => {
         reject(error)
       })

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -1,4 +1,4 @@
-// 身份审核
+// 货主身份审核
 <template>
 	<div class="center">
 		<div class="center_css">
@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" clearable></el-input>
+							<el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -20,28 +20,28 @@
 					<el-col>
 						<div class="search_btn">
 							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
-								@click="searchBtn('')">
+								@click="searchBtn('')"> 
 								全部
 							</div>
 							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
 								待审核
 							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
 								已通过
 							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
 								已驳回
 							</div>
-							<div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
+							<!-- <div :class="search == 6 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(6)">
 								已过期
-							</div>
-							<div :class="search == 5 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
+							</div> -->
+							<!-- <div :class="search == 7 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(7)">
 								未认证
-							</div>
-							<div :class="search == 6 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
+							</div> -->
+							<!-- <div :class="search == 8 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(8)">
 								已注销
-							</div>
-							<div :class="search == 7 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
+							</div> -->
+							<div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
 								已禁用
 							</div>
 						</div>
@@ -49,22 +49,16 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<!-- <el-table-column type="index" label="序号" width="50">
-					<template scope="scope">
-						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-						<span v-else>{{ scope.$index + 1 }}</span>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="reexType" label="货主姓名">
+				<el-table-column prop="name" label="货主姓名" min-width="130">
 					<template slot-scope="scope">
 						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.circleUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.reexType}}</span>
+							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
+							<span style="position: absolute;display: inline-block;">{{scope.row.name}}</span>
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="purpose" label="账号"></el-table-column>
-				<el-table-column prop="amountMoney" label="身份证号"></el-table-column>
+				<el-table-column prop="phone" label="账号"  min-width="110"></el-table-column>
+				<el-table-column prop="cardNumber" label="身份证号" min-width="165"></el-table-column>
 				<el-table-column prop="amountMoney" label="发运次数"></el-table-column>
 				<el-table-column prop="amountMoney" label="好评率(%)" min-width="170">
 					<template slot-scope="scope">
@@ -72,31 +66,31 @@
 							score-template="{value}"></el-rate>
 					</template>
 				</el-table-column>
-				<el-table-column prop="status" label="累计支付运费（元）" min-width="140"></el-table-column>
+				<el-table-column prop="status" label="累计支付运费（元）" min-width="148"></el-table-column>
 				<el-table-column prop="amountMoney" label="代理身份">
 					<template slot-scope="scope">
 						<span class="btn_css">查看</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="身份证">
+				<el-table-column prop="cardAddressUrl" label="身份证">
 					<template slot-scope="scope">
-						<span class="btn_css">查看</span>
+						<span class="btn_css" @click="userSee(scope.row)">查看</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="状态"></el-table-column>
+				<el-table-column prop="authenticationStatus" label="状态"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="adopt(scope.row)">通过</span>
+						<el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="reject(scope.row)">驳回</span>
+						<el-link  target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">驳回</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="newInfo(scope.row)">消息</span>
+						<el-link  target="_blank" @click="newInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus == '审核中'">消息</el-link>
 						<el-divider direction="vertical"></el-divider>
 						<el-dropdown>
 							<span class="btn_css">•••</span>
 							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>禁用</el-dropdown-item>
-								<el-dropdown-item>启用</el-dropdown-item>
+								<el-dropdown-item :disabled="scope.row.authenticationStatus == '禁用' && scope.row.authenticationStatus != '审核中'"><span @click="switchChange(scope.row,'1')">禁用</span></el-dropdown-item>
+								<el-dropdown-item :disabled="scope.row.authenticationStatus != '禁用' && scope.row.authenticationStatus != '审核中'"><span @click="switchChange(scope.row,'2')">启用</span></el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
 					</template>
@@ -107,29 +101,39 @@
 			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
-		<el-dialog title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
-			<div class="car_css" v-for="(item,index) in 5" :key="index">
-				<img src="../../../public/img/yonghu.jpg" class="car_item" />
-				<div>
-					<span>辽H12345 通过</span>
+		<el-dialog title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userInfoClose">
+			<div class="user">
+				<!-- .user -->
+				<div class="title_css">姓名</div>
+				<div class="name_css">{{idSee.name}}</div>
+				<div class="title_css">身份证号</div>
+				<div class="name_css">{{idSee.cardNumber}}</div>
+				<div class="title_css">有效期</div> 	
+				<div class="name_css">{{idSee.cardValidityDate}} <span style="color: #EF4C33;margin-left: 10px" v-if="false">已过期</span></div>
+				<div class="title_css">身份证人像面</div> 
+				<img :src="idSee.cardAddressUrl" class="user_item"/>
+				<div class="title_css">身份证国徽面</div>
+				<img :src="idSee.cardBackAddressUrl" class="user_item"/>
+				<div class="form_btn">
+					<el-button @click="userInfoClose">关闭</el-button>
 				</div>
 			</div>
 		</el-dialog>
 		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
-				<div><span class="sign">*</span>选择驳回原因</div>
+				<!-- <div><span class="sign">*</span>选择驳回原因</div> -->
 				<div class="form_css">
 					<el-form ref="form" :model="form" label-width="80px">
-						<el-checkbox-group v-model="form.checkList">
+						<!-- <el-checkbox-group v-model="form.checkList">
 							<el-checkbox label="证件照片不清晰"></el-checkbox>
 							<el-checkbox label="证件照片上传错误"></el-checkbox>
 							<el-checkbox label="身份信息填写错误"></el-checkbox>
 							<el-checkbox label="证件信息填写错误"></el-checkbox>
 							<el-checkbox label="其他"></el-checkbox>
-						</el-checkbox-group>
-						<div style="margin: 20px 0;">驳回原因描述（选填）</div>
-						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，5-50个字" maxlength="50"
-							v-model="form.textarea"></el-input>
+						</el-checkbox-group> -->
+						<div style="margin-bottom: 20px;">驳回原因描述（必填）</div>
+						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，6-100个字" maxlength="100"
+							v-model="form.rejectReasonDescription"></el-input>
 						<div class="form_btn">
 							<el-button @click="rejectClose">取消</el-button>
 							<el-button @click="submit" type="primary">确定</el-button>
@@ -141,9 +145,9 @@
 		<el-dialog title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
 			<div class="Info_css">
 				<div class="Info_title">标题</div>
-				<div class="Info_item"><el-input placeholder="输入消息标题，不超过4-20个字。" v-model="Info.title"></el-input></div>
+				<div class="Info_item"><el-input placeholder="输入消息标题，不超过4-20个字。" v-model="Info.newsTitle"></el-input></div>
 				<div class="Info_title">内容</div>
-				<div class="Info_item"><el-input type="textarea" :rows="3" resize="none" placeholder="消息内容10-100字" maxlength="50" v-model="Info.textarea"></el-input></div>
+				<div class="Info_item"><el-input type="textarea" :rows="3" resize="none" placeholder="消息内容10-100字" maxlength="50" v-model="Info.newsContent"></el-input></div>
 				<div class="Info_btn">
 					<el-button @click="sendInfoClose">取消</el-button>
 					<el-button @click="submitInfo" type="primary">确定</el-button>
@@ -153,20 +157,15 @@
 	</div>
 </template>
 <script>
+	import {
+		getList,
+		toExamine,
+		postNews
+	} from '@/api/cargoOwnerManagement'
 	export default {
 		data() {
 			return {
-				tableData: [{
-						reexType: "王某",
-						count: 5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-					{
-						reexType: "",
-						count: 4.5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-				],
+				tableData: [],
 				//分页
 				searchkeyWord: "",
 				currentPage: 1,
@@ -176,59 +175,187 @@
 				search: "",
 				addressUrl: [],
 				disabled: false,
-				carInfo: false,
+				userInfo: false,
 				rejectInfo: false,
-				checkList: [],
-				form: {
-					checkList: [],
-					textarea: "",
-				},
+				form: {},
 				Info:{},
 				sendInfo:false,
+				idSee:{}
 
 			};
 		},
+		mounted() {
+			this.getList()
+		},
 		methods: {
-
-			getList() {},
+			getList() {
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				getList(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			switchChange(row, num) {
+				var _examine = {}
+				_examine.id = row.id
+				let title
+				if (num == 1) {
+					_examine.flag = 3
+					title = "禁用后客户将无法使用所有功能，是否确定禁用？"
+				} else if (num == 2) {
+					title = "确定重新启用该用户？"
+					_examine.flag = 4
+				}
+				this.$confirm(title, '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						this.listLoading = true
+						toExamine(_examine).then(response => {
+								if (num == 1) {
+									this.$notify({
+										title: '成功',
+										message: '禁用成功！',
+										type: 'success'
+									});
+								} else if (num == 2) {
+									this.$notify({
+										title: '成功',
+										message: '启用成功！',
+										type: 'success'
+									});
+								}
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
+			},
 			newInfo(row){
+				this.Info.newsTypeKey = 1
+				this.Info.newsType = "系统消息"
+				this.Info.crtCommonId = JSON.parse(localStorage.getItem('UserInfo')).userId
+				this.Info.reCommonId = row.commonId
+				this.Info.bussId = row.id
 				this.sendInfo = true
 			},
 			sendInfoClose(){
+				this.Info = {}
 				this.sendInfo = false
 			},
 			adopt(row) {
-				this.$confirm('确定通过辽H12345的审核？', '提示', {
+				this.$confirm('确定通过身份审核？', '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning',
 					})
-					.then(() => {})
+					.then(() => {
+						this.listLoading = true
+						var _examine = {}
+						_examine.id = row.id
+						_examine.flag = 1
+						toExamine(_examine).then(response => {
+								this.$notify({
+									title: '成功',
+									message: '通过成功！',
+									type: 'success'
+								});
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
 			},
 			reject(row) {
+				this.form.id = row.id
+				this.form.flag = 2
 				this.rejectInfo = true
 			},
 			rejectClose() {
-				this.form = {}
-				this.form.checkList = []
+				this.form.rejectReasonDescription = ""
 				this.rejectInfo = false
 			},
 			submit() {
-				//驳回提交
-				this.form = {}
-				this.form.checkList = []
+			if (!this.form.rejectReasonDescription) {
+				this.$message.error("请输入驳回原因")
+				return
+			}
+			if (this.form.rejectReasonDescription.length < 6 || this.form.rejectReasonDescription.length > 100) {
+				this.$message.error("驳回原因字数应在6-100之间")
+				return
+			}
+			this.listLoading = true
+			toExamine(this.form).then(response => {
+					this.$notify({
+						title: '成功',
+						message: '驳回成功！',
+						type: 'success'
+					});
+					this.form= {}
+					this.rejectInfo = false
+					this.getList()
+					this.listLoading = false
+				})
+				.catch(() => {
+					this.loading = false
+				})
 			},
 			submitInfo(){
-				if(!this.Info.title){
+				if(!this.Info.newsTitle){
 					this.$message.error("请输入标题")
 					return
 				}
+				if(!this.Info.newsContent){
+					this.$message.error("请输入内容")
+					return
+				}
+				if(this.Info.newsTitle.length < 4 || this.Info.newsTitle.length > 20){
+					this.$message.error("标题字数应在4-20之间")
+					return
+				}
+				if(this.Info.newsContent.length < 10 || this.Info.newsContent.length > 100){
+					this.$message.error("消息内容字数应在10-100之间")
+					return
+				}
+				this.listLoading = true
+				postNews(this.Info).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '发送成功！',
+							type: 'success'
+						});
+						this.sendInfoClose()
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
 			},
-			carLook() {
-				this.carInfo = true;
+			userSee(row) {
+				this.idSee.cardAddressUrl = row.cardAddressUrl
+				this.idSee.cardBackAddressUrl = row.cardBackAddressUrl
+				this.idSee.name = row.name
+				this.idSee.cardNumber = row.cardNumber
+				this.idSee.cardValidityDate = row.cardValidityDate 	
+				this.userInfo = true;
 			},
-			carClose() {
-				this.carInfo = false;
+			userInfoClose() {
+				this.userInfo = false;
 			},
 			searchBtn(num) {
 				this.search = num;
@@ -360,23 +487,23 @@
 	.user {
 		margin-bottom: 20px;
 
-		.user_id {
-			display: flex;
-			height: 30px;
-		}
-
-		.name_css,
-		.id_css {
-			width: 50%;
+		.title_css{
+			color: #9D9D9D ;
+			margin-bottom: 6px;
 		}
 
 		.name_css {
+			color: #0D0D0D;
+			margin-bottom: 20px;
+		}
+		.form_btn{
 			text-align: right;
 		}
 
 		.user_item {
-			width: 450px;
-			height: 300px;
+			width: 380px;
+			height: 250px;
+			margin-bottom: 20px;
 		}
 	}
 
@@ -385,7 +512,7 @@
 	}
 
 	.btn_css {
-		color: #2f53eb;
+		color: #409EFF;
 		cursor: pointer
 	}
 
@@ -396,7 +523,7 @@
 
 	.form_css {
 		width: 100%;
-		margin: 20px auto 20px;
+		margin: 0 auto 20px;
 
 		::v-deep .el-checkbox {
 			width: 40%;

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" clearable></el-input>
+							<el-input placeholder="可按货主姓名、账号和企业名称查找" v-model="searchkeyWord" clearable></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -26,10 +26,10 @@
 							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
 								待审核
 							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
 								已通过
 							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
 								已驳回
 							</div>
 						</div>
@@ -37,46 +37,30 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<!-- <el-table-column type="index" label="序号" width="50">
-					<template scope="scope">
-						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-						<span v-else>{{ scope.$index + 1 }}</span>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="reexType" label="货主姓名">
+				<el-table-column prop="reexType" label="货主姓名" min-width="130">
 					<template slot-scope="scope">
 						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.circleUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.reexType}}</span>
+							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
+							<span style="position: absolute;display: inline-block;">{{scope.row.name}}</span>
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="purpose" label="账号"></el-table-column>
-				<el-table-column prop="amountMoney" label="身份证号"></el-table-column>
-				<el-table-column prop="amountMoney" label="所属企业名称"></el-table-column>
-				<el-table-column prop="amountMoney" label="授权书">
+				<el-table-column prop="phone" label="账号" min-width="107"></el-table-column>
+				<el-table-column prop="cardNumber" label="身份证号" min-width="162"></el-table-column>
+				<el-table-column prop="company" label="所属企业名称" min-width="110"></el-table-column>
+				<el-table-column prop="certificateAddressUrl" label="授权书">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="lookBook(scope)">查看</span>
+						<span class="btn_css" @click="lookBook(scope.row)">查看</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="授权截止日期"></el-table-column>
-				<el-table-column prop="amountMoney" label="认证日期"></el-table-column>
-				<el-table-column prop="amountMoney" label="状态"></el-table-column>
+				<el-table-column prop="authorizationDeadline" label="授权截止日期" min-width="105"></el-table-column>
+				<el-table-column prop="updateDate" label="认证日期" min-width="93"></el-table-column>
+				<el-table-column prop="status" label="状态"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="adopt(scope.row)">通过</span>
-						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="reject(scope.row)">驳回</span>
+						<el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="newInfo(scope.row)">消息</span>
-						<el-divider direction="vertical"></el-divider>
-						<el-dropdown>
-							<span class="btn_css">•••</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>禁用</el-dropdown-item>
-								<el-dropdown-item>启用</el-dropdown-item>
-							</el-dropdown-menu>
-						</el-dropdown>
+						<el-link target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">驳回</el-link>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -85,43 +69,28 @@
 			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
-		<el-dialog title="查看授权" :visible.sync="lookInfo" width="500px" :before-close="lookBookClose">
+		<el-dialog title="授权书" :visible.sync="lookInfo" width="500px" center :before-close="lookBookClose">
 			<div class="InfoBook_css">
-				<div class="InfoBook_title">姓名</div>
-				<div class="InfoBook_item">张三</div>
-				<div class="InfoBook_title">身份证号</div>
-				<div class="InfoBook_item">210381</div>
-				<div class="InfoBook_title">有效期</div>
-				<div class="InfoBook_item">2017-02-03<span class="data_css">已过期</span></div>
-				<div class="InfoBook_title">身份证人面像</div>
-				<div class="InfoBook_item">
-					<img src="../../../public/img/yonghu.jpg" class="InfoBook_img">
-				</div> 
-				<div class="InfoBook_title">身份证国徽面</div>
-				<div class="InfoBook_item">
-					<img src="../../../public/img/yonghu.jpg" class="InfoBook_img">
-				</div> 
-				<div class="InfoBook_btn">
-					<el-button @click="lookBookClose">关闭</el-button>
-				</div>
+					<img :src="bookUrl" class="InfoBook_img">
+				
 			</div>
 			
 		</el-dialog>
 		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
-				<div><span class="sign">*</span>选择驳回原因</div>
+				<!-- <div><span class="sign">*</span>选择驳回原因</div> -->
 				<div class="form_css">
 					<el-form ref="form" :model="form" label-width="80px">
-						<el-checkbox-group v-model="form.checkList">
+						<!-- <el-checkbox-group v-model="form.checkList">
 							<el-checkbox label="证件照片不清晰"></el-checkbox>
 							<el-checkbox label="证件照片上传错误"></el-checkbox>
 							<el-checkbox label="身份信息填写错误"></el-checkbox>
 							<el-checkbox label="证件信息填写错误"></el-checkbox>
 							<el-checkbox label="其他"></el-checkbox>
-						</el-checkbox-group>
-						<div style="margin: 20px 0;">驳回原因描述（选填）</div>
-						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，5-50个字" maxlength="50"
-							v-model="form.textarea"></el-input>
+						</el-checkbox-group> -->
+						<div style="margin-bottom: 20px;">驳回原因描述（必填）</div>
+						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，6-100个字" maxlength="100"
+							v-model="form.rejectReasonDescription"></el-input>
 						<div class="form_btn">
 							<el-button @click="rejectClose">取消</el-button>
 							<el-button @click="submit" type="primary">确定</el-button>
@@ -130,35 +99,18 @@
 				</div>
 			</div>
 		</el-dialog>
-		<el-dialog title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
-			<div class="Info_css">
-				<div class="Info_title">标题</div>
-				<div class="Info_item"><el-input placeholder="输入消息标题，不超过4-20个字。" v-model="Info.title"></el-input></div>
-				<div class="Info_title">内容</div>
-				<div class="Info_item"><el-input type="textarea" :rows="3" resize="none" placeholder="消息内容10-100字" maxlength="50" v-model="Info.textarea"></el-input></div>
-				<div class="Info_btn">
-					<el-button @click="sendInfoClose">取消</el-button>
-					<el-button @click="submitInfo" type="primary">确定</el-button>
-				</div>
-			</div>
-		</el-dialog>
+		
 	</div>
 </template>
 <script>
+	import {
+		GrantList,
+		toGrantExamine
+	} from '@/api/cargoOwnerManagement'
 	export default {
 		data() {
 			return {
-				tableData: [{
-						reexType: "王某",
-						count: 5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-					{
-						reexType: "",
-						count: 4.5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-				],
+				tableData: [],
 				//分页
 				searchkeyWord: "",
 				currentPage: 1,
@@ -170,53 +122,93 @@
 				disabled: false,
 				lookInfo: false,
 				rejectInfo: false,
-				checkList: [],
-				form: {
-					checkList: [],
-					textarea: "",
-				},
-				Info:{},
-				sendInfo:false,
+				form: {},
+				bookUrl:""
 
 			};
 		},
+		mounted() {
+			this.getList()
+		},
 		methods: {
-
-			getList() {},
-			newInfo(row){
-				this.sendInfo = true
-			},
-			sendInfoClose(){
-				this.sendInfo = false
+			getList() {
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				GrantList(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
 			},
 			adopt(row) {
-				this.$confirm('确定通过辽H12345的审核？', '提示', {
+				this.$confirm('确定通过'+row.name+'的审核？', '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning',
 					})
-					.then(() => {})
+					.then(() => {
+						this.listLoading = true
+						var _examine = {}
+						_examine.id = row.id
+						_examine.flag = 1
+						toGrantExamine(_examine).then(response => {
+							this.$notify({
+								title: '成功',
+								message: '通过成功！',
+								type: 'success'
+							});
+							this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
 			},
 			reject(row) {
+				this.form.id = row.id
+				this.form.flag = 2
 				this.rejectInfo = true
 			},
 			rejectClose() {
 				this.form = {}
-				this.form.checkList = []
 				this.rejectInfo = false
 			},
 			submit() {
-				//驳回提交
-				this.form = {}
-				this.form.checkList = []
-			},
-			submitInfo(){
-				if(!this.Info.title){
-					this.$message.error("请输入标题")
+				if (!this.form.rejectReasonDescription) {
+					this.$message.error("请输入驳回原因！")
 					return
 				}
+				if (this.form.rejectReasonDescription.length < 6 || this.form.rejectReasonDescription.length > 100) {
+					this.$message.error("驳回原因字数应在6-100之间")
+					return
+				}
+				this.listLoading = true
+				toGrantExamine(this.form).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '驳回成功！',
+							type: 'success'
+						});
+						this.form.rejectReasonDescription = ""
+						this.rejectInfo = false
+						this.getList()
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
 			},
-			lookBook() {
+			
+			lookBook(row) {
+				this.bookUrl = row.certificateAddressUrl
 				this.lookInfo = true;
 			},
 			lookBookClose() {
@@ -377,7 +369,7 @@
 	}
 
 	.btn_css {
-		color: #2f53eb;
+		color: #409EFF;
 		cursor: pointer
 	}
 
@@ -388,7 +380,7 @@
 
 	.form_css {
 		width: 100%;
-		margin: 20px auto 20px;
+		margin: 0px auto 20px;
 
 		::v-deep .el-checkbox {
 			width: 40%;
@@ -428,27 +420,10 @@
 	}
 	//授权信息
 	.InfoBook_css{
-		.InfoBook_title{
-			color: #9D9D9D;
-			font-size: 14px;
-		}
-		.data_css{
-			color: #EF4C33 ;
-			font-size: 14px;
-			margin-left: 6px;
-		}
-		.InfoBook_item{
-			color: #0D0D0D;
-			font-size: 14px;
-			margin-bottom: 20px;
-		}
-		.InfoBook_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
+		
 		.InfoBook_img{
-			width: 200px;
-			height: 120px;
+			width: 100%;
+			height: 220px;
 			margin-top: 10px;
 		}
 	}

src/views/cargoOwnerManagement/taskAudit.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" clearable></el-input>
+							<el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -26,10 +26,10 @@
 							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
 								待审核
 							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
 								已通过
 							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
 								已驳回
 							</div>
 						</div>
@@ -37,46 +37,36 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<!-- <el-table-column type="index" label="序号" width="50">
-					<template scope="scope">
-						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-						<span v-else>{{ scope.$index + 1 }}</span>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="reexType" label="货主姓名">
+				<el-table-column prop="cargoOwnerName" label="货主姓名" min-width="125">
 					<template slot-scope="scope">
 						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.circleUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.reexType}}</span>
+							<el-avatar :size="20" :src="scope.row.cargoOwnerPortrait" style="margin: 0 10px 0 -25px;"></el-avatar>
+							<span style="position: absolute;display: inline-block;">{{scope.row.cargoOwnerName}}</span>
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="purpose" label="账号"></el-table-column>
-				<el-table-column prop="amountMoney" label="身份证号"></el-table-column>
-				<el-table-column prop="amountMoney" label="所属企业名称"></el-table-column>
-				<el-table-column prop="amountMoney" label="授权书">
+				<el-table-column prop="taskNo" label="任务编号" min-width="165"></el-table-column>
+				<el-table-column prop="cargoOwnerPhone" label="货主账号" min-width="108"></el-table-column>
+				<el-table-column prop="amountMoney" label="发货地" min-width="150">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="lookBook(scope)">查看</span>
+						{{scope.row.sendPrivate}}{{scope.row.sendCity}}{{scope.row.sendArea}}{{scope.row.sendDetailedAddress}}
 					</template>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="授权截止日期"></el-table-column>
-				<el-table-column prop="amountMoney" label="认证日期"></el-table-column>
-				<el-table-column prop="amountMoney" label="状态"></el-table-column>
+				<el-table-column prop="amountMoney" label="收货地" min-width="150">
+					<template slot-scope="scope">
+						{{scope.row.unloadPrivate}}{{scope.row.unloadCity}}{{scope.row.unloadArea}}{{scope.row.unloadDetailedAddress}}
+					</template>
+				</el-table-column>
+				<el-table-column prop="createDate" label="发布日期" min-width="100"></el-table-column>
+			
+				<el-table-column prop="status" label="状态"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="adopt(scope.row)">通过</span>
+						<el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="reject(scope.row)">驳回</span>
+						<el-link  target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">驳回</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="newInfo(scope.row)">消息</span>
-						<el-divider direction="vertical"></el-divider>
-						<el-dropdown>
-							<span class="btn_css">•••</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>禁用</el-dropdown-item>
-								<el-dropdown-item>启用</el-dropdown-item>
-							</el-dropdown-menu>
-						</el-dropdown>
+						<el-link  target="_blank" @click="reject(scope.row)" type="primary" :underline="false">查看</el-link>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -85,29 +75,7 @@
 			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
-		<el-dialog title="查看授权" :visible.sync="lookInfo" width="500px" :before-close="lookBookClose">
-			<div class="InfoBook_css">
-				<div class="InfoBook_title">姓名</div>
-				<div class="InfoBook_item">张三</div>
-				<div class="InfoBook_title">身份证号</div>
-				<div class="InfoBook_item">210381</div>
-				<div class="InfoBook_title">有效期</div>
-				<div class="InfoBook_item">2017-02-03<span class="data_css">已过期</span></div>
-				<div class="InfoBook_title">身份证人面像</div>
-				<div class="InfoBook_item">
-					<img src="../../../public/img/yonghu.jpg" class="InfoBook_img">
-				</div> 
-				<div class="InfoBook_title">身份证国徽面</div>
-				<div class="InfoBook_item">
-					<img src="../../../public/img/yonghu.jpg" class="InfoBook_img">
-				</div> 
-				<div class="InfoBook_btn">
-					<el-button @click="lookBookClose">关闭</el-button>
-				</div>
-			</div>
-			
-		</el-dialog>
-		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+		<!-- <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
 				<div><span class="sign">*</span>选择驳回原因</div>
 				<div class="form_css">
@@ -129,36 +97,66 @@
 					</el-form>
 				</div>
 			</div>
-		</el-dialog>
-		<el-dialog title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
-			<div class="Info_css">
-				<div class="Info_title">标题</div>
-				<div class="Info_item"><el-input placeholder="输入消息标题，不超过4-20个字。" v-model="Info.title"></el-input></div>
-				<div class="Info_title">内容</div>
-				<div class="Info_item"><el-input type="textarea" :rows="3" resize="none" placeholder="消息内容10-100字" maxlength="50" v-model="Info.textarea"></el-input></div>
-				<div class="Info_btn">
-					<el-button @click="sendInfoClose">取消</el-button>
-					<el-button @click="submitInfo" type="primary">确定</el-button>
-				</div>
-			</div>
-		</el-dialog>
+		</el-dialog> -->
+		<el-drawer title="任务详情" :visible.sync="rightSee" >
+			<div class="right_css">
+						<div class="right_item">任务编号：{{taskLook.taskNo}}</div>
+						<div class="right_title">公司</div>
+						<div class="right_item">{{taskLook.cargoOwnerName}}</div>
+						<div class="right_title">发货地区</div>
+						<div class="right_item">{{taskLook.sendPrivate}}{{taskLook.sendCity}}{{taskLook.sendArea}}</div>
+						<div class="right_title">发货详细地址</div>
+						<div class="right_item">{{taskLook.sendPrivate}}{{taskLook.sendCity}}{{taskLook.sendArea}}{{taskLook.sendDetailedAddress}}</div>
+						<div class="right_title">收货地区</div>
+						<div class="right_item">{{taskLook.unloadPrivate}}{{taskLook.unloadCity}}{{taskLook.unloadArea}}</div>
+						<div class="right_title">收货详细地址</div>
+						<div class="right_item">{{taskLook.unloadPrivate}}{{taskLook.unloadCity}}{{taskLook.unloadArea}}{{taskLook.unloadDetailedAddress}}</div>
+						<div class="right_title">运输距离</div>
+						<div class="right_item">约{{taskLook.distance ? taskLook.distance : 0}}km</div>
+						<div class="right_title">货名</div>
+						<div class="right_item">{{taskLook.goodsName}}</div>
+						<div class="right_title">重量（吨）</div>
+						<div class="right_item">{{taskLook.weight}}</div>
+						<div class="right_title">运费计算方式</div>
+						<div class="right_item">{{taskLook.billingMethod == 0 ? "元/吨":"元/车"}}</div>
+						<div class="right_title">{{taskLook.billingMethod == 0 ? "运费单价（元/吨）":"运费单价（元/车）"}}</div>
+						<div class="right_item">{{taskLook.freightPrice}}</div>
+						<div class="right_title">预计装车日期起</div>
+						<div class="right_item">{{taskLook. loadingDateStart}}</div>
+						<div class="right_title">预计装车日期止</div>
+						<div class="right_item">{{taskLook.loadingDateEnd}}</div>
+						<div class="right_title">车长要求（米）</div>
+						<div class="right_item">{{taskLook.carLengthSmall}}~{{taskLook.carLength}}</div>
+						<div class="right_title">载重要求（吨）</div>
+						<div class="right_item">{{taskLook.loadWeightSmall}}~{{taskLook.loadWeight}}</div>
+						<div class="right_title">车型要求</div>
+						<div class="right_item" v-if="taskLook.carModel == 1">不限</div>
+						<div class="right_item" v-if="taskLook.carModel == 2">高栏</div>
+						<div class="right_item" v-if="taskLook.carModel == 3">集装箱</div>
+						<div class="right_item" v-if="taskLook.carModel == 4">自卸车</div>
+						<div class="right_title">任务描述</div>
+						<div class="right_item">{{taskLook.taskDescription}}</div>
+						<div class="right_title">任务有效期</div>
+						<div class="right_item">{{taskLook.taskValidity}}</div>
+						<div class="right_item">{{taskLook.freightAdvance == 0 ? "该任务未申请运费垫付":"该任务申请运费垫付"}}</div>
+						<div class="right_btn">
+							<el-button @click="submit(1)" v-if="taskLook.status == '审核中'">通过</el-button>
+							<el-button @click="submit(2)" v-if="taskLook.status == '审核中'">驳回</el-button>
+							<el-button @click="rightSee = false">关闭</el-button>
+						</div>
+					</div>
+		</el-drawer>
 	</div>
 </template>
 <script>
+	import {
+		getListLook,
+		toTaskExamine
+	} from '@/api/cargoOwnerManagement'
 	export default {
 		data() {
 			return {
-				tableData: [{
-						reexType: "王某",
-						count: 5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-					{
-						reexType: "",
-						count: 4.5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-				],
+				tableData: [],
 				//分页
 				searchkeyWord: "",
 				currentPage: 1,
@@ -168,59 +166,78 @@
 				search: "",
 				addressUrl: [],
 				disabled: false,
-				lookInfo: false,
-				rejectInfo: false,
-				checkList: [],
 				form: {
 					checkList: [],
 					textarea: "",
 				},
-				Info:{},
-				sendInfo:false,
-
+				rightSee:false,
+				taskLook:{},
 			};
 		},
+		mounted() {
+			this.getList()
+		},
 		methods: {
 
-			getList() {},
-			newInfo(row){
-				this.sendInfo = true
-			},
-			sendInfoClose(){
-				this.sendInfo = false
+			getList() {
+				
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				getListLook(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
 			},
 			adopt(row) {
-				this.$confirm('确定通过辽H12345的审核？', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {})
+				this.taskLook = row
+				this.rightSee = true
 			},
 			reject(row) {
-				this.rejectInfo = true
-			},
-			rejectClose() {
-				this.form = {}
-				this.form.checkList = []
-				this.rejectInfo = false
-			},
-			submit() {
-				//驳回提交
-				this.form = {}
-				this.form.checkList = []
+				this.taskLook = row
+				this.rightSee = true
 			},
-			submitInfo(){
-				if(!this.Info.title){
-					this.$message.error("请输入标题")
-					return
+			submit(num) {
+				var _taskObj = {}
+				_taskObj.id = this.taskLook.id
+				let taskTitle = ""
+				if(num == 1){
+					_taskObj.flag = 1
+					taskTitle = "通过"
+				}else if(num == 2){
+					_taskObj.flag = 2
+					taskTitle = "驳回"
 				}
-			},
-			lookBook() {
-				this.lookInfo = true;
-			},
-			lookBookClose() {
-				this.lookInfo = false;
+				this.$confirm('确定'+ taskTitle + this.taskLook.cargoOwnerName + '的发运任务？', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						this.listLoading = true
+						
+						toTaskExamine(_taskObj).then(response => {
+							this.rightSee = false
+								this.taskLook = {}
+								this.$notify({
+									title: '成功',
+									message: taskTitle+'成功！',
+									type: 'success'
+								});
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
 			},
 			searchBtn(num) {
 				this.search = num;
@@ -385,72 +402,33 @@
 		font-size: 14px;
 		color: red;
 	}
-
-	.form_css {
-		width: 100%;
-		margin: 20px auto 20px;
-
-		::v-deep .el-checkbox {
-			width: 40%;
-			height: 30px;
-		}
-
-		::v-deep .el-dialog__body {
-			padding: 10px 20px;
-		}
-
-		::v-deep .el-dialog__title {
-			font-size: 16px;
-		}
-
-		::v-deep .el-textarea__inner {
-			background: #F0F1F2;
-		}
-
-		.form_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
-	}
-	//发送信息
-	.Info_css{
-		.Info_title{
-			color: #323233;
-			font-size: 16px;
-		}
-		.Info_item{
-			margin: 20px 0;
-		}
-		.Info_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
-	}
-	//授权信息
-	.InfoBook_css{
-		.InfoBook_title{
-			color: #9D9D9D;
-			font-size: 14px;
-		}
-		.data_css{
-			color: #EF4C33 ;
-			font-size: 14px;
-			margin-left: 6px;
-		}
-		.InfoBook_item{
-			color: #0D0D0D;
-			font-size: 14px;
-			margin-bottom: 20px;
-		}
-		.InfoBook_btn {
-			text-align: right;
-			margin-top: 10px;
+	.right_css {
+			padding:0 20px;
+			.right_title {
+				color: #9D9D9D;
+				font-size: 14px;
+				margin-bottom: 4px;
+			}
+	
+			.right_item {
+				color: #0D0D0D;
+				font-size: 14px;
+				margin-bottom: 20px;
+			}
+	
+			.right_btn {
+				text-align: right;
+				margin: 10px 0;
+			}
+	
+			.right_img {
+				width: 200px;
+				height: 120px;
+				margin-top: 10px;
+			}
 		}
-		.InfoBook_img{
-			width: 200px;
-			height: 120px;
-			margin-top: 10px;
+		::v-deep .el-drawer {
+			overflow: auto;
 		}
-	}
 	
 </style>

src/views/driverManagement/identityExamine.vue

@@ -1,4 +1,4 @@
-// 身份审核
+// 司机身份审核
 <template>
 	<div class="center">
 		<div class="center_css">
@@ -20,45 +20,48 @@
 					<el-col>
 						<div class="search_btn">
 							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
-								@click="searchBtn('')">
+								@click="searchBtn('')"> 
 								全部
 							</div>
 							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
 								待审核
 							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
 								已通过
 							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
 								已驳回
 							</div>
+							<!-- <div :class="search == 6 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(6)">
+								已过期
+							</div> -->
+							<!-- <div :class="search == 7 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(7)">
+								未认证
+							</div> -->
+							<!-- <div :class="search == 8 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(8)">
+								已注销
+							</div> -->
 							<div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
-								已完成
-							</div>
-							<div :class="search == 5 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
-								已终止
+								已禁用
 							</div>
 						</div>
 					</el-col>
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<!-- <el-table-column type="index" label="序号" width="50">
-					<template scope="scope">
-						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-						<span v-else>{{ scope.$index + 1 }}</span>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="reexType" label="司机姓名">
+				<el-table-column prop="driverName" label="司机姓名" min-width="130">
 					<template slot-scope="scope">
 						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.circleUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.reexType}}</span>
+							<el-avatar :size="20"
+								:src="scope.row.avatarUrl"
+								style="margin: 0 10px 0 -25px;">
+							</el-avatar>
+							<span style="position: absolute;display: inline-block;">{{scope.row.driverName}}</span>
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="purpose" label="账号"></el-table-column>
-				<el-table-column prop="amountMoney" label="身份证号"></el-table-column>
+				<el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
+				<el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>
 				<el-table-column prop="amountMoney" label="承运次数"></el-table-column>
 				<el-table-column prop="amountMoney" label="评分" min-width="170">
 					<template slot-scope="scope">
@@ -66,39 +69,47 @@
 							score-template="{value}"></el-rate>
 					</template>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="累计支付运费(元)" min-width="128"></el-table-column>
+				<el-table-column prop="amountMoney" label="累计支付运费(元)" min-width="130"></el-table-column>
 				<el-table-column label="车辆">
-					<span  @click="carLook" class="btn_css">查看</span>
+					<template slot-scope="scope">
+						<span @click="carLook(scope.row)" class="btn_css">查看</span>
+					</template>
+
 				</el-table-column>
 				<el-table-column prop="payee" label="账户">
-					<span @click="account" class="btn_css">查看</span>
+					<template slot-scope="scope">
+						<span @click="account(scope.row)" class="btn_css">查看</span>
+					</template>
 				</el-table-column>
 				<el-table-column prop="paymentDate" label="附件">
-					<span class="btn_css" @click="fujianLook">查看</span>
+					<template slot-scope="scope">
+					<span class="btn_css btn_css1" @click="fujianLook(scope.row)">查看</span>
 					<el-tooltip placement="top">
 						<div slot="content">身份证已过有效期 <br />驾驶证已过有效期</div>
 						<span style="margin-top:10px"></span>
-							<img src="../../../public/img/wenhao.png" alt="" >
+						<img src="../../../public/img/wenhao.png" alt="" class="ask_css">
 					</el-tooltip>
+					</template>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="注册日期"></el-table-column>
-				<el-table-column prop="status" label="状态"></el-table-column>
-				<el-table-column label="操作" min-width="350">
+				<el-table-column prop="createDate" label="注册日期" min-width="100"></el-table-column>
+				<el-table-column prop="authenticationStatus" label="状态"></el-table-column>
+				<el-table-column label="操作" min-width="300">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="adopt(scope.row)">通过</span>
+						 <el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="reject(scope.row)">驳回</span>
+						 <el-link  target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">驳回</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css">消息</span>
+						 <el-link  target="_blank" @click="newInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus == '审核中'">消息</el-link>
 						<el-divider direction="vertical"></el-divider>
 						<el-dropdown>
 							<span class="btn_css">•••</span>
 							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>禁用</el-dropdown-item>
-								<el-dropdown-item>启用</el-dropdown-item>
+								<el-dropdown-item :disabled="scope.row.authenticationStatus == '禁用' && scope.row.authenticationStatus != '审核中'"><span @click="switchChange(scope.row,'1')">禁用</span>
+								</el-dropdown-item>
+								<el-dropdown-item :disabled="scope.row.authenticationStatus != '禁用' && scope.row.authenticationStatus != '审核中'"><span @click="switchChange(scope.row,'2')">启用</span>
+								</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
-
 					</template>
 				</el-table-column>
 			</el-table>
@@ -108,68 +119,102 @@
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
 		<el-dialog title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
-			<div class="car_css" v-for="item in 5">
-				<img src="../../../public/img/yonghu.jpg" class="car_item" />
-				<div>
-					<span>辽H12345 通过</span>
+			<span class="tips">注：车辆信息不在本页面审核，仅供查看</span>
+			<div class="car_css" v-for="(item,index) in carSee" :key="index">
+				<img :src="item.addressUrl" class="car_item" />
+				<div class="status_css" v-if="item.status == '审核中'" style="color: #2F53EB; background: #CFDBFE  ;">
+					{{item.status}}</div>
+				<div class="status_css" v-else-if="item.status == '已通过'" style="color: #3AC602; background: #EEFAEA;">
+					{{item.status}}</div>
+				<div class="status_css" v-else style="color: #F53F3F; background: #FFEFF0 ;">{{item.status}}</div>
+				<div class="carno_css">
+					{{item.carNumber}}
 				</div>
+				<div class="carborder_css"></div>
 			</div>
 		</el-dialog>
 		<el-dialog title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userClose">
-			<div class="user" v-for="item in 2">
-				<div class="user_id">
-					<div class="id_css">12121212121212121212</div>
-					<div class="name_css">张三</div>
-				</div>
-				<div>中国银行-鲅鱼圈支行</div>
-				<img src="../../../public/img/yonghu.jpg" class="user_item" />
+			<div class="user" v-for="(item,index) in paySee" :key="index">
+				<div class="name_css">{{item.payeeName}}</div>
+				<div class="id_css">{{item.bankCard}}</div>
+				<div class="pay_name">{{item.bankDepositBranch}}</div>
+				<img :src="item.payeeAddressUrl" class="user_item" />
+				<div class="border_css"></div>
 			</div>
 		</el-dialog>
-		<el-dialog title="附件" :visible.sync="fujianInfo" width="500px" :before-close="fujianClose">
-		<!-- 	<div class="user" v-for="item in 2">
-				
-			</div> -->
+		<el-dialog title="附件" :visible.sync="fujianInfo" width="830px" :before-close="fujianClose">
+			<div class="file">
+				<div class="fujian_css" >
+					<div class="fujian_item" :class="count == 1 ? 'file_btn':''" @click="btnChange(1)">身份证</div>
+					<div class="fujian_item" :class="count == 2 ? 'file_btn':''" @click="btnChange(2)">驾驶证</div>
+					<div class="fujian_item" :class="count == 3 ? 'file_btn':''" @click="btnChange(3)">行驶证</div>
+					<div class="fujian_item" :class="count == 4 ? 'file_btn':''" @click="btnChange(4)">从业资格证</div>
+					<div class="fujian_item" :class="count == 5 ? 'file_btn':''" @click="btnChange(5)">挂车行驶证</div>
+					<div class="fujian_item" :class="count == 6 ? 'file_btn':''" @click="btnChange(6)">运营证</div>
+					<div class="fujian_item" :class="count == 7 ? 'file_btn':''" @click="btnChange(7)">挂车运营证</div>
+				</div>
+				<div class="file_img">
+					<img :src="img[index]" class="img_css">
+				</div>
+				<div class="btn">
+					<el-button style="margin-right: 120px;" @click="index = 0" :disabled="count == 4 || count == 6 || count == 7">身份证人像面</el-button>
+					<el-button @click="index = 1" :disabled="count == 4 || count == 6 || count == 7">身份证国徽面</el-button>
+				</div>
+				</div>
 		</el-dialog>
 		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
 				<div><span class="sign">*</span>选择驳回原因</div>
 				<div class="form_css">
 					<el-form ref="form" :model="form" label-width="80px">
-						<el-checkbox-group v-model="form.checkList">
-							<el-checkbox label="证件照片不清晰"></el-checkbox>
-							<el-checkbox label="证件照片上传错误"></el-checkbox>
-							<el-checkbox label="身份信息填写错误"></el-checkbox>
-							<el-checkbox label="证件信息填写错误"></el-checkbox>
-							<el-checkbox label="其他"></el-checkbox>
+						<el-checkbox-group v-model="checkList">
+							<el-checkbox label="证件照片不清晰" value="1"></el-checkbox>
+							<el-checkbox label="证件照片上传错误" value="2"></el-checkbox>
+							<el-checkbox label="身份信息填写错误" value="3"></el-checkbox>
+							<el-checkbox label="证件信息填写错误" value="4"></el-checkbox>
+							<el-checkbox label="其他" value="5"></el-checkbox>
 						</el-checkbox-group>
 						<div style="margin: 20px 0;">驳回原因描述（选填）</div>
-						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，5-50个字" maxlength="50" v-model="form.textarea"></el-input>
-					    <div class="form_btn">
-					    	<el-button @click="rejectClose">取消</el-button>
-						 <el-button @click="submit" type="primary">确定</el-button>
-					    </div>
-						 
+						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，1-100个字"
+							v-model="form.rejectReasonDescription" maxlength="100"></el-input>
+						<div class="form_btn">
+							<el-button @click="rejectClose">取消</el-button>
+							<el-button @click="submit" type="primary">确定</el-button>
+						</div>
 					</el-form>
 				</div>
 			</div>
 		</el-dialog>
+		<!-- //消息 -->
+		<el-dialog title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
+			<div class="Info_css">
+				<div class="Info_title">标题</div>
+				<div class="Info_item">
+					<el-input placeholder="输入消息标题，不超过4-20个字。" v-model="Info.newsTitle" maxlength="20"></el-input>
+				</div>
+				<div class="Info_title">内容</div>
+				<div class="Info_item">
+					<el-input type="textarea" :rows="3" resize="none" placeholder="消息内容10-100字" maxlength="100"
+						v-model="Info.newsContent"></el-input>
+				</div>
+				<div class="Info_btn">
+					<el-button @click="sendInfoClose">取消</el-button>
+					<el-button @click="submitInfo" type="primary">确定</el-button>
+				</div>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 <script>
+	import {
+		getList,
+		toExamine,
+		postNews
+	} from '@/api/driverManagement'
 	export default {
 		data() {
 			return {
-				tableData: [{
-						reexType: "王某",
-						count: 5,
-						circleUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-					{
-						reexType: "",
-						count: 4.5,
-						circleUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-				],
+				tableData: [],
 				//分页
 				searchkeyWord: "",
 				currentPage: 1,
@@ -181,29 +226,173 @@
 				disabled: false,
 				carInfo: false,
 				userInfo: false,
-				fujianInfo:false,
-				rejectInfo:false,
-				form:{
-					checkList:[],
-					textarea:"",
+				fujianInfo: false,
+				rejectInfo: false,
+				form: {
+					id: "",
+					rejectReasonDescription: "",
 				},
+				checkList:[],
+				carSee: [],
+				paySee: [],
+				sendInfo: false,
+				Info: {},
+				file:{},
+				img:[],
+				index:'0',
+				count:'1',
 			};
 		},
+
+		mounted() {
+			this.getList()
+		},
 		methods: {
-			getList() {},
-			account() {
+			getList() {
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				getList(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			btnChange(num){
+				this.count = num
+				if(num == 1){
+					this.img[0] = this.file.cardAddressUrl
+					this.img[1] = this.file.cardBackAddressUrl
+				}else if(num == 2){
+					this.img[0] = this.file.driverLicenseHomePage
+					this.img[1] = this.file. driverLicenseBackPage
+				}else if(num == 3){
+					this.img[0] = this.file.drivingLicenseHomePage
+					this.img[1] = this.file.drivingLicenseBackPage
+				}else if(num == 4){
+					this.index = 0
+					this.img[0] = this.file.qualificationCertificate
+				}else if(num == 5){
+					this.img[0] = this.file.trailerLicenseHomePage
+					this.img[1] = this.file.trailerLicenseBackPage
+				}else if(num == 6){
+					this.index = 0
+					this.img[0] = this.file.operationCertificate
+				}else if(num == 7){
+					this.index = 0
+					this.img[0] = this.file.trailerOperationCertificate
+				}
+				
+			},
+			newInfo(row) {
+				this.Info.newsTypeKey = 1
+				this.Info.newsType = "系统消息"
+				this.Info.crtCommonId = JSON.parse(localStorage.getItem('UserInfo')).userId
+				this.Info.reCommonId = row.commonId
+				this.Info.bussId = row.id
+				this.sendInfo = true
+			},
+			sendInfoClose() {
+				this.Info = {}
+				this.sendInfo = false
+			},
+			submitInfo() {
+				if(!this.Info.newsTitle){
+					this.$message.error("标题不能为空")
+					return
+				}
+				if(!this.Info.newsContent){
+					this.$message.error("消息内容不能为空")
+					return
+				}
+				if(this.Info.newsTitle.length < 4 || this.Info.newsTitle.length > 20){
+					this.$message.error("标题字数应在4-20之间")
+					return
+				}
+				if(this.Info.newsContent.length < 10 || this.Info.newsContent.length > 100){
+					this.$message.error("消息内容字数应在10-100之间")
+					return
+				}
+				this.listLoading = true
+				postNews(this.Info).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '发送成功！',
+							type: 'success'
+						});
+						this.sendInfoClose()
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			switchChange(row, num) {
+				var _examine = {}
+				_examine.id = row.id
+				let title
+				if (num == 1) {
+					_examine.flag = 3
+					title = "禁用后客户将无法使用所有功能，是否确定禁用？"
+				} else if (num == 2) {
+					title = "确定重新启用该用户？"
+					_examine.flag = 4
+				}
+				this.$confirm(title, '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						this.listLoading = true
+						toExamine(_examine).then(response => {
+								if (num == 1) {
+									this.$notify({
+										title: '成功',
+										message: '禁用成功！',
+										type: 'success'
+									});
+								} else if (num == 2) {
+									this.$notify({
+										title: '成功',
+										message: '启用成功！',
+										type: 'success'
+									});
+								}
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
+			},
+			account(row) {
+				this.paySee = row.driverPayeeInfoList
 				this.userInfo = true;
 			},
-			fujianLook(){
+			fujianLook(row) {
+				this.file = row
+				this.index = 0
+				this.img[0] = this.file.cardAddressUrl
+				this.img[1] = this.file.cardBackAddressUrl
 				this.fujianInfo = true
 			},
 			userClose() {
 				this.userInfo = false;
 			},
-			fujianClose(){
+			fujianClose() {
+				this.count = 1
 				this.fujianInfo = false
 			},
-			carLook() {
+			carLook(row) {
+				this.carSee = row.driverCarInfoList
 				this.carInfo = true;
 			},
 			carClose() {
@@ -217,38 +406,76 @@
 				this.getList();
 			},
 			adopt(row) {
-				this.$confirm('确定通过辽H12345的审核？', '提示', {
+				this.$confirm('确定通过身份审核？', '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning',
 					})
-					.then(() => {	
+					.then(() => {
+						this.listLoading = true
+						var _examine = {}
+						_examine.id = row.id
+						_examine.flag = 1
+						toExamine(_examine).then(response => {
+								this.$notify({
+									title: '成功',
+									message: '通过成功！',
+									type: 'success'
+								});
+								this.rejectInfo = false
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
 					})
 			},
-			submit(){
-				//驳回提交
-				this.form = {}
-				this.form.checkList=[]
+			submit() {
+				if (this.checkList.length == 0) {
+					this.$message.error("请选择驳回原因")
+					return
+				}
+				this.listLoading = true
+				this.form.rejectReason = this.checkList.toString()
+				// delete this.form.checkList
+				toExamine(this.form).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '驳回成功！',
+							type: 'success'
+						});
+						this.checkList = []
+						this.form = {}
+						this.rejectInfo = false
+						this.getList()
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
 			},
 			reject(row) {
+				this.form.id = row.id
+				this.form.flag = 2
 				this.rejectInfo = true
 			},
 			rejectClose() {
+				this.checkList = []
 				this.form = {}
-				this.form.checkList=[]
 				this.rejectInfo = false
 			},
-			onChange() {
-				this.$refs.upload
-					.handleSaveBill()
-					.then(async (response) => {
-						this.formData.addressUrl = response;
-					})
-					.catch((res) => {
-						EventBus.$emit("error", (JSON.parse(res) || {}).message);
-						this.$refs.upload.clearFiles();
-					});
-			},
+			// onChange() {
+			// 	this.$refs.upload
+			// 		.handleSaveBill()
+			// 		.then(async (response) => {
+			// 			this.formData.addressUrl = response;
+			// 		})
+			// 		.catch((res) => {
+			// 			EventBus.$emit("error", (JSON.parse(res) || {}).message);
+			// 			this.$refs.upload.clearFiles();
+			// 		});
+			// },
 			handleSizeChange(val) {
 				console.log(`每页 ${val} 条`);
 				this.pageSize = val;
@@ -284,7 +511,7 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor:pointer
+					cursor: pointer
 				}
 
 				.searchNo {
@@ -298,6 +525,11 @@
 			}
 		}
 
+		.ask_css {
+			position: absolute;
+			margin: 3px 0 0 10px;
+		}
+
 		.center_css {
 			background: #ffffff;
 			border-radius: 1px;
@@ -351,35 +583,79 @@
 		width: 50%;
 		display: inline-block;
 		text-align: center;
-		margin-top: 20px;
+		margin-top: 30px;
+		position: relative;
+
+		.status_css {
+			background: #3AC602;
+			width: 50px;
+			height: 17px;
+			position: absolute;
+			top: 0px;
+			right: 15px;
+			border-radius: 3px;
+		}
+
+		.carno_css {
+			padding: 1px 5px;
+			background-color: #F5F6F7;
+			color: #666666;
+			border-radius: 12px;
+			text-align: center;
+			width: 100px;
+			margin: 10px auto 0;
+		}
+
+		.carborder_css {
+			border: 1px solid #F0F1F2;
+			margin: 15px auto 0;
+			width: 90%;
+		}
+	}
+
+	.tips {
+		color: #999999;
+		font-size: 14px;
 	}
 
 	.car_item {
-		width: 100px;
-		height: 100px;
+		width: 200px;
+		height: 160px;
+		border-radius: 5px;
 	}
 
 	.user {
 		margin-bottom: 20px;
 
-		.user_id {
-			display: flex;
-			height: 30px;
+		.id_css {
+			font-size: 14px;
 		}
 
-		.name_css,
-		.id_css {
-			width: 50%;
+		.id_css,
+		.name_css {
+			margin: 5px 0;
+			color: #0D0D0D;
+		}
+
+		.pay_name {
+			color: #9D9D9D;
+			font-size: 14px;
 		}
 
 		.name_css {
-			text-align: right;
+			font-size: 16px;
 		}
 
 		.user_item {
+			margin: 25px 0;
 			width: 450px;
 			height: 300px;
 		}
+
+		.border_css {
+			width: 100%;
+			border: 1px solid #F0F1F2;
+		}
 	}
 
 	::v-deep .el-table--border .el-table__header th {
@@ -387,32 +663,96 @@
 	}
 
 	.btn_css {
-		color: #2f53eb;
-		cursor:pointer
+		color: #409EFF;
+		cursor: pointer
 	}
+
+	.btn_css1 {
+		margin-left: -20px;
+	}
+
 	.sign {
 		font-size: 14px;
 		color: red;
 	}
+
 	.form_css {
 		width: 100%;
 		margin: 20px auto 20px;
-		::v-deep .el-checkbox{
+
+		::v-deep .el-checkbox {
 			width: 40%;
 			height: 30px;
 		}
+
 		// ::v-deep .el-dialog__body{
 		// 	padding: 10px 20px;
 		// }
-		::v-deep .el-dialog__title{
+		::v-deep .el-dialog__title {
 			font-size: 16px;
 		}
-		::v-deep .el-textarea__inner{
+
+		::v-deep .el-textarea__inner {
 			background: #F0F1F2;
 		}
-		.form_btn{
+
+		.form_btn {
+			text-align: right;
+			margin-top: 10px;
+		}
+	}
+
+	//发送信息
+	.Info_css {
+		.Info_title {
+			color: #323233;
+			font-size: 16px;
+		}
+
+		.Info_item {
+			margin: 20px 0;
+		}
+
+		.Info_btn {
 			text-align: right;
 			margin-top: 10px;
 		}
 	}
+	//附件
+	.file{
+		.fujian_css{
+		width: 631px;
+		display: flex;
+		margin: 0 auto;
+		text-align: center;
+		line-height:32px;
+		border: 1px solid #F0F1F2;
+		border-right: 0px;
+		border-radius: 2px 0px 0px 2px;
+		.fujian_item{
+			cursor:pointer;
+			width: 90px;
+			height: 32px;
+			border-right: 1px solid #F0F1F2;
+		}
+		.file_btn{
+			color: #2F53EB ;
+			background-color: #CFDBFE;
+		}
+	}
+	.file_img{
+		width: 525px;
+		height: 332px;
+		margin: 20px auto;
+	}
+	.img_css{
+		width: 525px;
+		height: 332px;
+	}
+	.btn{
+		width: 400px;
+		margin: 0 auto;
+	}
+	}
+	
 </style>

src/views/driverManagement/vehicleExamine.vue

@@ -26,64 +26,48 @@
 							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
 								待审核
 							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
 								已通过
 							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
 								已驳回
 							</div>
-							<div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
-								已注销
+							<!-- <div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
+								已删除
 							</div>
 							<div :class="search == 5 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
-								已终止
-							</div>
+								已注销
+							</div> -->
 						</div>
 					</el-col>
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<!-- <el-table-column type="index" label="序号" width="50">
-					<template scope="scope">
-						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-						<span v-else>{{ scope.$index + 1 }}</span>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="reexType" label="司机姓名">
+				<el-table-column prop="driverName" label="司机姓名" min-width="130">
 					<template slot-scope="scope">
 						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.circleUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.reexType}}</span>
+							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
+							<span style="position: absolute;display: inline-block;">{{scope.row.driverName}}</span>
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="purpose" label="账号"></el-table-column>
-				<el-table-column prop="amountMoney" label="身份证号"></el-table-column>
-				<el-table-column prop="amountMoney" label="车牌号"></el-table-column>
+				<el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
+				<el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>
+				<el-table-column prop="carNumber" label="车牌号"></el-table-column>
 
-				<el-table-column prop="amountMoney" label="人车合影、身份证">
+				<el-table-column prop="amountMoney" label="人车合影、身份证" min-width="133">
 					<template scope="scope">
-						<span class="btn_css" @click="carLook">查看</span>
+						<span class="btn_css" @click="carLook(scope.row)">查看</span>
 					</template>
 				</el-table-column>
 
 				<el-table-column prop="status" label="状态"></el-table-column>
-				<el-table-column prop="amountMoney" label="更新日期"></el-table-column>
+				<el-table-column prop="updateDate" label="更新日期"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="adopt(scope.row)">通过</span>
-						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="reject(scope.row)">驳回</span>
+						<el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css">消息</span>
-						<el-divider direction="vertical"></el-divider>
-						<el-dropdown>
-							<span class="btn_css">•••</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>禁用</el-dropdown-item>
-								<el-dropdown-item>启用</el-dropdown-item>
-							</el-dropdown-menu>
-						</el-dropdown>
+						<el-link  target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">驳回</el-link>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -93,27 +77,32 @@
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
 		<el-dialog title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
-			<div class="car_css" v-for="(item,index) in 5" :key="index">
-				<img src="../../../public/img/yonghu.jpg" class="car_item" />
-				<div>
-					<span>辽H12345 通过</span>
+			<div class="car_css">
+				<div class="title_css">人车合影</div>
+				<img :src="carSee.addressUrl" class="car_item"/>
+				<div class="title_css">身份证人像面</div>
+				<img :src="carSee.cardAddressUrl" class="car_item"/>
+				<div class="title_css">身份证国徽面</div>
+				<img :src="carSee.cardAddressUrl" class="car_item"/>
+				<div class="form_btn">
+					<el-button @click="carClose">关闭</el-button>
 				</div>
 			</div>
 		</el-dialog>
 		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
-				<div><span class="sign">*</span>选择驳回原因</div>
+				<!-- <div><span class="sign">*</span>选择驳回原因</div> -->
 				<div class="form_css">
 					<el-form ref="form" :model="form" label-width="80px">
-						<el-checkbox-group v-model="form.checkList">
+						<!-- <el-checkbox-group v-model="form.checkList">
 							<el-checkbox label="证件照片不清晰"></el-checkbox>
 							<el-checkbox label="证件照片上传错误"></el-checkbox>
 							<el-checkbox label="身份信息填写错误"></el-checkbox>
 							<el-checkbox label="证件信息填写错误"></el-checkbox>
 							<el-checkbox label="其他"></el-checkbox>
-						</el-checkbox-group>
-						<div style="margin: 20px 0;">驳回原因描述（选填）</div>
-						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，5-50个字" maxlength="50" v-model="form.textarea"></el-input>
+						</el-checkbox-group> -->
+						<div style="margin-bottom: 20px;">驳回原因描述（必填）</div>
+						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，5-50个字" maxlength="50" v-model="form.rejectReasonDescription"></el-input>
 					<div class="form_btn">
 						<el-button @click="rejectClose">取消</el-button>
 					 <el-button @click="submit" type="primary">确定</el-button>
@@ -125,20 +114,14 @@
 	</div>
 </template>
 <script>
+	import {
+		getCarList,
+		toCarExamine
+	} from '@/api/driverManagement'
 	export default {
 		data() {
 			return {
-				tableData: [{
-						reexType: "王某",
-						count: 5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-					{
-						reexType: "",
-						count: 4.5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-				],
+				tableData: [],
 				//分页
 				searchkeyWord: "",
 				currentPage: 1,
@@ -151,38 +134,96 @@
 				carInfo: false,
 				rejectInfo: false,
 				checkList: [],
-				form: {
-					checkList:[],
-					textarea:"",
-				},
+				form: {},
+				carSee:{}
 				
 			};
 		},
+		mounted() {
+			this.getList()
+		},
 		methods: {
 
-			getList() {},
+			getList() {
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				getCarList(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
 			adopt(row) {
-				this.$confirm('确定通过辽H12345的审核？', '提示', {
+				this.$confirm('确定通过' + row.carNumber + '的审核？', '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning',
 					})
-					.then(() => {})
+					.then(() => {
+						this.listLoading = true
+							var _examine = {}
+							_examine.id = row.id
+							_examine.flag = 1
+							toCarExamine(_examine).then(response => {
+									this.$notify({
+										title: '成功',
+										message: '通过成功！',
+										type: 'success'
+									});
+									this.getList()
+									this.listLoading = false
+								})
+								.catch(() => {
+									this.loading = false
+								})
+						})
+					
 			},
 			reject(row) {
+				this.form.id = row.id
+				this.form.flag = 2
 				this.rejectInfo = true
 			},
 			rejectClose() {
 				this.form = {}
-				this.form.checkList=[]
 				this.rejectInfo = false
 			},
 			submit(){
-				//驳回提交
-				this.form = {}
-				this.form.checkList=[]
+				if(!this.form.rejectReasonDescription){
+					this.$message.error("请输入驳回原因")
+					return
+				}
+				if(this.form.rejectReasonDescription.length < 6 || this.form.rejectReasonDescription.length > 50){
+					this.$message.error("驳回原因字数应在6-50之间")
+					return
+				}
+				this.listLoading = true
+				toCarExamine(this.form).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '驳回成功！',
+							type: 'success'
+						});
+						this.form = {}
+						this.rejectInfo = false
+						this.getList()
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
 			},
-			carLook() {
+			carLook(row) {
+				this.carSee.addressUrl = row.addressUrl
+				this.carSee.cardAddressUrl = row.cardAddressUrl
+				this.carSee.cardBackAddressUrl = row.cardBackAddressUrl
 				this.carInfo = true;
 			},
 			carClose() {
@@ -300,37 +341,20 @@
 	}
 
 	.car_css {
-		width: 50%;
-		display: inline-block;
-		text-align: center;
-		margin-top: 20px;
-	}
-
-	.car_item {
-		width: 100px;
-		height: 100px;
-	}
-
-	.user {
 		margin-bottom: 20px;
-
-		.user_id {
-			display: flex;
-			height: 30px;
+		.title_css{
+			margin-bottom: 10px;
+			color: #999999 ;
 		}
 
-		.name_css,
-		.id_css {
-			width: 50%;
-		}
 
-		.name_css {
-			text-align: right;
+		.car_item {
+			width: 370px;
+			height: 220px;
+			margin-bottom: 20px;
 		}
-
-		.user_item {
-			width: 450px;
-			height: 300px;
+		.form_btn{
+			text-align: right;
 		}
 	}
 
@@ -339,7 +363,7 @@
 	}
 
 	.btn_css {
-		color: #2f53eb;
+		color: #409EFF;
 		cursor: pointer
 	}
 
@@ -350,7 +374,7 @@
 
 	.form_css {
 		width: 100%;
-		margin: 20px auto 20px;
+		margin: 0 auto 20px;
 		::v-deep .el-checkbox{
 			width: 40%;
 			height: 30px;

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" clearable></el-input>
+							<el-input placeholder="可按法人姓名、账号、企业名称查找" v-model="searchkeyWord" clearable></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -26,57 +26,44 @@
 							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
 								待审核
 							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
 								已通过
 							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
 								已驳回
 							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+							<!-- <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
 								已过期
-							</div>
+							</div> -->
 						</div>
 					</el-col>
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<!-- <el-table-column type="index" label="序号" width="50">
-					<template scope="scope">
-						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-						<span v-else>{{ scope.$index + 1 }}</span>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="reexType" label="企业名称">
+				<el-table-column prop="reexType" label="企业名称" min-width="150">
 					<template slot-scope="scope">
 						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.circleUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.reexType}}</span>
+							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
+							<span style="position: absolute;display: inline-block;">{{scope.row.companyName}}</span>
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="purpose" label="统一社会信用代码"></el-table-column>
-				<el-table-column prop="amountMoney" label="法定代表人"></el-table-column>
-				<el-table-column prop="amountMoney" label="账号"></el-table-column>
-				<el-table-column prop="amountMoney" label="实缴金额（万元）"></el-table-column>
-				<el-table-column prop="amountMoney" label="认证日期"></el-table-column>
-				<el-table-column prop="amountMoney" label="厂地租赁截止日期"></el-table-column>
-				<el-table-column prop="amountMoney" label="营业期限"></el-table-column>
-				<el-table-column prop="amountMoney" label="状态"></el-table-column>
-				<el-table-column label="操作" min-width="350">
+				<el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" min-width="140"></el-table-column>
+				<el-table-column prop="legalPersonName" label="法定代表人" min-width="91"></el-table-column>
+				<el-table-column prop="accountNumber" label="账号" min-width="107"></el-table-column>
+				<el-table-column prop="registeredPaidAmount" label="实缴金额（万元）" min-width="133"></el-table-column>
+				<el-table-column prop="updateDate" label="认证日期"></el-table-column>
+				<el-table-column prop="siteLeaseDate" label="厂地租赁截止日期" min-width="132"></el-table-column>
+				<el-table-column prop="businessTermDate" label="营业期限"></el-table-column>
+				<el-table-column prop="status" label="状态"></el-table-column>
+				<el-table-column label="操作" min-width="200">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="adopt(scope.row)">通过</span>
-						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="reject(scope.row)">驳回</span>
+						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="seeInfo(scope.row)">查看</span>
+						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">驳回</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<el-dropdown>
-							<span class="btn_css">•••</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>禁用</el-dropdown-item>
-								<el-dropdown-item>启用</el-dropdown-item>
-							</el-dropdown-menu>
-						</el-dropdown>
+						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false">查看</el-link>
+						<!-- <span class="btn_css" @click="seeInfo(scope.row)"></span> -->
 					</template>
 				</el-table-column>
 			</el-table>
@@ -85,29 +72,7 @@
 			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
-		<el-dialog title="查看授权" :visible.sync="lookInfo" width="500px" :before-close="lookBookClose">
-			<div class="InfoBook_css">
-				<div class="InfoBook_title">姓名</div>
-				<div class="InfoBook_item">张三</div>
-				<div class="InfoBook_title">身份证号</div>
-				<div class="InfoBook_item">210381</div>
-				<div class="InfoBook_title">有效期</div>
-				<div class="InfoBook_item">2017-02-03<span class="data_css">已过期</span></div>
-				<div class="InfoBook_title">身份证人面像</div>
-				<div class="InfoBook_item">
-					<img src="../../../public/img/yonghu.jpg" class="InfoBook_img">
-				</div> 
-				<div class="InfoBook_title">身份证国徽面</div>
-				<div class="InfoBook_item">
-					<img src="../../../public/img/yonghu.jpg" class="InfoBook_img">
-				</div> 
-				<div class="InfoBook_btn">
-					<el-button @click="lookBookClose">关闭</el-button>
-				</div>
-			</div>
-			
-		</el-dialog>
-		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+		<!-- <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
 				<div><span class="sign">*</span>选择驳回原因</div>
 				<div class="form_css">
@@ -129,62 +94,53 @@
 					</el-form>
 				</div>
 			</div>
-		</el-dialog>
+		</el-dialog> -->
 		<el-drawer title="企业详情" :visible.sync="rightSee" >
 			<div class="right_css">
 						<div class="right_title">企业名称</div>
-						<div class="right_item">黑龙江中天昊元贸易有限公司</div>
+						<div class="right_item">{{infoData.companyName}}</div>
 						<div class="right_title">法定代表人姓名</div>
-						<div class="right_item">张三</div>
+						<div class="right_item">{{infoData.legalPersonName}}</div>
 						<div class="right_title">联系方式</div>
-						<div class="right_title">13654111111</div>
+						<div class="right_item">{{infoData.accountNumber}}</div>
 						<div class="right_title">注册实缴金额（万元）</div>
-						<div class="right_title">13654111111</div>
-						
-						<div class="right_title">身份证</div>
+						<div class="right_item">{{infoData.registeredPaidAmount}}</div>
+						<div class="right_title">上传营业执照</div>
 						<div class="right_item">
-							<img src="../../../public/img/yonghu.jpg" class="right_img">
+							<img :src="infoData.businessLicenseAddressUrl" class="right_img">
 						</div>
-						<div class="right_item">
-							<img src="../../../public/img/yonghu.jpg" class="right_img">
+						<div class="right_title">营业期限截止日期</div>
+						<div class="right_item">{{infoData.businessTermDate}}</div>
+						<div class="right_title">统一社会信用代码</div>
+						<div class="right_item">{{infoData.unifiedSocialCreditCode}}</div>
+						<div class="right_title">{{infoData.landOwnership == 0 ? "房产证":"租赁合同"}}</div>
+						<div class="right_item" v-if="infoData.imgs.length > 0" v-for="(item , index) in infoData.imgs">
+							<img :src="item" class="right_img">
 						</div>
-						<div class="right_title">身份证号</div>
-						<div class="right_item">210381</div>
-						<div class="right_title">身份证有效期</div>
-						<div class="right_item">2017-02-03<span class="data_css">已过期</span></div>
-						<div class="right_title">营业执照</div>
+						
+						<div class="right_title">视频验证</div>
 						<div class="right_item">
 							<img src="../../../public/img/yonghu.jpg" class="right_img">
 						</div>
-						<div class="right_title">营业期限截止日期</div>
-						<div class="right_item">2017-02-03<span class="data_css">已过期</span></div>
-						<div class="right_title">统一社会信用代码</div>
-						<div class="right_item">210381</div>
-					
+						<div class="right_item">{{infoData.advanceFreightService == 1 ? "申请开通平台垫付运费业务" : "未申请开通平台垫付运费业务"}}</div>
 						<div class="right_btn">
+							<el-button @click="submit(1)" v-if="infoData.status == '审核中'">通过</el-button>
+							<el-button @click="submit(2)" v-if="infoData.status == '审核中'">驳回</el-button>
 							<el-button @click="rightSee = false">关闭</el-button>
 						</div>
-		
 					</div>
-		 
 		</el-drawer>
 	</div>
 </template>
 <script>
+	import {
+		getList,
+		toallowExamine
+	} from '@/api/enterpriseManagement'
 	export default {
 		data() {
 			return {
-				tableData: [{
-						reexType: "王某",
-						count: 5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-					{
-						reexType: "",
-						count: 4.5,
-						circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-				],
+				tableData: [],
 				//分页
 				searchkeyWord: "",
 				currentPage: 1,
@@ -194,7 +150,6 @@
 				search: "",
 				addressUrl: [],
 				disabled: false,
-				lookInfo: false,
 				rejectInfo: false,
 				checkList: [],
 				form: {
@@ -202,48 +157,75 @@
 					textarea: "",
 				},
 				rightSee:false,
+				infoData:{},
+				
 
 			};
 		},
+		mounted() {
+			this.getList()
+		},
 		methods: {
-
-			getList() {},
-			adopt(row) {
-				this.$confirm('确定通过辽H12345的审核？', '提示', {
+			getList() {
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				getList(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			submit(num){
+				var _allowObj = {}
+				_allowObj.id = this.infoData.id
+				let allowTitle = ""
+				if(num == 1){
+					_allowObj.flag = 1
+					allowTitle = "通过"
+				}else if(num == 2){
+					_allowObj.flag = 2
+					allowTitle = "驳回"
+				}
+				this.$confirm("确定"+ allowTitle +"企业审核？", '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning',
 					})
-					.then(() => {})
-			},
-			seeInfo(){
-				this.rightSee = true
-			},
-			reject(row) {
-				this.rejectInfo = true
-			},
-			rejectClose() {
-				this.form = {}
-				this.form.checkList = []
-				this.rejectInfo = false
-			},
-			submit() {
-				//驳回提交
-				this.form = {}
-				this.form.checkList = []
+					.then(() => {
+						this.listLoading = true
+						
+						toallowExamine(_allowObj).then(response => {
+							this.rightSee = false
+								this.infoData = {}
+								this.$notify({
+									title: '成功',
+									message: allowTitle+'成功！',
+									type: 'success'
+								});
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
 			},
-			submitInfo(){
-				if(!this.Info.title){
-					this.$message.error("请输入标题")
-					return
+			seeInfo(row){
+				this.infoData = row
+				this.infoData.imgs = []
+				if(this.infoData.propertyAddressUrl){
+					this.infoData.imgs = this.infoData.propertyAddressUrl.split(',')
 				}
+				this.rightSee = true
 			},
-			lookBook() {
-				this.lookInfo = true;
-			},
-			lookBookClose() {
-				this.lookInfo = false;
-			},
+			
 			searchBtn(num) {
 				this.search = num;
 				this.getList();
@@ -448,32 +430,6 @@
 			margin-top: 10px;
 		}
 	}
-	//授权信息
-	.InfoBook_css{
-		.InfoBook_title{
-			color: #9D9D9D;
-			font-size: 14px;
-		}
-		.data_css{
-			color: #EF4C33 ;
-			font-size: 14px;
-			margin-left: 6px;
-		}
-		.InfoBook_item{
-			color: #0D0D0D;
-			font-size: 14px;
-			margin-bottom: 20px;
-		}
-		.InfoBook_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
-		.InfoBook_img{
-			width: 200px;
-			height: 120px;
-			margin-top: 10px;
-		}
-	}
 	
 	.right_css {
 			padding:0 20px;
@@ -491,7 +447,7 @@
 	
 			.right_btn {
 				text-align: right;
-				margin-top: 10px;
+				margin: 10px 0;
 			}
 	
 			.right_img {
@@ -500,5 +456,8 @@
 				margin-top: 10px;
 			}
 		}
+		::v-deep .el-drawer {
+			overflow: auto;
+		}
 	
 </style>

src/views/login/index.vue

@@ -1,262 +1,235 @@
 <template>
-  <div class="login-container">
-    <el-form
-      ref="loginForm"
-      :model="loginForm"
-      :rules="loginRules"
-      class="login-form"
-      auto-complete="on"
-      label-position="left"
-    >
-      <div class="title-container">
-        <h3 class="title">Login Form</h3>
-      </div>
-
-      <el-form-item prop="username">
-        <span class="svg-container">
-          <svg-icon icon-class="user" />
-        </span>
-        <el-input
-          ref="username"
-          v-model="loginForm.username"
-          placeholder="请输入您的账号"
-          name="username"
-          type="text"
-          tabindex="1"
-          auto-complete="on"
-        />
-      </el-form-item>
-
-      <el-form-item prop="password">
-        <span class="svg-container">
-          <svg-icon icon-class="password" />
-        </span>
-        <el-input
-          :key="passwordType"
-          ref="password"
-          v-model="loginForm.password"
-          :type="passwordType"
-          placeholder="请输入登录密码"
-          name="password"
-          tabindex="2"
-          auto-complete="on"
-          @keyup.enter.native="handleLogin"
-        />
-        <span class="show-pwd" @click="showPwd">
-          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-        </span>
-      </el-form-item>
-
-      <el-button
-        :loading="loading"
-        type="primary"
-        style="width:100%;margin-bottom:30px;"
-        @click.native.prevent="handleLogin"
-      >Login</el-button>
-
-      <!-- <div class="tips">
+	<div class="login-container">
+		<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
+			label-position="left">
+			<div class="title-container">
+				<h3 class="title">Login Form</h3>
+			</div>
+
+			<el-form-item prop="username">
+				<span class="svg-container">
+					<svg-icon icon-class="user" />
+				</span>
+				<el-input ref="username" v-model="loginForm.username" placeholder="请输入您的账号" name="username" type="text"
+					tabindex="1" auto-complete="on" />
+			</el-form-item>
+
+			<el-form-item prop="password">
+				<span class="svg-container">
+					<svg-icon icon-class="password" />
+				</span>
+				<el-input :key="passwordType" ref="password" v-model="loginForm.password" :type="passwordType"
+					placeholder="请输入登录密码" name="password" tabindex="2" auto-complete="on"
+					@keyup.enter.native="handleLogin" />
+				<span class="show-pwd" @click="showPwd">
+					<svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+				</span>
+			</el-form-item>
+
+			<el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
+				@click.native.prevent="handleLogin">Login</el-button>
+
+			<!-- <div class="tips">
         <span style="margin-right:20px;">username: admin</span>
         <span>password: any</span>
       </div> -->
-    </el-form>
-  </div>
+		</el-form>
+	</div>
 </template>
 
 <script>
-import { validUsername } from '@/utils/validate'
-
-export default {
-  name: 'Login',
-  data() {
-    const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
-        callback(new Error('请输入正确的账号'))
-      } else {
-        callback()
-      }
-    }
-    const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('请输入正确的密码'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      loginForm: {},
-      loginRules: {
-        username: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validateUsername
-          }
-        ],
-        password: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validatePassword
-          }
-        ]
-      },
-      loading: false,
-      passwordType: 'password',
-      redirect: undefined
-    }
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-      this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-			this.loginForm.companyName = '黑龙江中天昊元贸易有限公司'
-          this.loading = true
-          this.$store
-            .dispatch('user/login', this.loginForm)
-            .then(() => {
-              this.$router.push({
-                path: this.redirect || '/'
-              })
-              this.loading = false
-            })
-            .catch(() => {
-              this.loading = false
-            })
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-    }
-  }
-}
+	import {
+		validUsername
+	} from '@/utils/validate'
+
+	export default {
+		name: 'Login',
+		data() {
+			const validateUsername = (rule, value, callback) => {
+				if (!validUsername(value)) {
+					callback(new Error('请输入正确的账号'))
+				} else {
+					callback()
+				}
+			}
+			const validatePassword = (rule, value, callback) => {
+				if (value.length < 6) {
+					callback(new Error('请输入正确的密码'))
+				} else {
+					callback()
+				}
+			}
+			return {
+				loginForm: {},
+				loginRules: {
+					username: [{
+						required: true,
+						trigger: 'blur',
+						validator: validateUsername
+					}],
+					password: [{
+						required: true,
+						trigger: 'blur',
+						validator: validatePassword
+					}]
+				},
+				loading: false,
+				passwordType: 'password',
+				redirect: undefined
+			}
+		},
+		watch: {
+			$route: {
+				handler: function(route) {
+					this.redirect = route.query && route.query.redirect
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			showPwd() {
+				if (this.passwordType === 'password') {
+					this.passwordType = ''
+				} else {
+					this.passwordType = 'password'
+				}
+				this.$nextTick(() => {
+					this.$refs.password.focus()
+				})
+			},
+			handleLogin() {
+				this.$refs.loginForm.validate(valid => {
+					if (valid) {
+						this.loginForm.companyName = '黑龙江中天昊元贸易有限公司'
+						this.loading = true
+						this.$store.dispatch('user/login', this.loginForm)
+							.then(response => {
+								localStorage.setItem('UserInfo', JSON.stringify(response.data))
+								this.$router.push({
+									path: this.redirect || '/'
+								})
+								this.loading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					} else {
+						console.log('error submit!!')
+						return false
+					}
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-/* 修复input 背景不协调 和光标变色 */
-/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
-
-$bg: #283443;
-$light_gray: #fff;
-$cursor: #fff;
-
-@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
-  .login-container .el-input input {
-    color: $cursor;
-  }
-}
-
-/* reset element-ui css */
-.login-container {
-  .el-input {
-    display: inline-block;
-    height: 47px;
-    width: 85%;
-
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 12px 5px 12px 15px;
-      color: $light_gray;
-      height: 47px;
-      caret-color: $cursor;
-
-      &:-webkit-autofill {
-        box-shadow: 0 0 0px 1000px $bg inset !important;
-        -webkit-text-fill-color: $cursor !important;
-      }
-    }
-  }
-
-  .el-form-item {
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: rgba(0, 0, 0, 0.1);
-    border-radius: 5px;
-    color: #454545;
-  }
-}
+	/* 修复input 背景不协调 和光标变色 */
+	/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
+
+	$bg: #283443;
+	$light_gray: #fff;
+	$cursor: #fff;
+
+	@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
+		.login-container .el-input input {
+			color: $cursor;
+		}
+	}
+
+	/* reset element-ui css */
+	.login-container {
+		.el-input {
+			display: inline-block;
+			height: 47px;
+			width: 85%;
+
+			input {
+				background: transparent;
+				border: 0px;
+				-webkit-appearance: none;
+				border-radius: 0px;
+				padding: 12px 5px 12px 15px;
+				color: $light_gray;
+				height: 47px;
+				caret-color: $cursor;
+
+				&:-webkit-autofill {
+					box-shadow: 0 0 0px 1000px $bg inset !important;
+					-webkit-text-fill-color: $cursor !important;
+				}
+			}
+		}
+
+		.el-form-item {
+			border: 1px solid rgba(255, 255, 255, 0.1);
+			background: rgba(0, 0, 0, 0.1);
+			border-radius: 5px;
+			color: #454545;
+		}
+	}
 </style>
 
 <style lang="scss" scoped>
-$bg: #2d3a4b;
-$dark_gray: #889aa4;
-$light_gray: #eee;
-
-.login-container {
-  min-height: 100%;
-  width: 100%;
-  background-color: $bg;
-  overflow: hidden;
-
-  .login-form {
-    position: relative;
-    width: 520px;
-    max-width: 100%;
-    padding: 160px 35px 0;
-    margin: 0 auto;
-    overflow: hidden;
-  }
-
-  .tips {
-    font-size: 14px;
-    color: #fff;
-    margin-bottom: 10px;
-
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-
-  .svg-container {
-    padding: 6px 5px 6px 15px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-
-  .title-container {
-    position: relative;
-
-    .title {
-      font-size: 26px;
-      color: $light_gray;
-      margin: 0px auto 40px auto;
-      text-align: center;
-      font-weight: bold;
-    }
-  }
-
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
-  }
-}
+	$bg: #2d3a4b;
+	$dark_gray: #889aa4;
+	$light_gray: #eee;
+
+	.login-container {
+		min-height: 100%;
+		width: 100%;
+		background-color: $bg;
+		overflow: hidden;
+
+		.login-form {
+			position: relative;
+			width: 520px;
+			max-width: 100%;
+			padding: 160px 35px 0;
+			margin: 0 auto;
+			overflow: hidden;
+		}
+
+		.tips {
+			font-size: 14px;
+			color: #fff;
+			margin-bottom: 10px;
+
+			span {
+				&:first-of-type {
+					margin-right: 16px;
+				}
+			}
+		}
+
+		.svg-container {
+			padding: 6px 5px 6px 15px;
+			color: $dark_gray;
+			vertical-align: middle;
+			width: 30px;
+			display: inline-block;
+		}
+
+		.title-container {
+			position: relative;
+
+			.title {
+				font-size: 26px;
+				color: $light_gray;
+				margin: 0px auto 40px auto;
+				text-align: center;
+				font-weight: bold;
+			}
+		}
+
+		.show-pwd {
+			position: absolute;
+			right: 10px;
+			top: 7px;
+			font-size: 16px;
+			color: $dark_gray;
+			cursor: pointer;
+			user-select: none;
+		}
+	}
 </style>

src/views/orderManagement/orderAudit.vue

@@ -5,11 +5,13 @@
 			<div class="top_css">
 				<el-row>
 					<el-col :span="14">
-						<el-button type="primary">添加</el-button>
+						<el-date-picker v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
+							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+						</el-date-picker>
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按司机姓名、账号、身份证号查找" v-model="searchkeyWord" clearable></el-input>
+							<el-input placeholder="可按订单编号、姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -42,44 +44,70 @@
 					</el-col>
 				</el-row>
 			</div>
-			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
+			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="60vh" border>
 				<el-table-column type="index" label="序号" width="50">
 					<template scope="scope">
 						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 						<span v-else>{{ scope.$index + 1 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="purpose" label="订单编号"></el-table-column>
-				<el-table-column prop="amountMoney" label="货主"></el-table-column>
-				<el-table-column prop="amountMoney" label="司机"></el-table-column>
-				<el-table-column prop="amountMoney" label="运费(元)" >
+				<el-table-column prop="orderNo" label="订单编号" min-width="150"></el-table-column>
+				<el-table-column prop="cargoOwner" label="货主"></el-table-column>
+				<el-table-column prop="driverName" label="司机"></el-table-column>
+				<el-table-column prop="freight" label="运费(元)">
+				</el-table-column>
+				<el-table-column prop="amountMoney" label="已付(元)"></el-table-column>
+				<el-table-column prop="amountMon" label="超期费(元)">
+					<template slot-scope="scope">
+						<span class="btn_css"
+							@click="costLook(scope.row)">{{scope.row.freightAdvance == 0 ? "" : 0}}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="amountMoney" label="应还(元)"></el-table-column>
+				<el-table-column prop="amountMoney" label="已还(元)">
+					<template slot-scope="scope">
+						<span>{{scope.row.freightAdvance == 0 ? "" : scope.row.alreadyRepaid}}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="invoicing" label="发票">
+					<template slot-scope="scope">
+						<span>{{scope.row.invoicing == 0 ? "未开":"已开"}}</span>
+					</template>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="已付(元)" ></el-table-column>
-				<el-table-column prop="amountMoney" label="超期费(元)" ></el-table-column>
-				<el-table-column prop="amountMoney" label="应还(元)" ></el-table-column>
-				<el-table-column prop="amountMoney" label="已还(元)" ></el-table-column>
-				<el-table-column prop="amountMoney" label="发票" ></el-table-column>
-				<!-- <el-table-column label="车辆">
-					<span  @click="carLook" class="btn_css">查看</span>
-				</el-table-column> -->
 				<el-table-column prop="payee" label="合同">
 					<span @click="account" class="btn_css">查看</span>
 				</el-table-column>
-				<el-table-column prop="amountMoney" label="更新时间" ></el-table-column>
-				<el-table-column prop="status" label="状态"></el-table-column>
+				<el-table-column prop="updateDate" label="更新时间" min-width="110"></el-table-column>
+				<el-table-column prop="orderStatus" label="状态" min-width="92"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="adopt(scope.row)">通过</span>
+						<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
+							:disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">确认
+						</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css" @click="reject(scope.row)">驳回</span>
+						<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
+							:disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">驳回
+						</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<span class="btn_css">消息</span>
+						<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false">查看</el-link>
 						<el-divider direction="vertical"></el-divider>
 						<el-dropdown>
 							<span class="btn_css">•••</span>
 							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>禁用</el-dropdown-item>
-								<el-dropdown-item>启用</el-dropdown-item>
+								<el-dropdown-item>
+									<el-link target="_blank" @click="end(scope.row)" type="primary" :underline="false"
+										:disabled="scope.row.cargoOwnerStatusKey > 18">终止</el-link>
+								</el-dropdown-item>
+								<el-dropdown-item>
+									<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
+										:disabled="scope.row.cargoOwnerStatusKey != 29">完结</el-link>
+								</el-dropdown-item>
+								<el-dropdown-item>
+									<el-link target="_blank" type="primary" :underline="false">预付</el-link>
+								</el-dropdown-item>
+								<el-dropdown-item>
+									<el-link target="_blank" type="primary" :underline="false">尾款</el-link>
+								</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
 
@@ -91,11 +119,31 @@
 			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
 			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 		</el-pagination>
-		<el-dialog title="车辆信息" :visible.sync="carInfo" width="500px" :before-close="carClose">
-			<div class="car_css" v-for="item in 5">
-				<img src="../../../public/img/yonghu.jpg" class="car_item" />
-				<div>
-					<span>辽H12345 通过</span>
+		<el-dialog title="超期费用" :visible.sync="costInfo" width="500px" :before-close="costClose">
+			<div class="cost_css">
+				<div class="cost_item">
+					<div class="cost_title">起计日期</div>
+					<div class="cost_value">2022-02-15</div>
+				</div>
+				<div class="cost_item">
+					<div class="cost_title">终止日期</div>
+					<div class="cost_value">2022-02-15</div>
+				</div>
+				<div class="cost_item">
+					<div class="cost_title">超期费率</div>
+					<div class="cost_value">{{costData.interestRate}}</div>
+				</div>
+				<el-divider></el-divider>
+				<div class="cost_item">
+					<div class="cost_title">已付运费</div>
+					<div class="cost_value">{{costData.interestRate}}</div>
+				</div>
+				<div class="cost_item">
+					<div class="cost_title">超期费用</div>
+					<div class="cost_value">{{costData.interestRate}}</div>
+				</div>
+				<div class="right_btn">
+					<el-button @click="costInfo = false" type="primary">关闭</el-button>
 				</div>
 			</div>
 		</el-dialog>
@@ -109,51 +157,101 @@
 				<img src="../../../public/img/yonghu.jpg" class="user_item" />
 			</div>
 		</el-dialog>
-		<el-dialog title="附件" :visible.sync="fujianInfo" width="500px" :before-close="fujianClose">
-		<!-- 	<div class="user" v-for="item in 2">
-				
-			</div> -->
-		</el-dialog>
-		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
-			<div>
-				<div><span class="sign">*</span>选择驳回原因</div>
-				<div class="form_css">
-					<el-form ref="form" :model="form" label-width="80px">
-						<el-checkbox-group v-model="form.checkList">
-							<el-checkbox label="证件照片不清晰"></el-checkbox>
-							<el-checkbox label="证件照片上传错误"></el-checkbox>
-							<el-checkbox label="身份信息填写错误"></el-checkbox>
-							<el-checkbox label="证件信息填写错误"></el-checkbox>
-							<el-checkbox label="其他"></el-checkbox>
-						</el-checkbox-group>
-						<div style="margin: 20px 0;">驳回原因描述（选填）</div>
-						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，5-50个字" maxlength="50" v-model="form.textarea"></el-input>
-					    <div class="form_btn">
-					    	<el-button @click="rejectClose">取消</el-button>
-						 <el-button @click="submit" type="primary">确定</el-button>
-					    </div>
-						 
-					</el-form>
+
+		<el-drawer title="任务详情" :visible.sync="rightSee" style="overflow-y: auto !important">
+			<div class="right_css">
+				<div class="title_name">基本信息</div>
+				<div class="right_item">订单编号：{{costData.orderNo}}</div>
+				<div class="right_title">货主</div>
+				<div class="right_item">{{costData.cargoOwner}}</div>
+				<div class="right_title">司机</div>
+				<div class="right_item">{{costData.driverName}}</div>
+				<div class="right_title">发货单位</div>
+				<div class="right_item">{{costData.compName}}</div>
+				<div class="right_title">发货地</div>
+				<div class="right_item">
+					{{costData.sendPrivate}}{{costData.sendCity}}{{costData.sendArea}}{{costData.sendDetailedAddress}}
+				</div>
+				<div class="right_title">卸货地</div>
+				<div class="right_item">
+					{{costData.unloadPrivate}}{{costData.unloadCity}}{{costData.unloadArea}}{{costData.unloadDetailedAddress}}
+				</div>
+				<div class="right_title">货名</div>
+				<div class="right_item">{{costData.goodsName}}</div>
+				<div class="right_title">距离</div>
+				<div class="right_item">约{{costData.distance ? costData.distance : 0}}km</div>
+				<div class="right_title">运费</div>
+				<div class="right_item">{{costData.freight}}</div>
+				<el-divider></el-divider>
+				<div v-if="costData.carrierInfo">
+					<div class="title_name">承运信息</div>
+					<div class="right_title">承运合同编号</div>
+					<div class="right_item">{{costData.carrierInfo.orderNo}}</div>
+					<div class="right_title">委托合同编号</div>
+					<div class="right_item">{{costData.carrierInfo.orderNo}}</div>
+					<div class="right_title">车牌号</div>
+					<div class="right_item">{{costData.carrierInfo.carNo}}</div>
+					<div class="right_title">预计运费</div>
+					<div class="right_item">{{costData.carrierInfo.estimatedFreight}}</div>
+					<div class="right_title">装车时间</div>
+					<div class="right_item">{{costData.carrierInfo.loadingDate}}</div>
+					<div class="right_title">装车照片</div>
+					<div style="display: flex;">
+						<div v-for="(item,index) in costData.carrierInfo.loadingImg.split(',')">
+							<img :src="item" class="img_css">
+						</div>
+					</div>
+				</div>
+				<el-divider></el-divider>
+				<div v-if="costData.freightInfo">
+					<div class="title_name">运费信息（单位：元）</div>
+					<div class="right_title">预付运费</div>
+					<div class="right_item">{{costData.freightInfo.prepaidFreight}} <span
+							style="margin-left: 100px;">{{costData.freightInfo.prepaidFreightDate}}</span></div>
+					<div class="right_title">运费尾款</div>
+					<div class="right_item">{{costData.freightInfo.freightBalance}} <span
+							style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
+					<div class="right_title">明细</div>
+					<div class="right_item">
+						预付{{costData.freightInfo.prepaidFreight ? costData.freightInfo.prepaidFreight : 0}}元，扣款{{costData.freightInfo.deduction ? costData.freightInfo.deduction : 0}}元，服务费{{costData.freightInfo.serviceCharge ? costData.freightInfo.serviceCharge:0}}元，尾款{{costData.freightInfo.freightBalance ? costData.freightInfo.freightBalance:0}}元，合计收款{{costData.freightInfo.totalRepayable ? costData.freightInfo.totalRepayable:0}}元。
+					</div>
+				</div>
+				<el-divider></el-divider>
+				<div v-if="costData.repaymentInfo">
+					<div class="title_name">还款信息</div>
+					<div class="right_title">运费</div>
+					<div class="right_item">{{costData.freight}}</div>
+					<div class="right_title">超期费（每天3%）</div>
+					<div class="right_item">{{costData.repaymentInfo.overdueFee}}</div>
+					<div class="right_title">合计应还</div>
+					<div class="right_item">{{costData.repaymentInfo.totalRepayable}}</div>
+					<div class="right_title">还款（尾号6666）</div>
+					<div class="right_item">{{costData.repaymentInfo.alreadyRepaid}}</div>
+				</div>
+				<div class="right_btn">
+					<el-button @click="submit(1)" v-if="costData.orderStatusKey == 9 && costData.orderStatusKey == 19">
+						确认</el-button>
+					<el-button @click="submit(2)" v-if="costData.orderStatusKey == 9 && costData.orderStatusKey == 19">
+						驳回</el-button>
+					<el-button @click="complete" v-if="costData.cargoOwnerStatusKey == 29">完结</el-button>
+					<el-button @click="rightSee = false">关闭</el-button>
 				</div>
 			</div>
-		</el-dialog>
+		</el-drawer>
 	</div>
 </template>
 <script>
+	import {
+		getListData,
+		getData,
+		auditData,
+		endData,
+		editEndData
+	} from '@/api/orderManagement'
 	export default {
 		data() {
 			return {
-				tableData: [{
-						reexType: "王某",
-						count: 5,
-						circleUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-					{
-						reexType: "",
-						count: 4.5,
-						circleUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-					},
-				],
+				tableData: [],
 				//分页
 				searchkeyWord: "",
 				currentPage: 1,
@@ -163,35 +261,119 @@
 				search: "",
 				addressUrl: [],
 				disabled: false,
-				carInfo: false,
+				costInfo: false,
 				userInfo: false,
-				fujianInfo:false,
-				rejectInfo:false,
-				form:{
-					checkList:[],
-					textarea:"",
+				rejectInfo: false,
+				startDate: "",
+				endDate: "",
+				form: {
+					checkList: [],
+					textarea: "",
 				},
+				value1: "",
+				costData: {},
+				rightSee: false
+
 			};
 		},
+		mounted() {
+			this.getList()
+		},
 		methods: {
-			getList() {},
+			getList() {
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				_obj.startDate = this.startDate
+				_obj.endDate = this.endDate
+				getListData(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			see(row) {
+				this.loading = true
+				getData({
+						id: row.id
+					}).then(response => {
+						this.costData = response.data
+						this.rightSee = true
+						// this.deptBudgetTotal = response.data.total
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			complete() {
+				this.$confirm('确定订单已完结？', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						this.listLoading = true
+						editEndData({
+								id: this.costData.id
+							}).then(response => {
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
+
+			},
+			end(row) {
+				this.$confirm('确定终止该订单？', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						this.listLoading = true
+						endData({
+								id: row.id,
+								terminator: '3'
+							}).then(response => {
+								this.$notify({
+									title: '成功',
+									message: '终止成功！',
+									type: 'success'
+								});
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
+			},
+			dateChange(e) {
+				this.startDate = e[0]
+				this.endDate = e[1]
+				this.getList()
+			},
 			account() {
 				this.userInfo = true;
 			},
-			fujianLook(){
-				this.fujianInfo = true
-			},
 			userClose() {
 				this.userInfo = false;
 			},
-			fujianClose(){
-				this.fujianInfo = false
+			costLook(row) {
+				this.costData = row
+				this.costInfo = true;
 			},
-			carLook() {
-				this.carInfo = true;
-			},
-			carClose() {
-				this.carInfo = false;
+			costClose() {
+				this.costInfo = false;
 			},
 			searchBtn(num) {
 				this.search = num;
@@ -200,26 +382,43 @@
 			find() {
 				this.getList();
 			},
-			adopt(row) {
-				this.$confirm('确定通过辽H12345的审核？', '提示', {
+			submit(num) {
+				var _data = {}
+				_data.id = this.costData.id
+				_data.examineFlag = num
+				if (this.costData.orderStatusKey == 9) {
+					_data.loadingFlag = 1
+				} else if (this.costData.orderStatusKey == 19) {
+					_data.loadingFlag = 2
+				}
+				this.$confirm('确定订单已完结？', '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning',
 					})
-					.then(() => {	
+					.then(() => {
+						this.listLoading = true
+						auditData(_data).then(response => {
+								this.$notify({
+									title: '成功',
+									message: '操作成功！',
+									type: 'success'
+								});
+								this.rightSee = false
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
 					})
 			},
-			submit(){
-				//驳回提交
-				this.form = {}
-				this.form.checkList=[]
-			},
 			reject(row) {
 				this.rejectInfo = true
 			},
 			rejectClose() {
 				this.form = {}
-				this.form.checkList=[]
+				this.form.checkList = []
 				this.rejectInfo = false
 			},
 			onChange() {
@@ -268,7 +467,7 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor:pointer
+					cursor: pointer
 				}
 
 				.searchNo {
@@ -331,16 +530,30 @@
 		}
 	}
 
-	.car_css {
-		width: 50%;
-		display: inline-block;
-		text-align: center;
-		margin-top: 20px;
-	}
+	.cost_css {
+		.cost_item {
+			width: 100%;
+			display: flex;
+			margin-bottom: 20px;
+
+			.cost_title {
+				width: 50%;
+				text-align: left;
+				color: #9D9D9D;
+			}
 
-	.car_item {
-		width: 100px;
-		height: 100px;
+			.cost_value {
+				width: 50%;
+				color: #0D0D0D;
+				text-align: right;
+			}
+
+		}
+
+		.right_btn {
+			text-align: right;
+			margin-top: 10px;
+		}
 	}
 
 	.user {
@@ -371,33 +584,81 @@
 	}
 
 	.btn_css {
-		color: #2f53eb;
-		cursor:pointer
+		color: #409EFF;
+		cursor: pointer
 	}
+
 	.sign {
 		font-size: 14px;
 		color: red;
 	}
+
 	.form_css {
 		width: 100%;
 		margin: 20px auto 20px;
-		::v-deep .el-checkbox{
+
+		::v-deep .el-checkbox {
 			width: 40%;
 			height: 30px;
 		}
+
 		// ::v-deep .el-dialog__body{
 		// 	padding: 10px 20px;
 		// }
-		::v-deep .el-dialog__title{
+		::v-deep .el-dialog__title {
 			font-size: 16px;
 		}
-		::v-deep .el-textarea__inner{
+
+		::v-deep .el-textarea__inner {
 			background: #F0F1F2;
 		}
-		.form_btn{
+
+		.form_btn {
 			text-align: right;
 			margin-top: 10px;
 		}
 	}
-</style>
 
+	.right_css {
+		// overflow-y: auto !important;
+		min-height: 1266px;
+		padding: 0 20px;
+
+		.right_title {
+			color: #9D9D9D;
+			font-size: 14px;
+			margin-bottom: 4px;
+		}
+
+		.title_name {
+			margin-bottom: 10px;
+		}
+
+		.right_item {
+			color: #0D0D0D;
+			font-size: 14px;
+			margin-bottom: 10px;
+		}
+
+		.right_btn {
+			text-align: right;
+			margin: 10px 0;
+		}
+
+		.img_css {
+			width: 100px;
+			height: 80px;
+			margin-right: 5px;
+		}
+
+		.right_img {
+			width: 200px;
+			height: 120px;
+			margin-top: 10px;
+		}
+	}
+
+	::v-deep .el-drawer {
+		overflow: auto;
+	}
+</style>

src/views/platformManagement/regulationsModel.vue

@@ -1,27 +0,0 @@
-// 用户反馈
-<template>
-  <div class="center">
-    <div>用户反馈</div>
-    <el-button @click="number">{{ num }}</el-button>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      num: 1111,
-    };
-  },
-  methods: {
-    number() {
-      this.num = '用户反馈';
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.center {
-  padding: 10px;
-  background: #e8ecf6;
-}
-</style>

src/views/platformManagement/specifiedRecords.vue

@@ -0,0 +1,558 @@
+// 规定记录审核
+<template>
+	<div class="center">
+		<div class="center_css">
+			<div class="top_css">
+				<el-row>
+					<el-col :span="14">
+						<el-button type="primary" @click="AddRecord" :disabled="disabled">新增</el-button>
+					</el-col>
+					<el-col :span="10">
+						<div class="screen">
+							<el-input placeholder="可按版本号、编写单位、编撰人员查找" v-model="searchkeyWord" clearable></el-input>
+							<el-button class="search" @click="find"><img width="16" height="16"
+									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
+								class="count_css">共{{ deptBudgetTotal }}条</span>
+						</div>
+					</el-col>
+				</el-row>
+			</div>
+			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
+				<el-table-column prop="versionNumber" label="版本号"></el-table-column>
+				<el-table-column prop="compilationUnit" label="编写单位"></el-table-column>
+				<el-table-column prop="editor" label="编撰人员"></el-table-column>
+				<el-table-column prop="updateDate" label="更新日期"></el-table-column>
+				<el-table-column label="上传" prop="submitter"></el-table-column>
+				<el-table-column prop="versionDescription" label="版本说明">
+				</el-table-column>
+				<el-table-column prop="status" label="状态"></el-table-column>
+				<el-table-column label="操作" min-width="300">
+					<template slot-scope="scope">
+						<el-link target="_blank" @click="look(scope.row)" type="primary" :underline="false">查看</el-link>
+						<el-divider direction="vertical"></el-divider>
+						<el-link target="_blank" @click="audit(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '待审核'">审核
+						</el-link>
+						<el-divider direction="vertical"></el-divider>
+						<el-link target="_blank" @click="del(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '待审核' && scope.row.status != '已驳回' ">删除</el-link>
+						<el-divider direction="vertical"></el-divider>
+						<el-link target="_blank" @click="edit(scope.row)" type="primary" :underline="false">编辑</el-link>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
+			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+		</el-pagination>
+		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+			<div>
+				<div><span class="sign">*</span>选择驳回原因</div>
+				<div class="form_css">
+					<el-form ref="form" :model="form" label-width="80px">
+						<el-checkbox-group v-model="form.checkList">
+							<el-checkbox label="证件照片不清晰" value="1"></el-checkbox>
+							<el-checkbox label="证件照片上传错误" value="2"></el-checkbox>
+							<el-checkbox label="身份信息填写错误" value="3"></el-checkbox>
+							<el-checkbox label="证件信息填写错误" value="4"></el-checkbox>
+							<el-checkbox label="其他" value="5"></el-checkbox>
+						</el-checkbox-group>
+						<div style="margin: 20px 0;">驳回原因描述（选填）</div>
+						<el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，1-100个字"
+							v-model="form.rejectReasonDescription" minlength="100"></el-input>
+						<div class="form_btn">
+							<el-button @click="rejectClose">取消</el-button>
+							<el-button @click="submit" type="primary">确定</el-button>
+						</div>
+					</el-form>
+				</div>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import {
+		getList,
+		toExamine,
+		postNews,
+		delFormData
+	} from '@/api/platformManagement'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				//分页
+				searchkeyWord: "",
+				currentPage: 1,
+				pageSize: 10,
+				deptBudgetTotal: 0,
+				deptCircularPage: {},
+				search: "",
+				addressUrl: [],
+				disabled: false,
+				rejectInfo: false,
+				form: {
+					id: "",
+					checkList: [],
+					rejectReasonDescription: "",
+				},
+			  disabled:false,
+			};
+		},
+		mounted() {
+			this.getList()
+		},
+		methods: {
+			AddRecord() {
+				this.$router.push({
+					path: 'specifiedRecordsAdd'
+				})
+			},
+			getList() {
+				this.loading = true
+				let _obj = {}
+				_obj.currentPage = this.currentPage
+				_obj.pageSize = this.pageSize
+				_obj.searchKeyWord = this.searchkeyWord
+				_obj.searchType = this.search
+				getList(_obj).then(response => {
+						this.tableData = response.data.records
+						this.deptBudgetTotal = response.data.total
+						if(this.tableData[0].status == "待审核" || this.tableData[0].status == "已驳回"){
+							// 最上面一条处于待审核和已驳回时新增按钮置灰不可用
+							this.disabled = true
+						}
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			del(row) {
+				this.$confirm("确定要删除该记录吗？", '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						this.listLoading = true
+						var _del = {}
+						_del.id = row.id
+						delFormData(_del).then(response => {
+								this.$notify({
+									title: '成功',
+									message: '删除成功！',
+									type: 'success'
+								});
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
+
+
+			},
+			sendInfoClose() {
+				this.Info = {}
+				this.sendInfo = false
+			},
+			submitInfo() {
+				this.listLoading = true
+				postNews(this.Info).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '发送成功！',
+							type: 'success'
+						});
+						this.sendInfoClose()
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			switchChange(row, num) {
+				var _examine = {}
+				_examine.id = row.id
+				let title
+				if (num == 1) {
+					_examine.flag = 3
+					title = "禁用后客户将无法使用所有功能，是否确定禁用？"
+				} else if (num == 2) {
+					title = "确定重新启用该用户？"
+					_examine.flag = 4
+				}
+				this.$confirm(title, '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						this.listLoading = true
+						toExamine(_examine).then(response => {
+								if (num == 1) {
+									this.$notify({
+										title: '成功',
+										message: '禁用成功！',
+										type: 'success'
+									});
+								} else if (num == 2) {
+									this.$notify({
+										title: '成功',
+										message: '启用成功！',
+										type: 'success'
+									});
+								}
+								this.getList()
+								this.listLoading = false
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
+			},
+			find() {
+				this.getList();
+			},
+			look(row) {
+				this.$router.push({
+					path: 'specifiedRecordsLook',
+					query: {
+						id: row.id,
+						type: "1"
+					}
+				})
+			},
+			edit(row) {
+				this.$router.push({
+					path: 'specifiedRecordsLook',
+					query: {
+						id: row.id,
+						type: "2"
+					}
+				})
+			},
+			submit() {
+				if (this.form.checkList.length == 0) {
+					this.$message.error("请选择驳回原因")
+					return
+				}
+				this.listLoading = true
+				this.form.rejectReason = this.form.checkList.toString()
+				delete this.form.checkList
+				toExamine(this.form).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '驳回成功！',
+							type: 'success'
+						});
+						this.form.checkList = []
+						this.form.rejectReasonDescription = ""
+						this.rejectInfo = false
+						this.getList()
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			audit(row) {
+				this.$router.push({
+					path: 'specifiedRecordsLook',
+					query: {
+						id: row.id,
+						type: "3"
+					}
+				})
+			},
+			rejectClose() {
+				this.form.checkList = []
+				this.form.rejectReasonDescription = ""
+				this.rejectInfo = false
+			},
+			handleSizeChange(val) {
+				console.log(`每页 ${val} 条`);
+				this.pageSize = val;
+				this.getList();
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				console.log(`当前页: ${val}`);
+				this.getList();
+			},
+		},
+	};
+</script>
+<style lang="scss" scoped>
+	.center {
+		padding: 10px 20px;
+		background: #f5f6f7;
+		height: calc(100vh - 5vh);
+
+
+		.top_css {
+			padding: 10px;
+
+			.search_btn {
+				display: flex;
+				margin-top: 20px;
+
+				.search_item {
+					text-align: center;
+					font-size: 14px;
+					font-weight: 600;
+					line-height: 40px;
+					width: 112px;
+					height: 40px;
+					background: #f7f8f9;
+					cursor: pointer
+				}
+
+				.searchNo {
+					color: #323233;
+				}
+
+				.search {
+					color: #2f53eb;
+					background: #ffffff;
+				}
+			}
+		}
+
+		.ask_css {
+			position: absolute;
+			margin: 3px 0 0 10px;
+		}
+
+		.center_css {
+			background: #ffffff;
+			border-radius: 1px;
+			margin-top: 10px;
+			padding-bottom: 10px;
+		}
+
+		.screen {
+			display: flex;
+
+			.search {
+				width: 40px;
+				height: 40px;
+				background: #f7f8fa;
+				border-radius: 0px 2px 2px 0px;
+				border: 1px solid #f0f1f2;
+			}
+
+			.count_css {
+				width: 80px;
+				text-align: center;
+				line-height: 40px;
+				color: #666666;
+			}
+		}
+
+		.el-button {
+			padding: 10px 20px !important;
+		}
+
+		.center_css {
+
+			::v-deep .el-table th,
+			::v-deep .el-table td {
+				text-align: center;
+			}
+
+			.fujian {
+				font-size: 24px;
+				color: #409eff;
+			}
+
+			.warning {
+				font-size: 14px;
+				color: #ed1d1d;
+			}
+		}
+	}
+
+	.car_css {
+		width: 50%;
+		display: inline-block;
+		text-align: center;
+		margin-top: 30px;
+		position: relative;
+
+		.status_css {
+			background: #3AC602;
+			width: 50px;
+			height: 17px;
+			position: absolute;
+			top: 0px;
+			right: 15px;
+			border-radius: 3px;
+		}
+
+		.carno_css {
+			padding: 1px 5px;
+			background-color: #F5F6F7;
+			color: #666666;
+			border-radius: 12px;
+			text-align: center;
+			width: 100px;
+			margin: 10px auto 0;
+		}
+
+		.carborder_css {
+			border: 1px solid #F0F1F2;
+			margin: 15px auto 0;
+			width: 90%;
+		}
+	}
+
+	.tips {
+		color: #999999;
+		font-size: 14px;
+	}
+
+	.car_item {
+		width: 200px;
+		height: 160px;
+		border-radius: 5px;
+	}
+
+	.user {
+		margin-bottom: 20px;
+
+		.id_css {
+			font-size: 14px;
+		}
+
+		.id_css,
+		.name_css {
+			margin: 5px 0;
+			color: #0D0D0D;
+		}
+
+		.pay_name {
+			color: #9D9D9D;
+			font-size: 14px;
+		}
+
+		.name_css {
+			font-size: 16px;
+		}
+
+		.user_item {
+			margin: 25px 0;
+			width: 450px;
+			height: 300px;
+		}
+
+		.border_css {
+			width: 100%;
+			border: 1px solid #F0F1F2;
+		}
+	}
+
+	::v-deep .el-table--border .el-table__header th {
+		background: #f7f8f9;
+	}
+
+	.btn_css {
+		color: #409EFF;
+		cursor: pointer
+	}
+
+	.btn_css1 {
+		margin-left: -20px;
+	}
+
+	.sign {
+		font-size: 14px;
+		color: red;
+	}
+
+	.form_css {
+		width: 100%;
+		margin: 20px auto 20px;
+
+		::v-deep .el-checkbox {
+			width: 40%;
+			height: 30px;
+		}
+
+		// ::v-deep .el-dialog__body{
+		// 	padding: 10px 20px;
+		// }
+		::v-deep .el-dialog__title {
+			font-size: 16px;
+		}
+
+		::v-deep .el-textarea__inner {
+			background: #F0F1F2;
+		}
+
+		.form_btn {
+			text-align: right;
+			margin-top: 10px;
+		}
+	}
+
+	//发送信息
+	.Info_css {
+		.Info_title {
+			color: #323233;
+			font-size: 16px;
+		}
+
+		.Info_item {
+			margin: 20px 0;
+		}
+
+		.Info_btn {
+			text-align: right;
+			margin-top: 10px;
+		}
+	}
+
+	//附件
+	.file {
+		.fujian_css {
+			width: 631px;
+			display: flex;
+			margin: 0 auto;
+			text-align: center;
+			line-height: 32px;
+			border: 1px solid #F0F1F2;
+			border-right: 0px;
+			border-radius: 2px 0px 0px 2px;
+
+			.fujian_item {
+				cursor: pointer;
+				width: 90px;
+				height: 32px;
+				border-right: 1px solid #F0F1F2;
+			}
+
+			.file_btn {
+				color: #2F53EB;
+				background-color: #CFDBFE;
+			}
+		}
+
+		.file_img {
+			width: 525px;
+			height: 332px;
+			margin: 20px auto;
+		}
+
+		.img_css {
+			width: 525px;
+			height: 332px;
+		}
+
+		.btn {
+			width: 400px;
+			margin: 0 auto;
+		}
+	}
+</style>

src/views/platformManagement/specifiedRecordsAdd.vue

@@ -0,0 +1,134 @@
+<template>
+	<div class="center">
+		<div class="main_css">
+			<div class="formData">
+				<el-form ref="form" :model="form" label-width="80px">
+					<el-form-item label="编写单位">
+						<el-input v-model="form.compilationUnit" clearable placeholder="请输入编写单位"></el-input>
+					</el-form-item>
+					<el-form-item label="编撰人员">
+						<el-input v-model="form.editor" clearable placeholder="请输入编撰人员"></el-input>
+					</el-form-item>
+					<el-form-item label="版本号">
+						<el-input v-model="form.versionNumber" clearable placeholder="请输入版本号"></el-input>
+					</el-form-item>
+					<el-form-item label="提交人">
+						<el-input v-model="form.submitter" clearable placeholder="自动获取,不可编辑" disabled></el-input>
+					</el-form-item>
+					<el-form-item label="版本说明">
+						<el-input v-model="form.versionDescription" clearable placeholder="请输入版本说明" maxlength="100">
+						</el-input>
+					</el-form-item>
+					<div class="title_css">* 版本号已默认上一次加1</div>
+				</el-form>
+			</div>
+			<div class="btn">
+				<el-button @click="submit">提交</el-button>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		addFormData
+	} from '@/api/platformManagement'
+	export default {
+		data() {
+			return {
+				form: {},
+				regulations: {},
+				version:[],
+				count:""
+			}
+		},
+		created() {
+			this.form.submitter = JSON.parse(localStorage.getItem('UserInfo')).deptName
+			this.regulations = JSON.parse(localStorage.getItem("regulations"))
+			if (this.regulations) {
+				this.$set(this.form, "compilationUnit", this.regulations.compilationUnit)
+				this.$set(this.form, "editor", this.regulations.editor)
+				// 默认当前生效规定版本版本号尾号 + 1
+				this.version = this.regulations.versionNumber.split(".")
+				this.count = Number(this.version[this.version.length- 1]) + 1
+				this.$set(this.form, "versionNumber",this.regulations.versionNumber.substr(0,this.version.length+1) + this.count)
+			}
+		},
+		methods: {
+			submit() {
+				if (this.form.compilationUnit && (this.form.compilationUnit.length < 0 || this.form.compilationUnit.length > 25)) {
+					this.$message.error("编写单位字数应在 0 - 25 之间")
+					return
+				}
+				if (this.form.editor && (this.form.editor.length < 0 || this.form.editor.length > 10)) {
+					this.$message.error("编撰人员字数应在 0 - 10 之间")
+					return
+				}
+				if(!this.form.versionNumber){
+					this.$message.error("请输入版本号")
+					return
+				}
+				if(this.form.versionNumber.indexOf(".") == -1){
+					this.$message.error("版本号格式不正确，如 1.**")
+					return
+				}
+				if (this.form.versionDescription && (this.form.versionDescription.length < 0 || this.form.versionDescription.length > 100)) {
+					this.$message.error("版本说明字数应在 0 - 100 之间")
+					return
+				}
+				this.listLoading = true
+				addFormData(this.form).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '添加成功！',
+							type: 'success'
+						});
+						var _obj = {}
+						_obj.compilationUnit = this.form.compilationUnit
+						_obj.editor = this.form.editor
+						_obj.versionNumber = this.form.versionNumber
+						localStorage.setItem("regulations", JSON.stringify(_obj))
+						this.listLoading = false
+						this.$router.go(-1)
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		background: #F5F6F7;
+		height: calc(100vh - 4.5vh);
+		padding-top: 20px;
+
+	}
+
+	.main_css {
+		width: 96%;
+		height: 90vh;
+		background: #FFFFFF;
+		margin: 20px auto;
+		padding-top: 20px;
+	}
+
+	.formData {
+		width: 50%;
+		margin: 20px 0 0 140px;
+	}
+
+	.btn {
+		text-align: right;
+		position: absolute;
+		right: 200px;
+		bottom: 100px;
+	}
+	.title_css{
+		font-size: 12px;
+		margin: 10px 0;
+		color: red;
+	}
+</style>

src/views/platformManagement/specifiedRecordsLook.vue

@@ -0,0 +1,174 @@
+<template>
+	<div class="center">
+		<div class="main_css">
+			<div class="formData">
+				<el-form ref="form" :model="form" label-width="80px">
+					<el-form-item label="编写单位">
+						<el-input v-model="form.compilationUnit" clearable placeholder="暂无" :disabled="type == 1"></el-input>
+					</el-form-item>
+					<el-form-item label="编撰人员">
+						<el-input v-model="form.editor" clearable placeholder="暂无" :disabled="type == 1"></el-input>
+					</el-form-item>
+					<el-form-item label="版本号">
+						<el-input v-model="form.versionNumber" clearable placeholder="暂无" :disabled="type == 1"></el-input>
+					</el-form-item>
+					<el-form-item label="提交人">
+						<el-input v-model="form.submitter" clearable placeholder="暂无" disabled></el-input>
+					</el-form-item>
+					<el-form-item label="版本说明">
+						<el-input v-model="form.versionDescription" clearable placeholder="暂无" :disabled="type == 1"></el-input>
+					</el-form-item>
+				</el-form>
+			</div>
+			<div class="btn">
+				<el-button @click="submit(1)" v-if="type == 3">通过</el-button>
+				<el-button @click="submit(2)" v-if="type == 3">驳回</el-button>
+				<el-button @click="revert">关闭</el-button>
+				<el-button @click="edit" v-if="type == 2">修改</el-button>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		seeData,
+		editFormData,
+		auditFormData
+	} from '@/api/platformManagement'
+	export default {
+		data() {
+			return {
+				form: {},
+				id:"",
+				type:"",
+			}
+		},
+		mounted() {
+			this.id = this.$route.query.id
+			this.type = this.$route.query.type
+			this.getList()
+		},
+		methods: {
+			getList(){
+				this.listLoading = true
+				var _obj = {}
+				_obj.id = this.id
+				seeData(_obj).then(response => {
+						this.form = response.data
+						this.listLoading = false
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			},
+			revert(){
+				this.$router.go(-1)
+			},
+			submit(num){
+				var _audit = {}
+				_audit.id = this.form.id
+				let title_name = ""
+				if(num == 1){
+					_audit.flag = 1
+					title_name = "通过"
+				}else if(num == 2){
+					_audit.flag = 2
+					title_name = "驳回"
+				}
+				this.$confirm("确定要" + title_name + "该记录吗？", '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						auditFormData( _audit).then(response => {
+								this.$notify({
+									title: '成功',
+									message: title_name+'成功！',
+									type: 'success'
+								});
+								this.listLoading = false
+								this.$router.go(-1)
+							})
+							.catch(() => {
+								this.loading = false
+							})
+					})
+				
+			},
+			edit() {
+				if (this.form.compilationUnit && (this.form.compilationUnit.length < 0 || this.form.compilationUnit.length > 25)) {
+					this.$message.error("编写单位字数应在 0 - 25 之间")
+					return
+				}
+				if (this.form.editor && (this.form.editor.length < 0 || this.form.editor.length > 10)) {
+					this.$message.error("编撰人员字数应在 0 - 10 之间")
+					return
+				}
+				if(!this.form.versionNumber){
+					this.$message.error("请输入版本号")
+					return
+				}
+				if (this.form.versionDescription && (this.form.versionDescription.length < 0 || this.form.versionDescription.length > 100)) {
+					this.$message.error("版本说明字数应在 0 - 100 之间")
+					return
+				}
+				var parameter = {}
+				parameter.id = this.id
+				parameter.compilationUnit = this.form.compilationUnit
+				parameter.editor = this.form.editor
+				parameter.versionNumber = this.form.versionNumber
+				parameter.submitter = this.form.submitter
+				parameter.versionDescription = this.form.versionDescription
+				parameter.content = this.form.content
+				this.listLoading = true
+				editFormData(parameter).then(response => {
+						this.$notify({
+							title: '成功',
+							message: '修改成功！',
+							type: 'success'
+						});
+						var _obj = {}
+						_obj.compilationUnit = this.form.compilationUnit
+						_obj.editor = this.form.editor
+						_obj.versionNumber = this.form.versionNumber
+						localStorage.setItem("regulations", JSON.stringify(_obj))
+						this.listLoading = false
+						this.$router.go(-1)
+					})
+					.catch(() => {
+						this.loading = false
+					})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		background: #F5F6F7;
+		height: calc(100vh - 4.5vh);
+		padding-top: 20px;
+
+	}
+
+	.main_css {
+		width: 96%;
+		height: 90vh;
+		background: #FFFFFF;
+		margin: 20px auto;
+		padding-top: 20px;
+	}
+
+	.formData {
+		width: 50%;
+		margin: 20px 0 0 140px;
+	}
+	.btn{
+		text-align: right;
+		position: absolute;
+		right: 200px;
+		bottom:100px;
+	}
+</style>

vue.config.js

@@ -55,7 +55,7 @@ module.exports = {
     },
     proxy: {
       '/pb': {
-        target: 'http://192.168.0.107:8091/',
+        target: 'http://192.168.1.114:8091/',
         changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite: { '^/pb': '/' }, //这里重写路径
         secure: false,