8.19 11:35

src/components/upload/FileShow.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="display: flex;">
     <template v-for="(item, index) in files">
       <a v-if="isPDF(item)" :key="index" :href="item" target="_blank">
         <img style="width: 100px; height: 100px" :src="pdf">

src/router/index.js

@@ -207,7 +207,7 @@ export const asyncRouterMap = [{
 		name: 'supplierAcceptor'
 	},
 	meta: {
-		title: '供应商承兑人表',
+		title: '我的承兑人管理',
 		roles: ['admin', 'salesman','supplier']
 	},
 	children: [{
@@ -215,7 +215,7 @@ export const asyncRouterMap = [{
 		name: 'supplierAcceptor',
 		component: () => import('@/views/supplierAcceptor/index'),
 		meta: {
-			title: '供应商承兑人表',
+			title: '我的承兑人管理',
 			icon: 'el-icon-copy-document',
 			roles: ['admin', 'salesman','supplier'],
 		}

src/views/contracts/detail.vue

@@ -342,7 +342,7 @@
 		},
 
 		mounted() {
-			this.role = this.$store.state.user.userInfo.type;
+			this.roleId = this.$store.state.user.userInfo.roleId;
 			this.checked = this.$store.state.user.checked;
 			this.getData();
 		},
@@ -735,48 +735,88 @@
 				}) => id);
 				let status=Array.from(this.multipleSelection,({draftStatus})=>draftStatus)
 				let Auditstatus=Array.from(this.multipleSelection,({status})=>status)
-				if(status.includes(1)){
-					this.$message({
-						type:'error',
-						message:'删除状态不能再次删除'
-					})
-				}else if(ids==""){
-					this.$message({
-						type:'error',
-						message:'请选择数据'
-					})
-				}else if(Auditstatus.includes(1)){
-					this.$message({
-						type:'error',
-						message:"不能删除审核状态为通过的汇票"
-					})
+				if(this.roleId===999){
+					if(status.includes(1)){
+						this.$message({
+							type:'error',
+							message:'删除状态不能再次删除'
+						})
+					}else if(ids==""){
+						this.$message({
+							type:'error',
+							message:'请选择数据'
+						})
+					}else if(Auditstatus.includes(1)){
+						this.$message({
+							type:'error',
+							message:"不能删除审核状态为通过的汇票"
+						})
+					}else{
+						this.$request({
+							url: "/api/Contract/contractDraft/manager",
+							method: "post",
+							data: {
+								ids: ids,
+								operateType: 1,
+							},
+						}).then((res) => {
+							if (res.code === 200) {
+								this.$message({
+									type: "success",
+									message: res.msg,
+								});
+								this.$refs.multipleTable.clearSelection();
+								this.multipleSelection="";
+								this.getData();
+							} else {
+								this.$message({
+									type: "error",
+									message: "提交失败",
+								});
+								this.getData();
+							}
+						});
+					}
 				}else{
-					this.$request({
-						url: "/api/Contract/contractDraft/manager",
-						method: "post",
-						data: {
-							ids: ids,
-							operateType: 1,
-						},
-					}).then((res) => {
-						if (res.code === 200) {
-							this.$message({
-								type: "success",
-								message: res.msg,
-							});
-							this.$refs.multipleTable.clearSelection();
-							this.multipleSelection="";
-							this.getData();
-						} else {
-							this.$message({
-								type: "error",
-								message: "提交失败",
-							});
-							this.getData();
-						}
-					});
+					if(status.includes(1)){
+						this.$message({
+							type:'error',
+							message:'删除状态不能再次删除'
+						})
+					}else if(ids==""){
+						this.$message({
+							type:'error',
+							message:'请选择数据'
+						})
+					}else{
+						this.$request({
+							url: "/api/Contract/contractDraft/manager",
+							method: "post",
+							data: {
+								ids: ids,
+								operateType: 1,
+							},
+						}).then((res) => {
+							if (res.code === 200) {
+								this.$message({
+									type: "success",
+									message: res.msg,
+								});
+								this.$refs.multipleTable.clearSelection();
+								this.multipleSelection="";
+								this.getData();
+							} else {
+								this.$message({
+									type: "error",
+									message: "提交失败",
+								});
+								this.getData();
+							}
+						});
+					}
 				}
 				
+				
 			},
 			recover(id) {
 				this.$request({
@@ -803,36 +843,63 @@
 				});
 			},
 			deleted(id,status) {
-				if(status===1){
-					this.$message({
-						type:'error',
-						message:"不能删除审核状态为通过的汇票"
-					})
+				if(this.roleId===999){
+					if(status===1){
+						this.$message({
+							type:'error',
+							message:"不能删除审核状态为通过的汇票"
+						})
+					}else{
+						this.$request({
+							url: "/api/Contract/contractDraft/manager",
+							method: "post",
+							data: {
+								ids: [id],
+								operateType: 1,
+							},
+						}).then((res) => {
+							if (res.code === 200) {
+								this.$message({
+									type: "success",
+									message: res.msg,
+								});
+								this.getData();
+							} else {
+								this.$message({
+									type: "error",
+									message: "提交失败",
+								});
+								this.getData();
+							}
+						});
+					}
 				}else{
-					this.$request({
-						url: "/api/Contract/contractDraft/manager",
-						method: "post",
-						data: {
-							ids: [id],
-							operateType: 1,
-						},
-					}).then((res) => {
-						if (res.code === 200) {
-							this.$message({
-								type: "success",
-								message: res.msg,
-							});
-							this.getData();
-						} else {
-							this.$message({
-								type: "error",
-								message: "提交失败",
-							});
-							this.getData();
-						}
-					});
+						this.$request({
+							url: "/api/Contract/contractDraft/manager",
+							method: "post",
+							data: {
+								ids: [id],
+								operateType: 1,
+							},
+						}).then((res) => {
+							if (res.code === 200) {
+								this.$message({
+									type: "success",
+									message: res.msg,
+								});
+								this.getData();
+							} else {
+								this.$message({
+									type: "error",
+									message: "提交失败",
+								});
+								this.getData();
+							}
+						});
+					
 				}
 				
+				
 			},
 			back() {
 				this.$router.go(-1);

src/views/contracts/index.vue

@@ -280,6 +280,8 @@ export default {
   },
   data() {
     return {
+			// 角色id
+			roleId:'',
       // 表单数据
       formData: {
         startTime: "",
@@ -352,9 +354,10 @@ export default {
 	// this.currentPage = 1;
 	// this.searchForm = { ...this.formData };
 	// this.getData(this.searchForm);
-	
+		this.roleId = this.$store.state.user.userInfo.roleId;
+		console.log(this.roleId,"id")
 	// 获取所有数据
-	this.getData()
+		this.getData()
 	
     //是否显示供应商查询
     this.getSupplierName();
@@ -397,7 +400,7 @@ export default {
     },
     successed() {
       const ids = Array.from(this.multipleSelection, ({ id }) => id);
-			let status=Array.from(this.multipleSelection,({status})=>status)
+		let status=Array.from(this.multipleSelection,({status})=>status)
 			if(status.includes(1)){
 				this.$message({
 					type:'error',
@@ -569,48 +572,87 @@ export default {
 			const ids = Array.from(this.multipleSelection, ({ id }) => id);
 			let status=Array.from(this.multipleSelection,({contractStatus})=>contractStatus)
 			let Auditstatus=Array.from(this.multipleSelection,({status})=>status)
-			console.log(Auditstatus)
-			if(status.includes(1)){
-				this.$message({
-					type: 'error',
-					message: '不能删除合同状态已是删除状态的数据'
-				})
-			}else if(Auditstatus.includes(1)){
-				this.$message({
-					type: 'error',
-					message: '不能删除合同审核状态为成功的数据'
-				})
-			}else if(ids==""){
-				this.$message({
-					type: 'error',
-					message: '请选择数据'
-				})
-			}else{
-				this.$request({
-				  url: "/api/Contract/manage",
-				  method: "post",
-				  data: {
-				    ids: ids,
-				    operateType: 1,
-				  },
-				}).then((res) => {
-				  if (res.code === 200) {
-				    this.$message({
-				      type: "success",
-				      message: res.msg,
-				    });
-						this.$refs.multipleTable.clearSelection();
-						this.multipleSelection="";
-				    this.getData();
-				  } else {
-				    this.$message({
-				      type: "danger",
-				      message: res.msg,
-				    });
-				    this.getData();
-				  }
-				});
+			if(this.roleId===999){  //供应商删除
+				if(status.includes(1)){
+					this.$message({
+						type: 'error',
+						message: '不能删除合同状态已是删除状态的数据'
+					})
+				}else if(Auditstatus.includes(1)){
+					this.$message({
+						type: 'error',
+						message: '不能删除合同审核状态为成功的数据'
+					})
+				}else if(ids==""){
+					this.$message({
+						type: 'error',
+						message: '请选择数据'
+					})
+				}else{
+					this.$request({
+					  url: "/api/Contract/manage",
+					  method: "post",
+					  data: {
+					    ids: ids,
+					    operateType: 1,
+					  },
+					}).then((res) => {
+					  if (res.code === 200) {
+					    this.$message({
+					      type: "success",
+					      message: res.msg,
+					    });
+							this.$refs.multipleTable.clearSelection();
+							this.multipleSelection="";
+					    this.getData();
+					  } else {
+					    this.$message({
+					      type: "danger",
+					      message: res.msg,
+					    });
+					    this.getData();
+					  }
+					});
+				}
+			}else{  //管理员删除
+				if(status.includes(1)){
+					this.$message({
+						type: 'error',
+						message: '不能删除合同状态已是删除状态的数据'
+					})
+				}else if(ids==""){
+					this.$message({
+						type: 'error',
+						message: '请选择数据'
+					})
+				}else{
+					this.$request({
+					  url: "/api/Contract/manage",
+					  method: "post",
+					  data: {
+					    ids: ids,
+					    operateType: 1,
+					  },
+					}).then((res) => {
+					  if (res.code === 200) {
+					    this.$message({
+					      type: "success",
+					      message: res.msg,
+					    });
+							this.$refs.multipleTable.clearSelection();
+							this.multipleSelection="";
+					    this.getData();
+					  } else {
+					    this.$message({
+					      type: "danger",
+					      message: res.msg,
+					    });
+					    this.getData();
+					  }
+					});
+				}
 			}
+			
     },
     // 合同状态查询
     handleCommand(command) {

src/views/form/index.vue

@@ -304,134 +304,7 @@
 			// 		path: "/form/addTicketdrawer",
 			// 	});
 			// },
-			todetail(id) {
-				console.log(id);
-				this.$router.push({
-					path: "/form/detail",
-					query: {
-						id: id,
-					},
-				});
-			},
-			// 批量恢复
-			recovers() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id)
-				let status = Array.from(this.multipleSelection, ({
-					status
-				}) => status)
-				if (status.includes(0)) {
-					this.$message({
-						type: 'error',
-						message: '不能恢复已是正常状态的账号'
-					})
-				} else if(ids==""){
-					this.$message({
-						type: 'error',
-						message: '请选择数据'
-					})
-				} else{
-					this.$request({
-						url: "/api/Drawer/manager",
-						method: "post",
-						data: {
-							ids: ids,
-							operateType: 2,
-						},
-					}).then((res) => {
-						if (res.code == 200) {
-							this.$message({
-								type: "success",
-								message: "恢复成功",
-							});
-							this.$refs.multipleTable.clearSelection();
-							this.multipleSelection="";
-							this.getAllList();
-						} else {
-							this.$message({
-								type: "danger",
-								message: "恢复失败",
-							});
-							this.getAllList();
-						}
-					});
-				}
 
-			},
-			recover(id) {
-				this.$request({
-					url: "/api/Drawer/manager",
-					method: "post",
-					data: {
-						ids: [id],
-						operateType: 2,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: "恢复成功",
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: "恢复失败",
-						});
-						this.getAllList();
-					}
-				});
-			},
-			deletestatuses() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id)
-				let status = Array.from(this.multipleSelection, ({
-					status
-				}) => status)
-				if (status.includes(1)) {
-					this.$message({
-						type: 'error',
-						message: '不能删除已是删除状态的账号'
-					})
-				} else if(ids==""){
-					this.$message({
-						type: 'error',
-						message: '请选择数据'
-					})
-				}else{
-					this.$request({
-						url: "/api/Drawer/manager",
-						method: "post",
-						data: {
-							ids: ids,
-							operateType: 1,
-						},
-					}).then((res) => {
-						if (res.code == 200) {
-							this.$message({
-								type: "success",
-								message: "删除成功",
-							});
-							this.$refs.multipleTable.clearSelection();
-							this.multipleSelection="";
-							this.getAllList();
-						} else {
-							this.$message({
-								type: "danger",
-								message: "删除失败",
-							});
-							this.getAllList();
-						}
-					});
-				}
-      },
-    // addTicketdrawer() {
-    // 	this.$router.push({
-    // 		path: "/form/addTicketdrawer",
-    // 	});
-    // },
     todetail(id) {
       console.log(id);
       this.$router.push({

src/views/mine/index.vue

@@ -43,13 +43,13 @@
 
 						<el-form-item label="供应商认证照片">
 							<div style="display: flex;">
-								<div>
+								<!-- <div>
 									<el-image style="width: 100px; height: 100px"
 										v-for="(item,index) in form.identifyPics" :key="index" :src="item"
 										:preview-src-list="form.identifyPics">
 									</el-image>
-								</div>
-								<div class="boximg">
+								</div> -->
+								<!-- <div class="boximg">
 									<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
 										:on-success="handleAvatarSuccess">
 										<i class="el-icon-plus" />
@@ -57,22 +57,22 @@
 									<el-dialog :visible.sync="dialogVisibleimg">
 										<img width="100%" :src="form.identifyPics" alt="" />
 									</el-dialog>
-								</div>
-								<!-- <FileShow :files="form.identifyPics" style="width: 148px;height: 148px;"></FileShow>
-								<Upload v-model="form.identifyPics" ></Upload> -->
+								</div> -->
+								<FileShow :files="form.identifyPics" ></FileShow>
+								<Upload v-model="form.identifyPics" ></Upload>
 							</div>
 
 
 						</el-form-item>
 						<el-form-item label="授权委托书">
 							<div style="display: flex;">
-								<div>
+								<!-- <div>
 									<el-image style="width: 100px; height: 100px" v-for="(item,index) in form.proxyFile"
 										:key="index" :src="item" :preview-src-list="form.proxyFile">
 									</el-image>
-								</div>
-								<!-- <FileShow :files="form.proxyFile" style="width: 148px;height: 148px;"></FileShow> -->
-								<div>
+								</div> -->
+								<FileShow :files="form.proxyFile" ></FileShow>
+								<!-- <div>
 									<el-dialog :visible.sync="dialogVisibleimg">
 										<img width="100%" :src="form.proxyFile" alt="" />
 									</el-dialog>
@@ -80,8 +80,8 @@
 										:on-success="handleSuccess">
 										<i class="el-icon-plus" />
 									</el-upload>
-								</div>
-								<!-- <Upload v-model="form.proxyFile" ></Upload> -->
+								</div> -->
+								<Upload v-model="form.proxyFile" ></Upload>
 							</div>
 
 						</el-form-item>

src/views/register/index.vue

@@ -239,6 +239,7 @@
 				  />
                 </div>
                 <p class="usa">*注意上传法人手持身份证半身照</p>
+								 <p class="usa">*支持上传pdf、jpg/jpeg、png格式,大小30M以下</p>
               </el-form-item>
             </div>
 
@@ -277,6 +278,7 @@
 				  />
                 </div>
                 <p class="usa">*注意上传法人签署的授权委托书</p>
+				<p class="usa">*支持上传pdf、jpg/jpeg、png格式,大小30M以下</p>
               </el-form-item>
             </div>
             <el-button

src/views/supplierAcceptor/index.vue

@@ -96,7 +96,8 @@
 						v-permission="['admin', 'salesman']" v-if="scope.row.status!=2">审核不通过
 					</el-tag>
 					<el-tag type="primary" style="cursor: pointer; margin-right: 15px"
-						@click="Resubmit(scope.row.supplierId,scope.row.acceptorId)" v-permission="['supplier']"
+						@click="Resubmit(scope.row.supplierId,scope.row.acceptorId)" 
+						v-permission="['supplier']"
 						v-if="scope.row.status===2">重新提交
 					</el-tag>
 					<el-tag type="danger" style="cursor: pointer; margin-right: 15px"
@@ -292,10 +293,10 @@
 							type: 'success',
 							message: "添加成功!"
 						})
+						this.getAllList()
 					}
 				})
 				this.dialogVisible2 = false
-				this.getAllList()
 			},
 
 
@@ -315,9 +316,10 @@
 							type: 'success',
 							message: "提交成功!"
 						})
+						this.getAllList()
 					}
 				})
-				this.getAllList()
+				
 			},
 
 			// 批量审核成功

src/views/table/index.vue

@@ -285,7 +285,7 @@ export default {
         startTime: "",
         endTime: "",
         name: "", // 承兑人名称
-        status: "", // 承兑人状态
+        Status: "", // 承兑人状态
       },
       // 新增承兑人数据
       form: {