测试

src/utils/request.js

@@ -12,7 +12,7 @@ import {
 const service = axios.create({
   baseURL: 'https://ht.9026.com/', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 10 * 1000, // request timeout
+  timeout: 10 * 10000, // request timeout
   method: 'post',
   headers: {
     'Content-Type': 'application/json'

src/views/contracts/index.vue

@@ -148,30 +148,29 @@
             @click="tapDetail(scope.row.id)"
           >查看详情</el-tag>
           <el-tag
-            v-if="checked === 0"
+           v-permission="['salesman','admin']"
             type="success"
             style="cursor: pointer"
             @click="Ssuccessed(scope.row.id)"
           >
             审核成功</el-tag>
           <el-tag
-            v-if="checked === 0"
+           v-permission="['salesman','admin']"
             type="danger"
             style="cursor: pointer"
             @click="Sfailed(scope.row.id)"
           >审核失败
           </el-tag>
-          <el-tag
-            v-if="checked === 1"
-            type="success"
+         <!-- <el-tag
+            v-permission="['salesman','admin']"
             style="cursor: pointer"
           >恢复
           </el-tag>
           <el-tag
-            v-if="checked === 1"
+            v-permission="['salesman','admin']"
             type="danger"
             style="cursor: pointer"
-          >删除</el-tag>
+          >删除</el-tag> -->
         </template>
       </el-table-column>
     </el-table>
@@ -179,20 +178,21 @@
       <el-row type="flex" justify="space-between">
         <div class="btn" style="display: flex; justify-content: flex-end">
           <el-button
-            v-permission="['admin']"
+            v-permission="['supplier']"
             type="primary"
             @click="addNewContract"
           >上传合同</el-button>
+		  <el-button
+		    v-permission="['salesman','admin']"
+		    type="primary"
+		    @click="successed"
+		  >审核成功</el-button>
           <el-button
-            v-if="checked === 0"
+            v-permission="['salesman','admin']"
             type="primary"
             @click="failed"
           >审核失败</el-button>
-          <el-button
-            v-if="checked === 0"
-            type="primary"
-            @click="successed"
-          >审核成功</el-button>
+         
           <el-button type="primary" @click="Exports">批量导出</el-button>
           <el-button type="success" @click="recover">恢复</el-button>
           <el-button type="danger" @click="deleted">删除</el-button>
@@ -366,11 +366,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },
@@ -388,11 +390,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },
@@ -412,11 +416,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },
@@ -434,11 +440,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },
@@ -457,11 +465,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },
@@ -480,11 +490,13 @@ export default {
             type: 'success',
             message: res.msg
           })
+		  this.getData()
         } else {
           this.$message({
             type: 'danger',
             message: res.msg
           })
+		  this.getData()
         }
       })
     },

src/views/delivery/index.vue

@@ -1,60 +1,59 @@
 <template>
 	<div class="app-container">
 		<el-row type="flex" justify="space-around" style="margin-bottom:20px">
-				<div class="grid-content bg-purple" >
-					<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 class="grid-content bg-purple">
-					<el-dropdown @command="PhandleCommand">
-						<div class="pulldown">
-							<span class="el-dropdown-link" v-if="!providerStatus">
-								供应商状态
-							</span>
-							<span class="el-dropdown-link" v-if="providerStatus">
-								{{providerStatus}}
-							</span>
-							<i class="el-icon-arrow-down el-icon--right"></i>
-						</div>
-						<el-dropdown-menu slot="dropdown">
-							<el-dropdown-item command="供应商状态">供应商状态</el-dropdown-item>
-							<el-dropdown-item command="正常">正常</el-dropdown-item>
-							<el-dropdown-item command="删除">删除</el-dropdown-item>
-						</el-dropdown-menu>
-					</el-dropdown>
-				</div>
-				<div class="grid-content bg-purple">
-					<el-dropdown @command="AhandleCommand">
-						<div class="pulldown">
-							<span class="el-dropdown-link" v-if="!AuditStatus">
-								审核状态
-							</span>
-							<span class="el-dropdown-link" v-if="AuditStatus">
-								{{AuditStatus}}
-							</span>
-							<i class="el-icon-arrow-down el-icon--right"></i>
-						</div>
-						<el-dropdown-menu slot="dropdown">
-							<el-dropdown-item command="审核状态">审核状态</el-dropdown-item>
-							<el-dropdown-item command="已认证">已认证</el-dropdown-item>
-							<el-dropdown-item command="未认证">未认证</el-dropdown-item>
-						</el-dropdown-menu>
-					</el-dropdown>
-				</div>
-				<div class="grid-content bg-purple">
-					<div class="block">
-						<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
-							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-							:picker-options="pickerOptions">
-						</el-date-picker>
+			<div class="grid-content bg-purple">
+				<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 class="grid-content bg-purple">
+				<el-dropdown @command="PhandleCommand">
+					<div class="pulldown">
+						<span class="el-dropdown-link" v-if="!providerStatus">
+							供应商状态
+						</span>
+						<span class="el-dropdown-link" v-if="providerStatus">
+							{{providerStatus}}
+						</span>
+						<i class="el-icon-arrow-down el-icon--right"></i>
+					</div>
+					<el-dropdown-menu slot="dropdown">
+						<el-dropdown-item command="供应商状态">供应商状态</el-dropdown-item>
+						<el-dropdown-item command="正常">正常</el-dropdown-item>
+						<el-dropdown-item command="删除">删除</el-dropdown-item>
+					</el-dropdown-menu>
+				</el-dropdown>
+			</div>
+			<div class="grid-content bg-purple">
+				<el-dropdown @command="AhandleCommand">
+					<div class="pulldown">
+						<span class="el-dropdown-link" v-if="!AuditStatus">
+							审核状态
+						</span>
+						<span class="el-dropdown-link" v-if="AuditStatus">
+							{{AuditStatus}}
+						</span>
+						<i class="el-icon-arrow-down el-icon--right"></i>
 					</div>
-				</div>	
+					<el-dropdown-menu slot="dropdown">
+						<el-dropdown-item command="审核状态">审核状态</el-dropdown-item>
+						<el-dropdown-item command="已认证">已认证</el-dropdown-item>
+						<el-dropdown-item command="未认证">未认证</el-dropdown-item>
+					</el-dropdown-menu>
+				</el-dropdown>
+			</div>
+			<div class="grid-content bg-purple">
+				<div class="block">
+					<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+						start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+					</el-date-picker>
+				</div>
+			</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">
+			highlight-current-row @selection-change="handleSelectionChange" @select-all="handleAll">
+			<el-table-column type="selection">
 			</el-table-column>
 			<el-table-column label="供应商名称" align="center" prop="name" width="200">
 			</el-table-column>
@@ -65,42 +64,45 @@
 
 			</el-table-column>
 			<el-table-column label="法人名称" width="180" align="center" prop="legalPerson">
-	
+
 			</el-table-column>
 			<el-table-column label="联系人" width="180" align="center" prop="contacts">
-	
+
 			</el-table-column>
 
 			<el-table-column label="电话" width="180" align="center" prop="contactsMobile">
-	
+
 			</el-table-column>
 			<el-table-column label="供应商状态" width="180" align="center" prop="statusText">
-				
+
 			</el-table-column>
-			<el-table-column label="状态"  align="center" prop="isDeletedText">
-		
+			<el-table-column label="状态" align="center" prop="isDeletedText">
+
 			</el-table-column>
 			<el-table-column align="center" prop="createdAt" label="时间" width="180">
 			</el-table-column>
 			<el-table-column align="center" prop="created_at" label="操作" width="250">
 				<template slot-scope="scope">
-					<el-tag type="primary" style="cursor: pointer;margin-right: 15px;" @click="toedit(scope.row.id)">编辑
+					<el-tag type="primary" style="cursor: pointer;margin-right: 15px;" @click="toedit(scope.row.id)">详情
+					</el-tag>
+					<el-tag type="success" style="margin-right: 15px;cursor: pointer;" @click="Srecover(scope.row.id)"
+						v-if="scope.row.isDeleted==1">恢复</el-tag>
+					<el-tag type="danger" style="margin-right: 15px;cursor: pointer;" @click="Sdeleted(scope.row.id)"
+						v-if="scope.row.isDeleted==0">禁用</el-tag>
+					<el-tag type="primary" style="margin-right: 15px;cursor: pointer;" @click="reset(scope.row.id)">重置密码
 					</el-tag>
-					<el-tag type="success" style="margin-right: 15px;cursor: pointer;" @click="Srecover(scope.row.id)" v-if="scope.row.isDeleted==1">恢复</el-tag>
-					<el-tag type="danger" style="margin-right: 15px;cursor: pointer;"  @click="Sdeleted(scope.row.id)" v-if="scope.row.isDeleted==0">禁用</el-tag>					
-					<el-tag type="primary"  style="margin-right: 15px;cursor: pointer;"  @click="reset(scope.row.id)">重置密码</el-tag>
 				</template>
 			</el-table-column>
 		</el-table>
 		<div style="display: flex;justify-content: space-between;">
-			<el-row  type="flex" justify="end" >
+			<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" @click="recover">恢复</el-button>
-						<el-button type="danger" @click="deleted">禁用</el-button>
-					</div>
+					<el-button type="primary" @click="success">审核成功</el-button>
+					<el-button type="primary" @click="failed">审核失败</el-button>
+					<el-button type="primary" @click="Exports">批量导出</el-button>
+					<el-button type="success" @click="recover">恢复</el-button>
+					<el-button type="danger" @click="deleted">禁用</el-button>
+				</div>
 			</el-row>
 			<div class="pagesip">
 				<el-button type="primary" size="small"
@@ -115,7 +117,7 @@
 				</el-button>
 			</div>
 		</div>
-		
+
 	</div>
 </template>
 
@@ -123,9 +125,9 @@
 	import {
 		getList
 	} from '@/api/table'
-		import {
-			dataConversionUtil
-		} from '../../utils/Excel.js'
+	import {
+		dataConversionUtil
+	} from '../../utils/Excel.js'
 	export default {
 		filters: {
 			statusFilter(status) {
@@ -146,7 +148,7 @@
 				providerStatus: '',
 				AuditStatus: '',
 				search: '',
-				multipleSelection:[],
+				multipleSelection: [],
 				currentPage: 1,
 				pagesize: 9,
 				checked: false,
@@ -181,19 +183,18 @@
 				value2: ''
 			}
 		},
-		created() {
-		},
+		created() {},
 		mounted() {
 			this.getData()
 		},
 		methods: {
-			getData(){
+			getData() {
 				this.$request({
 					url: "/api/Supplier/search",
 					method: 'post',
 					data: {
 						pageIndex: 1,
-						pageSize:100,
+						pageSize: 100,
 					}
 				}).then((res) => {
 					this.list = res.data.result
@@ -201,7 +202,7 @@
 					console.log(this.list)
 				})
 			},
-			handleSelectionChange(data){
+			handleSelectionChange(data) {
 				this.multipleSelection = data;
 				console.log(this.multipleSelection);
 			},
@@ -211,23 +212,23 @@
 			},
 			PhandleCommand(command) {
 				this.providerStatus = command
-				if(this.providerStatus=="正常"||this.providerStatus=="删除"){
-					this.temporaryList=this.srcList.filter(item=>item.isDeletedText==this.providerStatus)
-				}else {
-					this.temporaryList=this.srcList
-				}				
-				this.AuditStatus='',
-				this.search=''
+				if (this.providerStatus == "正常" || this.providerStatus == "删除") {
+					this.temporaryList = this.srcList.filter(item => item.isDeletedText == this.providerStatus)
+				} else {
+					this.temporaryList = this.srcList
+				}
+				this.AuditStatus = '',
+					this.search = ''
 			},
 			AhandleCommand(command) {
 				this.AuditStatus = command
-				if(this.AuditStatus=="已认证"||this.AuditStatus=="未认证"){
-					this.temporaryList=this.srcList.filter(item=>item.statusText==this.AuditStatus)
-				}else {
-					this.temporaryList=this.srcList
+				if (this.AuditStatus == "已认证" || this.AuditStatus == "未认证") {
+					this.temporaryList = this.srcList.filter(item => item.statusText == this.AuditStatus)
+				} else {
+					this.temporaryList = this.srcList
 				}
-				this.providerStatus="",
-				this.search=''
+				this.providerStatus = "",
+					this.search = ''
 			},
 			toedit(id) {
 				this.$router.push({
@@ -254,7 +255,7 @@
 				let start = (this.currentPage - 1) * this.pagesize;
 				let end = start + this.pagesize;
 				this.srcList = this.list.slice(start, end);
-				this.temporaryList=this.srcList
+				this.temporaryList = this.srcList
 			},
 			Search() {
 				if (this.search == "") {
@@ -262,205 +263,215 @@
 				} else {
 					this.temporaryList = this.list.filter(item => item.name == this.search)
 				}
-				this.providerStatus=""
-				this.AuditStatus=""
+				this.providerStatus = ""
+				this.AuditStatus = ""
 			},
-			Exports(){
-				if(this.multipleSelection==""){
+			Exports() {
+				if (this.multipleSelection == "") {
 					this.$message({
-						type:'warning',
-						message:'请选择数据!'
+						type: 'warning',
+						message: '请选择数据!'
 					})
-				}else{
+				} else {
 					var tableHeader = [
-						['序号','供应商名称','社会统一信用码', '账号', '法人名称', '联系人', '电话', '审核状态', '时间'],
+						['序号', '供应商名称', '社会统一信用码', '账号', '法人名称', '联系人', '电话', '审核状态', '时间'],
 					]
 					var dataList = []
 					this.multipleSelection.forEach((item, index) => {
 						dataList.push([index + 1, item.name, item.socialCode, item.account, item.legalPerson, item
-							.contacts,item.contactsMobile, item.statusText, item.createdAt
+							.contacts, item.contactsMobile, item.statusText, item.createdAt
 						]);
 					})
 					dataConversionUtil.dataToExcel('供应商列表', tableHeader, dataList)
 					this.$message.success('导出成功!');
 				}
-				
+
 			},
-			success(){
-				let ids=Array.from(this.multipleSelection,({id})=>id)
+			success() {
+				let ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id)
 				this.$request({
-					url:'/api/Supplier/manage',
-					method:'post',
-					data:{
-						ids:ids,
-						operateType:3
+					url: '/api/Supplier/manage',
+					method: 'post',
+					data: {
+						ids: ids,
+						operateType: 3
 					}
-				}).then((res)=>{
-					if(res.code==200){
+				}).then((res) => {
+					if (res.code == 200) {
 						this.$message({
-							type:'success',
-							message:res.msg
+							type: 'success',
+							message: res.msg
 						})
 						this.getData()
-					}else{
+					} else {
 						this.$message({
-							type:'danger',
-							message:res.msg
+							type: 'danger',
+							message: res.msg
 						})
 						this.getData()
 					}
 				})
 			},
-			failed(){
-				let ids=Array.from(this.multipleSelection,({id})=>id)
+			failed() {
+				let ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id)
 				this.$request({
-					url:'/api/Supplier/manage',
-					method:'post',
-					data:{
-						ids:ids,
-						operateType:4
+					url: '/api/Supplier/manage',
+					method: 'post',
+					data: {
+						ids: ids,
+						operateType: 4
 					}
-				}).then((res)=>{
-					if(res.code==200){
+				}).then((res) => {
+					if (res.code == 200) {
 						this.$message({
-							type:'success',
-							message:res.msg
+							type: 'success',
+							message: res.msg
 						})
 						this.getData()
-					}else{
+					} else {
 						this.$message({
-							type:'danger',
-							message:res.msg
+							type: 'danger',
+							message: res.msg
 						})
 						this.getData()
 					}
 				})
 			},
-			recover(){
-				let ids=Array.from(this.multipleSelection,({id})=>id)
+			recover() {
+				let ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id)
 				this.$request({
-					url:'/api/Supplier/manage',
-					method:'post',
-					data:{
-						ids:ids,
-						operateType:2
+					url: '/api/Supplier/manage',
+					method: 'post',
+					data: {
+						ids: ids,
+						operateType: 2
 					}
-				}).then((res)=>{
-					if(res.code==200){
+				}).then((res) => {
+					if (res.code == 200) {
 						this.$message({
-							type:'success',
-							message:res.msg
+							type: 'success',
+							message: res.msg
 						})
 						this.getData()
-					}else{
+					} else {
 						this.$message({
-							type:'danger',
-							message:res.msg
+							type: 'danger',
+							message: res.msg
 						})
 						this.getData()
 					}
 				})
 			},
-			Srecover(id){
+			Srecover(id) {
 				this.$request({
-					url:'/api/Supplier/manage',
-					method:'post',
-					data:{
-						ids:[id],
-						operateType:2
+					url: '/api/Supplier/manage',
+					method: 'post',
+					data: {
+						ids: [id],
+						operateType: 2
 					}
-				}).then((res)=>{
-					if(res.code==200){
+				}).then((res) => {
+					if (res.code == 200) {
 						this.$message({
-							type:'success',
-							message:res.msg
+							type: 'success',
+							message: res.msg
 						})
 						this.getData()
-					}else{
+					} else {
 						this.$message({
-							type:'danger',
-							message:res.msg
+							type: 'danger',
+							message: res.msg
 						})
 						this.getData()
 					}
 				})
 			},
-			deleted(){
-				let ids=Array.from(this.multipleSelection,({id})=>id)
+			deleted() {
+				let ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id)
 				this.$request({
-					url:'/api/Supplier/manage',
-					method:'post',
-					data:{
-						ids:ids,
-						operateType:1
+					url: '/api/Supplier/manage',
+					method: 'post',
+					data: {
+						ids: ids,
+						operateType: 1
 					}
-				}).then((res)=>{
-					if(res.code==200){
+				}).then((res) => {
+					if (res.code == 200) {
 						this.$message({
-							type:'success',
-							message:res.msg
+							type: 'success',
+							message: res.msg
 						})
 						this.getData()
-					}else{
+					} else {
 						this.$message({
-							type:'danger',
-							message:res.msg
+							type: 'danger',
+							message: res.msg
 						})
 						this.getData()
 					}
 				})
 			},
-			Sdeleted(id){
+			Sdeleted(id) {
 				this.$request({
-					url:'/api/Supplier/manage',
-					method:'post',
-					data:{
-						ids:[id],
-						operateType:1
+					url: '/api/Supplier/manage',
+					method: 'post',
+					data: {
+						ids: [id],
+						operateType: 1
 					}
-				}).then((res)=>{
-					if(res.code==200){
+				}).then((res) => {
+					if (res.code == 200) {
 						this.$message({
-							type:'success',
-							message:res.msg
+							type: 'success',
+							message: res.msg
 						})
 						this.getData()
-					}else{
+					} else {
 						this.$message({
-							type:'danger',
-							message:res.msg
+							type: 'danger',
+							message: res.msg
 						})
 						this.getData()
 					}
 				})
 			},
 			// 重置供应商密码
-			reset(id){
+			reset(id) {
 				console.log(id)
-				this.$prompt('请输入密码','重置密码',{
-					confirmButtonText:'确定',
-					cancleButtonText:'取消',
-				}).then(({value})=>{
+				this.$prompt('请输入密码', '重置密码', {
+					confirmButtonText: '确定',
+					cancleButtonText: '取消',
+				}).then(({
+					value
+				}) => {
 					this.$request({
-						url:'/api/Account/password/resetSupplier',
-						method:'post',
-						data:{
-							password:value,
-							supplierId:id
+						url: '/api/Account/password/resetSupplier',
+						method: 'post',
+						data: {
+							password: value,
+							supplierId: id
 						}
-					}).then((res)=>{
+					}).then((res) => {
 						console.log(res)
-						if(res.code===200){
+						if (res.code === 200) {
 							this.$message({
-								type:'success',
-								message:'重置成功'
+								type: 'success',
+								message: '重置成功'
 							})
 						}
 					})
-				}).catch(()=>{
+				}).catch(() => {
 					this.$message({
-						type:'info',
-						message:'取消重置密码'
+						type: 'info',
+						message: '取消重置密码'
 					})
 				})
 			}
@@ -480,6 +491,7 @@
 		padding: 0 20px;
 		color: #999999;
 	}
+
 	.pagesip {
 		width: 100%;
 		margin: 20px auto;
@@ -495,7 +507,8 @@
 	.el-col {
 		margin-bottom: 20px;
 	}
-	.btn{
+
+	.btn {
 		padding: 20px;
 	}
 </style>

src/views/sucuirtyaudit/detail.vue

@@ -1,12 +1,23 @@
 <template>
-	<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>
+	<div>
+		<el-descriptions title="详情信息" :column="2" :size="size" border >
+			<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>
+		<!-- <el-table
+		    :data="tableData"
+		    stripe
+		    style="width: 100%">
+		    <el-table-column
+		      prop="date"
+		      label="日期"
+		      width="180">
+		    </el-table-column>
+		</el-table> -->
+	</div>
+	
 </template>
 
 <script>
@@ -23,6 +34,7 @@
 				method: 'get',
 			}).then((res) => {
 				this.tableData=res.data
+				console.log(this.tableData)
 				let string=res.data.after
 				let obj=eval('('+string+')')
 				console.log(obj)