8.2上午

src/views/contracts/index.vue

@@ -5,9 +5,9 @@
       <div class="grid-content bg-purple">
         <el-input
           v-model="formData.name"
-          placeholder="合同名称/编号、承兑人名称..."
+          placeholder="合同名称/编号,承兑人,出票人名称"
           clearable
-          style="width: 160px"
+          style="width: 300px"
           @change="Search"
         >
           <i slot="prefix" class="el-input__icon el-icon-search" />

src/views/delivery/edit.vue

@@ -54,7 +54,6 @@
 					</div>
 				</el-form-item>
 				<el-form-item label="授权委托书">
-					
 					<div class="boximg">
 						<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
 							:on-success="handleSuccess">

src/views/form/index.vue

@@ -34,16 +34,16 @@
 		</el-row>
 		
 		<!--修改出票人弹窗 -->
-		<el-dialog title="修改出票人" :visible.sync="dialogVisible1" width="30%">
+		<el-dialog title="修改出票人" :visible.sync="dialogVisible1" width="500px">
 		<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>
+				<el-input v-model="tableData.name" style="width: 100%;"></el-input>
 			</el-form-item>
 			<el-form-item label="银行账户" prop="tableData.bankAccount">
-				<el-input v-model="tableData.bankAccount" style="width: 300px;"></el-input>
+				<el-input v-model="tableData.bankAccount" style="width: 100%;"></el-input>
 			</el-form-item>
 			<el-form-item label="银行名称" prop="tableData.bankName">
-				<el-input v-model="tableData.bankName" style="width: 300px;"></el-input>
+				<el-input v-model="tableData.bankName" style="width: 100%;"></el-input>
 			</el-form-item>
 			<el-form-item >
 				<el-button @click="dialogVisible1 = false">取 消</el-button>
@@ -52,15 +52,15 @@
 		</el-form>
 		</el-dialog>
 		
-		<el-dialog title="新增出票人" :visible.sync="dialogVisible2" width="30%">
+		<el-dialog title="新增出票人" :visible.sync="dialogVisible2" width="500px">
 			<el-form ref="form" :model="form" label-width="100px">
-				<el-form-item label="出票人名称" style="width: 500px;" prop="name">
+				<el-form-item label="出票人名称" style="width: 100%;" prop="name">
 					<el-input v-model="form.name"></el-input>
 				</el-form-item>
-				<el-form-item label="账号" style="width: 500px;" prop="bankAccount">
+				<el-form-item label="账号" style="width: 100%;" prop="bankAccount">
 					<el-input v-model="form.bankAccount"></el-input>
 				</el-form-item>
-				<el-form-item label="开户行名称" style="width: 500px;" prop="bankName">
+				<el-form-item label="开户行名称" style="width: 100%;" prop="bankName">
 					<el-input v-model="form.bankName"></el-input>
 				</el-form-item>
 				<el-form-item style="display: flex;">

src/views/mine/index.vue

@@ -10,17 +10,17 @@
 								<span style="color:#262626;">供应商个人信息</span>
 							</span>
 						</el-form-item>
-						<el-form-item label="供应商" :rules="[{  message: '姓名不能为空不能为空'}]">
-							<el-input v-model="form.name" class="ipwidth"  disabled/>
+						<el-form-item label="供应商名称" :rules="[{  message: '姓名不能为空不能为空'}]">
+							<el-input v-model="form.name" class="ipwidth"  />
 						</el-form-item>
 						<el-form-item label="社会信用代码" :rules="[{ message: '电话号码不能为空'}]">
 							<el-input v-model="form.socialCode" class="ipwidth" disabled/>
 						</el-form-item>
 						<el-form-item label="法人姓名" :rules="[{  message: '身份证不能为空'}]">
-							<el-input v-model="form.legalPerson" class="ipwidth" disabled/>
+							<el-input v-model="form.legalPerson" class="ipwidth" />
 						</el-form-item>
-						<el-form-item label="联系人" :rules="[{  message: '身份证不能为空'}]">
-							<el-input v-model="form.contacts" class="ipwidth" disabled/>
+						<el-form-item label="供应商联系人" :rules="[{  message: '身份证不能为空'}]">
+							<el-input v-model="form.contacts" class="ipwidth" />
 						</el-form-item>
 						</el-form-item>
 					</el-form>
@@ -32,15 +32,26 @@
 								<span style="color:#262626;">其他信息</span>
 							</span>
 						</el-form-item>
-						<el-form-item label="联系电话">
-							<el-input v-model="form.contactsMobile" class="ipwidth" disabled/>
+						<el-form-item label="供应商联系电话">
+							<el-input v-model="form.contactsMobile" class="ipwidth" />
 						</el-form-item>
-						<el-form-item label="账号">
-							<el-input v-model="form.account" class="ipwidth" disabled/>
+						<el-form-item label="供应商账号">
+							<el-input v-model="form.account" class="ipwidth" />
 						</el-form-item>
-						
+						<!-- <el-form-item label="供应商密码">
+							<el-input v-model="form.password" class="ipwidth" type="password" show-password/>
+						</el-form-item> -->
 						<el-collapse v-model="activeNames"  style="width: 80%;float: right;">
-							<el-collapse-item title="认证照片" name="3">
+							<el-collapse-item title="供应商认证照片" name="3">
+								<div class="boximg">
+									<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
+										:on-success="handleAvatarSuccess">
+										<i class="el-icon-plus" />
+									</el-upload>
+									<el-dialog :visible.sync="dialogVisibleimg">
+										<img width="100%" :src="form.identifyPicList" alt="" />
+									</el-dialog>
+								</div>
 								<div>
 									<el-image style="width: 100px; height: 100px" v-for="(item,index) in form.identifyPicList" :key="index" :src="item"
 									:preview-src-list="form.identifyPicList"	>
@@ -48,9 +59,18 @@
 								</div>
 							</el-collapse-item>
 							<el-collapse-item title="授权委托书" name="4">
+								<div class="boximg">
+									<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
+										:on-success="handleSuccess">
+										<i class="el-icon-plus" />
+									</el-upload>
+									<el-dialog :visible.sync="dialogVisibleimg">
+										<img width="100%" :src="form.proxyFileList" alt="" />
+									</el-dialog>
+								</div>
 								<div>
 									<el-image style="width: 100px; height: 100px" v-for="(item,index) in form.proxyFileList" :key="index" :src="item"
-									:preview-src-list="form.identifyPicList"	>
+									:preview-src-list="form.proxyFileList"	>
 									</el-image>
 								</div>
 							</el-collapse-item>
@@ -66,7 +86,7 @@
 					
 					
 					<!-- 修改密码弹窗 -->
-					<el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%">
+					<!-- <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%">
 					<el-form ref="form" :model="password" label-width="80px">
 						<el-form-item label="旧密码" prop="password.oldPassword">
 							<el-input v-model="password.oldPassword" style="width: 300px;"></el-input>
@@ -82,7 +102,7 @@
 							<el-button type="primary" @click="onSubmit">提交修改</el-button>
 						</el-form-item>
 					</el-form>
-					</el-dialog>
+					</el-dialog> -->
 					
 				</el-col>
 				
@@ -129,12 +149,26 @@
 			return {
 				// 弹窗
 				dialogVisible:false,
+				dialogVisibleimg:false,
 				role: '',
 				id: '',
 				resource: '',
 				radio: '1',
 				activeNames:'',
-				form: {},
+				proxyFileArray:[],
+				identifyPicsArray:[],
+				form: {
+					name:'',
+					account:'',
+					contacts:'',
+					contactsMobile:'',
+					id:'',
+					password:'',
+					socialCode:'',
+					legalPerson:'',
+					identifyPicList:[],
+					proxyFileList:[],
+				},
 				password:{
 					oldPassword: '',
 					newPassword: '',
@@ -153,14 +187,12 @@
 					method: 'get'
 				}).then((res) => {
 					this.form=res.data
-					console.log(res)
 				})
 			} else if (this.role === 1) {
 				this.$request({
 					url: '/api/Account',
 					method: 'get'
 				}).then((res) => {
-					console.log(res)
 					this.form = res.data
 				})
 			}
@@ -187,7 +219,6 @@
 									type: 'success',
 									message: '修改密码成功'
 								})
-								this.dialogVisible=false
 							}
 						}).catch((err) => {
 							console.log(err)
@@ -206,7 +237,6 @@
 									type: 'success',
 									message: '修改密码成功'
 								})
-								this.dialogVisible=false
 							}
 						})
 					}
@@ -217,7 +247,24 @@
 					message: 'cancel!',
 					type: 'warning'
 				})
-			}
+			},
+			handleAvatarSuccess(res) {
+			  //解构
+			  let { file } = res.data;
+			  this.identifyPicsArray.push(file);
+			  this.form.identifyPicList = this.identifyPicsArray;
+			  console.log(this.form,"form")
+			},
+			/* 供应商上传委托书图片上传成功  */
+			handleSuccess(res) {
+				//解构
+				let {
+					file
+				} = res.data;
+				this.proxyFileArray.push(file);
+				this.form.proxyFileList = this.proxyFileArray;
+				console.log(this.form,"form")
+			},
 		}
 	}
 </script>

src/views/register/index.vue

@@ -136,6 +136,12 @@
 								:type="passwordType" placeholder="至少6位数的字母数字组合" name="password" tabindex="4"
 								auto-complete="on" show-password />
 						</el-form-item>
+						<el-form-item prop="surepsd">
+							<span class="svg-container"> 确认密码 </span>
+							<el-input :key="passwordType" ref="password" v-model="providerForm.surepsd"
+								:type="passwordType" placeholder="至少6位数的字母数字组合" name="password" auto-complete="on"
+								show-password tabindex="3" />
+						</el-form-item>
 						<!-- 供应商上传身份证图片 -->
 						<div class="choosepic">
 							<el-form-item style="background-color: transparent; margin: 0; padding: 0">
@@ -149,7 +155,7 @@
 								</span>
 								<div class="boximg">
 									<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
-										:on-success="handleAvatarSuccess">
+										:on-success="handleAvatarSuccess" >
 										<i class="el-icon-plus" />
 									</el-upload>
 
@@ -260,6 +266,7 @@
 				providerForm: {
 					account: "",
 					password: "",
+					surepsd:'',
 					name: "",
 					socialCode: "",
 					legalPerson: "",
@@ -362,7 +369,7 @@
 
 			/* 供应商注册发送请求 */
 			handleLogin(form) {
-				if (this.loginForm.password !== this.loginForm.surepsd) {
+				if (this.loginForm.password !== this.loginForm.surepsd||this.providerForm.password!==this.providerForm.surepsd) {
 					this.$message({
 						type: 'error',
 						message: '密码和确认密码不一致'

src/views/table/index.vue

@@ -33,22 +33,27 @@
 		</el-row>
 
 		<!-- 弹窗修改 -->
-		<el-dialog title="修改供应商" :visible.sync="dialogVisible1" width="40%">
+		<el-dialog title="修改承兑人" :visible.sync="dialogVisible1" width="500px">
 			<el-form :model="tableData" label-width="80px">
 				<el-form-item label="姓名" prop="tableData.name">
-					<el-input v-model="tableData.name" style="width: 300px;"></el-input>
-				</el-form-item>
-				<el-form-item label="服务费率" prop="tableData.serviceRate">
-					<el-input v-model="tableData.serviceRate" style="width: 300px;"></el-input>
-				</el-form-item>
-				<el-form-item label="利率" prop="tableData.interest">
-					<el-input v-model="tableData.interest" style="width: 300px;"></el-input>
+					<el-input v-model="tableData.name" style="width: 100%;"></el-input>
 				</el-form-item>
+				
 				<el-form-item label="银行账户" prop="tableData.bankAccount">
-					<el-input v-model="tableData.bankAccount" style="width: 300px;"></el-input>
+					<el-input v-model="tableData.bankAccount" style="width: 100%;"></el-input>
 				</el-form-item>
 				<el-form-item label="银行名称" prop="tableData.bankName">
-					<el-input v-model="tableData.bankName" style="width: 300px;"></el-input>
+					<el-input v-model="tableData.bankName" style="width: 100%;"></el-input>
+				</el-form-item>
+				<el-form-item label="服务费率" prop="tableData.serviceRate">
+					<el-input v-model="tableData.serviceRate" style="width: 100%;" onkeyup="value=value.replace(/[^\d.]/g,'')">
+						<i slot="suffix" style="font-style:normal;margin-right: 10px;">%</i>
+					</el-input>
+				</el-form-item>
+				<el-form-item label="利率" prop="tableData.interest">
+					<el-input v-model="tableData.interest" style="width: 100%;" onkeyup="value=value.replace(/[^\d.]/g,'')">
+						<i slot="suffix" style="font-style:normal;margin-right: 10px;">%</i>
+					</el-input>
 				</el-form-item>
 				<el-form-item >
 					<el-button @click="dialogVisible1 = false">取 消</el-button>
@@ -58,24 +63,27 @@
 		</el-dialog>
 
 		<!-- 弹窗新增承兑人 -->
-		<el-dialog title="新增承兑人" :visible.sync="dialogVisible2" width="40%">
+		<el-dialog title="新增承兑人" :visible.sync="dialogVisible2" width="500px">
 			<el-form ref="form" :model="form" label-width="100px">
 				<el-form-item label="承兑人名称" prop="name">
-					<el-input v-model="form.name" style="width: 500px;" placeholder="请输入承兑人名称"></el-input>
+					<el-input v-model="form.name" style="width: 100%;" placeholder="请输入承兑人名称"></el-input>
 				</el-form-item>
 				<el-form-item label="账号" prop="bankAccount">
-					<el-input v-model="form.bankAccount" style="width: 500px;" placeholder="请输入账号"></el-input>
+					<el-input v-model="form.bankAccount" style="width: 100%;" placeholder="请输入账号"></el-input>
 				</el-form-item>
 				<el-form-item label="开户行名称" prop="bankName">
-					<el-input v-model="form.bankName" style="width: 500px;" placeholder="请输入开户行名称"></el-input>
+					<el-input v-model="form.bankName" style="width: 100%;" placeholder="请输入开户行名称"></el-input>
+				</el-form-item>
+				<el-form-item label="开户行行号" prop="bankName">
+					<el-input v-model="form.bankNo" style="width: 100%;" placeholder="请输入开户行行号" ></el-input>
 				</el-form-item>
 				<el-form-item label="服务费率" prop="serviceRate">
-					<el-input v-model="form.serviceRate" placeholder="请输入服务费率" style="width: 500px;">
+					<el-input v-model="form.serviceRate" placeholder="请输入服务费率" style="width: 100%;" onkeyup="value=value.replace(/[^\d.]/g,'')">
 						<i slot="suffix" style="font-style:normal;margin-right: 10px;">%</i>
 					</el-input>
 				</el-form-item>
 				<el-form-item label="利率" prop="interest">
-					<el-input v-model="form.interest" placeholder="请输入利率" style="width: 500px;">
+					<el-input v-model="form.interest" placeholder="请输入利率" style="width: 100%;" onkeyup="value=value.replace(/[^\d.]/g,'')">
 						<i slot="suffix" style="font-style:normal;margin-right: 10px;">%</i>
 					</el-input>
 				</el-form-item>
@@ -171,6 +179,7 @@
 				form: {
 					name: '',
 					bankAccount: '',
+					bankNo:'',
 					bankName: '',
 					serviceRate: '',
 					interest: ''
@@ -251,6 +260,7 @@
 					const {
 						data
 					} = res;
+					console.log(res,"res")
 					this.temporaryList = data.result;
 					this.srcList = data.result;
 					this.total = res.data.total;