7.22的代码

src/views/contracts/billDetail.vue

@@ -29,7 +29,7 @@
 		  type="textarea"
 		  placeholder="请输入审核反馈内容"
 		  style="width: 200px;"
-		  v-model="feedback"
+		  v-model="feed.feedback"
 		  v-if="checked==0">
 		</el-input>
 		<el-row v-if="checked==0">
@@ -45,17 +45,17 @@
 						<i class="el-icon-plus"></i>
 					</el-upload>
 					<el-dialog :visible.sync="dialogVisible">
-						<img width="100%" :src="feedbackPicList" alt="">
+						<img width="100%" :src="feed.feedbackPicList" alt="">
 					</el-dialog>
 				</div>
 			</el-col>
 		</el-row>
 		<div class="btn">
-			<el-button type="success" v-if="checked==0">审核成功</el-button>
-			<el-button type="danger" v-if="checked==0">审核失败</el-button>
+			<el-button type="success" v-if="checked==0" @click="success">审核成功</el-button>
+			<el-button type="danger" v-if="checked==0" @click="failed">审核失败</el-button>
 		</div>
 	</div>
-	
+	 
 
 </template>
 
@@ -63,14 +63,22 @@
 	export default{
 		data(){
 			return{
-				feedback:'',
-				feedbackPicList:[],
 				list:[],
 				checked:'',
+				feed:{
+					feedback:'',
+					feedbackPicList:[
+						"https:\/\/easygolf.oss-ap-southeast-6.aliyuncs.com\/golf\/2022-03\/18\/88df7532ff7de229b617.jpg",
+					],
+					id:'',
+					approveStatus:'',
+				}
+				
 			}
 		},
 		mounted() {
 			this.checked = this.$store.state.user.checked
+			this.feed.id=this.$route.query.id
 			let id=this.$route.query.id
 			this.$request({
 				url:'/api/Contract/contractDraft/'+id,
@@ -79,6 +87,49 @@
 				this.list.push(res.data)
 				console.log(this.list)
 			})
+		},
+		methods:{
+			success(){
+				this.feed.approveStatus=1
+				this.$request({
+					url:'api/Contract/approveContractDraft',
+					method:'post',
+					data:this.feed
+				}).then((res)=>{
+					if(res.code==200){
+						this.$message({
+							type:'success',
+							message:'提交成功'
+						})
+					}else{
+						this.$message({
+							type:'success',
+							message:'提交失败'
+						})
+					}
+				})
+			},
+			failed(){
+				this.feed.approveStatus=2
+				this.$request({
+					url:'api/Contract/approveContractDraft',
+					method:'post',
+					data:this.feed
+				}).then((res)=>{
+					if(res.code==200){
+						this.$message({
+							type:'success',
+							message:'提交成功'
+						})
+					}else{
+						this.$message({
+							type:'success',
+							message:'提交失败'
+						})
+					}
+				})
+			}
+			
 		}
 	}
 </script>

src/views/contracts/detail.vue

@@ -75,10 +75,10 @@
 					</div>
 					<div class="yusa">
 						<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="10" class="jas">
-							<el-form ref="form" :model="form" label-width="0px">
+							<el-form ref="form" :model="feed" label-width="0px">
 								<span class="sah">审核反馈：</span>
 								<el-form-item label="">
-									<el-input type="textarea" v-model="form.desc"></el-input>
+									<el-input type="textarea" v-model="feed.feedback"></el-input>
 								</el-form-item>
 
 							</el-form>
@@ -109,8 +109,9 @@
 				<el-button type="primary" style="float: right;margin-right: 10px; " @click="addNewBill"
 					v-if="checked==1">新增</el-button>
 				<el-button type="primary" style="float: right; " @click="Exports">导出</el-button>
-				<el-button type="warning" style="float: right; " v-if="checked==0">审核失败</el-button>
-				<el-button type="success" style="float: right; " v-if="checked==0">审核成功</el-button>
+				<el-button type="primary" style="float: right; " v-if="checked==0" >恢复</el-button>
+				<el-button type="warning" style="float: right; " v-if="checked==0" @click="failed">审核失败</el-button>
+				<el-button type="success" style="float: right; " v-if="checked==0" @click="success">审核成功</el-button>
 			</div>
 		</el-card>
 		<el-card class="box-card">
@@ -192,7 +193,13 @@
 				checked: '',
 				form: '',
 				url: [],
-				picList: []
+				picList: [],
+				feed:{
+					id:'',
+					feedback:'',
+					feedbackPicList:[],
+					approveStatus:''
+				}
 			}
 		},
 		created() {},
@@ -207,15 +214,11 @@
 				this.url = this.contract.invoicePicList
 				this.picList = this.contract.picList
 				this.list = res.data.contractDraft.result
+				this.feed.feedbackPicList=this.picList
+				this.feed.id=this.$route.query.id
 				this.getPageData()
-				// console.log(this.list)
 			})
-			// this.$request({
-			// 	url: '/api/Contract/contractDraft/' + id,
-			// 	method: 'get'
-			// }).then((res) => {
-			// 	this.list.push(res.data)
-			// })
+			
 		},
 		methods: {
 			addNewBill() {
@@ -270,6 +273,48 @@
 				})
 				dataConversionUtil.dataToExcel('出票人列表', tableHeader, dataList)
 				this.$message.success('导出成功!');
+			},
+			success(){
+				// this.feed.feedbackPicList=this.picList
+				// this.feed.id=this.$route.query.id
+				this.feed.approveStatus=1
+				this.$request({
+					url:'/api/Contract/approveContract',
+					method:'post',
+					data:this.feed,
+				}).then((res)=>{
+					if(res.code==200){
+						this.$message({
+							type:'success',
+							message:res.msg
+						})
+					}else{
+						this.$message({
+							type:'danger',
+							message:'提交失败'
+						})
+					}
+				})
+			},
+			failed(){
+				this.feed.approveStatus=2
+				this.$request({
+					url:'/api/Contract/approveContract',
+					method:'post',
+					data:this.feed,
+				}).then((res)=>{
+					if(res.code==200){
+						this.$message({
+							type:'success',
+							message:res.msg
+						})
+					}else{
+						this.$message({
+							type:'danger',
+							message:'提交失败'
+						})
+					}
+				})
 			}
 		}
 	}

src/views/contracts/index.vue

@@ -64,16 +64,7 @@
 				</div>
 			</div>
 		</el-row>
-		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
-			<div class="grid-content bg-purple" style="display: flex; justify-content: flex-end">
-				<el-button type="primary" @click="addNewContract" v-if="checked == 1">上传合同</el-button>
-				<el-button type="primary" v-if="checked == 0">审核失败</el-button>
-				<el-button type="primary" v-if="checked == 0">审核成功</el-button>
-				<el-button type="primary" @click="Exports">批量导出</el-button>
-				<el-button type="success">恢复</el-button>
-				<el-button type="danger">删除</el-button>
-			</div>
-		</el-row>
+		
 		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
 			highlight-current-row @select="handleSelectionChange"  @select-all="handleAll">
 			<el-table-column align="center" label="" width="55" type="selection">
@@ -107,18 +98,31 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		<div class="pagesip">
-			<el-button type="primary" size="small"
-				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpFirstPage">首页
-			</el-button>
-			<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
-				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
-				ref="pagination">
-			</el-pagination>
-			<el-button type="primary" size="small"
-				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
-			</el-button>
+		<div style="display: flex;justify-content: space-between;">
+			<el-row type="flex" justify="space-between" >
+				<div class="btn" style="display: flex; justify-content: flex-end">
+					<el-button type="primary" @click="addNewContract" v-if="checked == 1">上传合同</el-button>
+					<el-button type="primary" v-if="checked == 0">审核失败</el-button>
+					<el-button type="primary" v-if="checked == 0">审核成功</el-button>
+					<el-button type="primary" @click="Exports">批量导出</el-button>
+					<el-button type="success">恢复</el-button>
+					<el-button type="danger">删除</el-button>
+				</div>
+			</el-row>
+			<div class="pagesip">
+				<el-button type="primary" size="small"
+					style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpFirstPage">首页
+				</el-button>
+				<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
+					:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+					ref="pagination">
+				</el-pagination>
+				<el-button type="primary" size="small"
+					style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
+				</el-button>
+			</div>
 		</div>
+		
 	</div>
 </template>
 
@@ -354,4 +358,7 @@
 	.el-col {
 		margin-bottom: 20px;
 	}
+	.btn{
+		padding: 20px;
+	}
 </style>

src/views/contracts/new_file.vue

@@ -148,7 +148,6 @@
 				</el-form-item>
 				<el-form-item label="承兑人" >
 					  <el-select v-model="form.acceptorName" placeholder="请选择承兑人" >
-						  <el-option label='新增承兑人' @click.native="addAcceptor" value="" style="color: darkorange;"></el-option>
 					      <el-option v-for="val in acceptorName" :label="val" :value="val" @click.native="getRate"></el-option>
 					    </el-select>
 				</el-form-item>
@@ -158,7 +157,7 @@
 						style="width: 220px;" />
 				</el-form-item>
 				<el-form-item label="利率">
-					<el-input v-model="item.serviceMoney" class="ipwidth" placeholder="利率"
+					<el-input v-model="item.interestRate" class="ipwidth" placeholder="利率"
 						style="width: 220px;" />
 				</el-form-item>
 				
@@ -387,11 +386,7 @@
 					path: "/form/addTicketdrawer",
 				});
 			},
-			addAcceptor(){
-				this.$router.push({
-					path: '/table/addAcceptor'
-				})
-			}
+			
 		},
 	}
 </script>

src/views/delivery/index.vue

@@ -51,15 +51,7 @@
 					</div>
 				</div>	
 		</el-row>
-		<el-row  type="flex" justify="end" style="margin-bottom:20px">
-			<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
-					<el-button type="primary" @click="failed">审核失败</el-button>
-					<el-button type="primary" @click="success">审核成功</el-button>
-					<el-button type="primary" @click="Exports">导出</el-button>
-					<el-button type="success">恢复</el-button>
-					<el-button type="danger">禁用</el-button>
-				</div>
-		</el-row>
+		
 		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
 			highlight-current-row  @selection-change="handleSelectionChange" @select-all="handleAll">
 			<el-table-column   type="selection">
@@ -96,18 +88,30 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		<div class="pagesip">
-			<el-button type="primary" size="small"
-				style="background-color:#D8AB5A ;border-color:#D8AB5A ; margin: 0 20px;" @click="jumpFirstPage">首页
-			</el-button>
-			<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
-				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
-				ref="pagination">
-			</el-pagination>
-			<el-button type="primary" size="small"
-				style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页
-			</el-button>
+		<div style="display: flex;justify-content: space-between;">
+			<el-row  type="flex" justify="end" >
+				<div class="btn" style="display: flex;justify-content: flex-end;">
+						<el-button type="primary" @click="failed">审核失败</el-button>
+						<el-button type="primary" @click="success">审核成功</el-button>
+						<el-button type="primary" @click="Exports">导出</el-button>
+						<el-button type="success">恢复</el-button>
+						<el-button type="danger">禁用</el-button>
+					</div>
+			</el-row>
+			<div class="pagesip">
+				<el-button type="primary" size="small"
+					style="background-color:#D8AB5A ;border-color:#D8AB5A ; margin: 0 20px;" @click="jumpFirstPage">首页
+				</el-button>
+				<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
+					:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+					ref="pagination">
+				</el-pagination>
+				<el-button type="primary" size="small"
+					style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页
+				</el-button>
+			</div>
 		</div>
+		
 	</div>
 </template>
 
@@ -310,4 +314,7 @@
 	.el-col {
 		margin-bottom: 20px;
 	}
+	.btn{
+		padding: 20px;
+	}
 </style>

src/views/form/detail.vue

@@ -10,6 +10,11 @@
 		<el-descriptions-item label="isDeleted">{{tableData.isDeleted}}</el-descriptions-item>
 </el-descriptions> -->
 	<div class="form">
+		<el-descriptions title="详情信息">
+			<el-descriptions-item label="id">{{tableData.id}}</el-descriptions-item>
+			<el-descriptions-item label="起始时间">{{tableData.createdAt}}</el-descriptions-item>
+			<el-descriptions-item label="状态">{{tableData.statusText}}</el-descriptions-item>
+		</el-descriptions>
 		<el-form ref="form" :model="tableData" label-width="80px">
 			<el-form-item label="姓名" prop="tableData.name">
 				<el-input v-model="tableData.name" style="width: 300px;"></el-input>
@@ -35,7 +40,11 @@
 					name: '',
 					bankAccount: '',
 					bankName: '',
-					id: ''
+					id: '',
+					createdAt:'',
+					status:'',
+					statusText:'',
+					
 				},
 			}
 		},
@@ -46,25 +55,25 @@
 				method: 'get',
 			}).then((res) => {
 				this.tableData = res.data
-				this.talbeData=this.$route.query.id
+				this.talbeData = this.$route.query.id
 			})
 		},
-		methods:{
-			onSubmit(){
+		methods: {
+			onSubmit() {
 				this.$request({
-					url:'/api/Drawer/update',
-					method:'post',
-					data:this.tableData
-				}).then((res)=>{
-					if(res.code==200){
+					url: '/api/Drawer/update',
+					method: 'post',
+					data: this.tableData
+				}).then((res) => {
+					if (res.code == 200) {
 						this.$message({
-							type:'success',
-							message:'修改成功!'
+							type: 'success',
+							message: '修改成功!'
 						})
-					}else{
+					} else {
 						this.$message({
-							type:'danger',
-							message:'修改失败!'
+							type: 'danger',
+							message: '修改失败!'
 						})
 					}
 				})
@@ -73,5 +82,11 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.form{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
 </style>

src/views/form/index.vue

@@ -1,6 +1,13 @@
 <template>
 	<div class="app-container">
 		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+			<div class="grid-content bg-purple">
+				<div class="grid-content bg-purple" style="margin-left: 30px">
+					<el-input placeholder="请输入出票人名称" v-model="search" @change="Search" clearable style="width: 100%">
+						<i slot="prefix" class="el-input__icon el-icon-search"></i>
+					</el-input>
+				</div>
+			</div>
 			<div class="grid-content bg-purple">
 				<el-dropdown @command="handleCommand">
 					<div class="pulldown">
@@ -17,13 +24,7 @@
 					</el-dropdown-menu>
 				</el-dropdown>
 			</div>
-			<div class="grid-content bg-purple">
-				<div class="grid-content bg-purple" style="margin-left: 30px">
-					<el-input placeholder="请输入出票人名称" v-model="search" @change="Search" clearable style="width: 100%">
-						<i slot="prefix" class="el-input__icon el-icon-search"></i>
-					</el-input>
-				</div>
-			</div>
+			
 
 			<!-- <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
         <div class="grid-content bg-purple">

src/views/mine/index.vue

@@ -145,7 +145,10 @@
 			}
 		}).then((res)=>{
 			console.log(res)
-			this.$message("密码修改成功")
+			this.$message({
+				type:'success',
+				message:'修改密码成功'
+			})
 		}).catch((err)=>{
 			console.log(err)
 		})

src/views/register/index.vue

@@ -563,8 +563,6 @@ export default {
 </script>
 
 <style lang="scss">
-/* 修复input 背景不协调 和光标变色 */
-/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 
 $bg: #f6f6f6;
 $light_gray: #bebdbb;
@@ -818,6 +816,4 @@ $light_gray: #eee;
   box-sizing: border-box;
 }
 
-.el-upload-dragger {
-}
 </style>

src/views/sucuirtyaudit/detail.vue

@@ -1,34 +1,34 @@
 <template>
-<el-descriptions title="详情信息">
-    <el-descriptions-item label="姓名">{{tableData.name}}</el-descriptions-item>
-    <el-descriptions-item label="id">{{tableData.id}}</el-descriptions-item>
-    <el-descriptions-item label="起始时间">{{tableData.createdAt}}</el-descriptions-item>
-		<el-descriptions-item label="结束时间">{{tableData.updatedAt}}</el-descriptions-item>
-    <el-descriptions-item label="银行账户">{{tableData.bankAccount}}</el-descriptions-item>
-    <el-descriptions-item label="银行名称">{{tableData.bankName}}</el-descriptions-item>
-		<el-descriptions-item label="deletedAt">{{tableData.deletedAt}}</el-descriptions-item>
-		<el-descriptions-item label="isDeleted">{{tableData.isDeleted}}</el-descriptions-item>
-</el-descriptions>
+	<el-descriptions title="详情信息">
+		<el-descriptions-item label="姓名">{{tableData.userName}}</el-descriptions-item>
+		<el-descriptions-item label="状态">{{tableData.status}}</el-descriptions-item>
+		<el-descriptions-item label="id">{{tableData.recordId}}</el-descriptions-item>
+		<el-descriptions-item label="事件名称">{{tableData.event}}</el-descriptions-item>
+		<!-- <el-descriptions-item label="更新前">{{tableData.before}}</el-descriptions-item> -->
+		<!-- <el-descriptions-item label="更新后">{{tableData.after}}</el-descriptions-item> -->
+	</el-descriptions>
 </template>
 
 <script>
-   export default {
-        data() {
-          return {
-            tableData:{},
-          }
-        },
-        mounted() {
-		  // let id=this.$route.query.id
-          this.$request({
-            url:'/api/AuditLog/detail/?id=34',
-            method:'get',
-          }).then((res)=>{
-						console.log(res)
-            // this.tableData=res.data
-          })
-        }
-      }
+	export default {
+		data() {
+			return {
+				tableData: {},
+			}
+		},
+		mounted() {
+			let id = this.$route.query.id
+			this.$request({
+				url: '/api/AuditLog/detail/' + id,
+				method: 'get',
+			}).then((res) => {
+				this.tableData=res.data
+				let string=res.data.after
+				let obj=eval('('+string+')')
+				console.log(obj)
+			})
+		}
+	}
 </script>
 
 <style>

src/views/table/detail.vue

@@ -7,13 +7,6 @@
 		<el-descriptions-item label="银行名称">{{tableData.bankName}}</el-descriptions-item>
 	</el-descriptions> -->
 	<div class="form">
-		<!-- <el-descriptions title="详情信息">
-			<el-descriptions-item label="姓名">{{tableData.name}}</el-descriptions-item>
-			<el-descriptions-item label="服务费率">{{tableData.serviceRate}}%</el-descriptions-item>
-			<el-descriptions-item label="利率">{{tableData.interest}}%</el-descriptions-item>
-			<el-descriptions-item label="银行账户">{{tableData.bankAccount}}</el-descriptions-item>
-			<el-descriptions-item label="银行名称">{{tableData.bankName}}</el-descriptions-item>
-		</el-descriptions> -->
 		<el-form ref="form" :model="tableData" label-width="80px" >
 		  <el-form-item label="姓名" prop="tableData.name">
 		    <el-input v-model="tableData.name" style="width: 300px;"></el-input>

src/views/table/index.vue

@@ -203,15 +203,16 @@
 				}
 			},
 			addAcceptor() {
-				let confirm = window.confirm("你确定新增承兑人")
-				if (confirm) {
-					this.$router.push({
+				// let confirm = window.confirm("你确定新增承兑人")
+				// if (confirm) {
+				// 	this.$router.push({
+				// 		path: '/table/addAcceptor'
+				// 	})
+				// } else {
+				// }
+				this.$router.push({
 						path: '/table/addAcceptor'
 					})
-				} else {
-
-				}
-
 			},
 			toDetail(id) {
 				this.$router.push({
@@ -251,7 +252,7 @@
 			},
 			Exports() {
 				var tableHeader = [
-					['序号','承兑人名称', '账号', '开户行名称', '服务费率', '利率', '状态', '时间'],
+					['序号','承兑人名称', '账号', '开户行名称', '服务费率(%)', '利率(%)', '状态', '时间'],
 				]
 				var dataList = []
 				this.multipleSelection.forEach((item, index) => {