Ver Fonte

8.4 17:31

Tartarus há 2 anos atrás
pai
commit
656ae0eefe

+ 6 - 4
src/views/delivery/edit.vue

xqd
@@ -11,12 +11,14 @@
 			<el-descriptions-item label="联系电话">{{ list.contactsMobile }}</el-descriptions-item>
 			<el-descriptions-item label="认证状态">{{ list.statusText }}</el-descriptions-item>
 			<el-descriptions-item label="认证照片">
-				<el-image v-for="(item,index) in list.identifyPicList" :key="index" style="width: 100px; height: 100px"
-					:src="item" />
+				<!-- <el-image v-for="(item,index) in list.identifyPicList" :key="index" style="width: 100px; height: 100px"
+					:src="item" /> -->
+					<FileShow :files="list.identifyPicList" />
 			</el-descriptions-item>
 			<el-descriptions-item label="授权委托书">
-				<el-image v-for="(item,index) in list.proxyFileList" :key="index" style="width: 100px; height: 100px"
-					:src="item" />
+				<!-- <el-image v-for="(item,index) in list.proxyFileList" :key="index" style="width: 100px; height: 100px"
+					:src="item" /> -->
+					<FileShow :files="list.proxyFileList" />
 			</el-descriptions-item>
 		</el-descriptions>
 		<el-dialog title="修改供应商" :visible.sync="dialogVisible" width="40%">

+ 29 - 20
src/views/form/index.vue

xqd xqd
@@ -201,6 +201,7 @@ export default {
         bankAccount: "",
         bankName: "",
       },
+	  oldTableData:'',
       // 修改出票人数据
       tableData: {
         name: "",
@@ -357,30 +358,38 @@ export default {
         method: "get",
       }).then((res) => {
         this.tableData = res.data;
-        this.talbeData = this.$route.query.id;
+		this.oldTableData={...this.tableData}
       });
     },
     // 修改信息弹窗提交
     onSubmit() {
-      this.$request({
-        url: "/api/Drawer/update",
-        method: "post",
-        data: this.tableData,
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: "修改成功!",
-          });
-          this.getAllList();
-          this.dialogVisible1 = false;
-        } else {
-          this.$message({
-            type: "danger",
-            message: "修改失败!",
-          });
-        }
-      });
+		if(JSON.stringify(this.oldTableData)===JSON.stringify(this.tableData)){
+			this.$message({
+				type:'error',
+				message:'数据没有改变!'
+			})
+		}else{
+			this.$request({
+			  url: "/api/Drawer/update",
+			  method: "post",
+			  data: this.tableData,
+			}).then((res) => {
+			  if (res.code == 200) {
+			    this.$message({
+			      type: "success",
+			      message: "修改成功!",
+			    });
+			    this.getAllList();
+			    this.dialogVisible1 = false;
+			  } else {
+			    this.$message({
+			      type: "danger",
+			      message: "修改失败!",
+			    });
+			  }
+			});
+		}
+      
     },
     // 新增出票人弹窗
     addTicketdrawer() {

+ 601 - 617
src/views/management/index.vue

xqd
@@ -1,639 +1,623 @@
 <template>
-  <div class="app-container">
-    <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
-      <div class="grid-content bg-purple">
-        <el-input
-          v-model="formData.name"
-          @change="Search"
-          placeholder="请输入业务管理员名称"
-          style="width: 100%"
-        >
-          <i slot="prefix" class="el-input__icon el-icon-search" />
-        </el-input>
-      </div>
-      <div class="grid-content bg-purple">
-        <el-dropdown @command="handleCommand">
-          <div class="pulldown">
-            <span v-if="!status" class="el-dropdown-link">
-              业务管理员状态
-            </span>
-            <span v-if="status" class="el-dropdown-link">
-              {{ status }}
-            </span>
-            <i class="el-icon-arrow-down el-icon--right" />
-          </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="handlehpCommand">
-          <div class="pulldown">
-            <span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
-            <span v-if="Auditstatus" class="el-dropdown-link">
-              {{ Auditstatus }}
-            </span>
-            <i class="el-icon-arrow-down el-icon--right" />
-          </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-item command="未通过">未通过</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-      <div
-        class="grid-content bg-purple"
-        style="display: flex; justify-content: flex-end; margin-left: 10px"
-      >
-        <el-button type="success" @click="success">审核成功</el-button>
-        <el-button type="danger" @click="failed">审核失败</el-button>
-        <el-button type="primary" @click="recover">恢复</el-button>
-        <el-button type="warning" @click="deleted">删除</el-button>
-        <el-button type="primary" @click="Exports">全部导出</el-button>
-        <el-button type="primary" @click="batchExports">批量导出</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 align="center" label="" width="55" type="selection" />
-      
-      <el-table-column
-        label="业务管理员名称"
-        align="center"
-        width="180"
-        prop="realName"
-      />
-      <el-table-column label="账号" align="center" prop="account" />
-      <el-table-column
-        label="联系电话"
-        width="180"
-        align="center"
-        prop="mobile"
-      />
-      <el-table-column
-        label="业务管理员状态"
-        align="center"
-        prop="statusText"
-        width="180"
-      />
-      <el-table-column
-        label="审核状态"
-        align="center"
-        prop="approveStatusText"
-      />
-      <el-table-column
-        label="时间"
-        width="180"
-        align="center"
-        prop="createdAt"
-      />
-      <el-table-column
-        align="center"
-        prop="created_at"
-        label="操作"
-        width="300"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            type="success"
-            style="cursor: pointer; margin: 0 5px"
-            @click="Srecover(scope.row.id)"
-            v-if="scope.row.status == 1"
-            >恢复</el-tag
-          >
-          <el-tag
-            type="danger"
-            style="cursor: pointer; margin: 0 5px"
-            @click="Sdeleted(scope.row.id)"
-            v-if="scope.row.status == 0"
-            >删除</el-tag
-          >
-          <el-tag
-            type="primary"
-            v-permission="['admin']"
-            style="cursor: pointer; margin: 0 5px"
-            @click="reset(scope.row.id)"
-            >重置密码
-          </el-tag>
-        </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
-        ref="pagination"
-        background
-        layout="total,prev, pager, next"
-        :total="total"
-        :page-size="pagesize"
-        :current-page="currentPage"
-        prev-text="上一页"
-        next-text="下一页"
-        @current-change="handleCurrentChange"
-      />
-      <el-button
-        type="primary"
-        size="small"
-        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
-        @click="jumpLastPage"
-        >尾页
-      </el-button>
-    </div>
-  </div>
+	<div class="app-container">
+		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+			<div class="grid-content bg-purple">
+				<el-input v-model="formData.name" @change="Search" placeholder="请输入业务管理员名称" style="width: 100%">
+					<i slot="prefix" class="el-input__icon el-icon-search" />
+				</el-input>
+			</div>
+			<div class="grid-content bg-purple">
+				<el-dropdown @command="handleCommand">
+					<div class="pulldown">
+						<span v-if="!status" class="el-dropdown-link">
+							业务管理员状态
+						</span>
+						<span v-if="status" class="el-dropdown-link">
+							{{ status }}
+						</span>
+						<i class="el-icon-arrow-down el-icon--right" />
+					</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="handlehpCommand">
+					<div class="pulldown">
+						<span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
+						<span v-if="Auditstatus" class="el-dropdown-link">
+							{{ Auditstatus }}
+						</span>
+						<i class="el-icon-arrow-down el-icon--right" />
+					</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-item command="未通过">未通过</el-dropdown-item>
+					</el-dropdown-menu>
+				</el-dropdown>
+			</div>
+			<div class="grid-content bg-purple" style="display: flex; justify-content: flex-end; margin-left: 10px">
+				<el-button type="success" @click="success">审核成功</el-button>
+				<el-button type="danger" @click="failed">审核失败</el-button>
+				<el-button type="primary" @click="recover">恢复</el-button>
+				<el-button type="warning" @click="deleted">删除</el-button>
+				<el-button type="primary" @click="Exports">全部导出</el-button>
+				<el-button type="primary" @click="batchExports">批量导出</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 align="center" label="" width="55" type="selection" />
+
+			<el-table-column label="业务管理员名称" align="center" width="180" prop="realName" />
+			<el-table-column label="账号" align="center" prop="account" />
+			<el-table-column label="联系电话" width="180" align="center" prop="mobile" />
+			<el-table-column label="审核状态" align="center" prop="approveStatusText" />
+			<el-table-column label="业务管理员状态" align="center" prop="statusText" width="180" />
+
+			<el-table-column label="时间" width="180" align="center" prop="createdAt" />
+			<el-table-column align="center" prop="created_at" label="操作" width="300">
+				<template slot-scope="scope">
+					<el-tag type="success" style="cursor: pointer; margin: 0 5px" @click="Srecover(scope.row.id)"
+						v-if="scope.row.status == 1">恢复</el-tag>
+					<el-tag type="danger" style="cursor: pointer; margin: 0 5px" @click="Sdeleted(scope.row.id)"
+						v-if="scope.row.status == 0">删除</el-tag>
+					<el-tag type="primary" v-permission="['admin']" style="cursor: pointer; margin: 0 5px"
+						@click="reset(scope.row.id)">重置密码
+					</el-tag>
+				</template>
+			</el-table-column>
+		</el-table>
+		<!-- 重置密码弹窗 -->
+		<el-dialog title="重置密码" :visible.sync="dialogVisible" width="30%">
+		  <el-form ref="form" :model="password" label-width="80px">
+		    <el-form-item label="登录密码" prop="password.newpassword">
+		      <el-input
+		        v-model="password.newpassword"
+		        style="width: 300px"
+		        show-password
+		      ></el-input>
+		    </el-form-item>
+		    <el-form-item label="确认密码" prop="password.ConfirmnewPassword">
+		      <el-input
+		        v-model="password.ConfirmnewPassword"
+		        style="width: 300px"
+		        show-password
+		      ></el-input>
+		    </el-form-item>
+		    <el-form-item>
+		      <el-button @click="dialogVisible = false">取 消</el-button>
+		      <el-button type="primary" @click="onSubmit">提交修改</el-button>
+		    </el-form-item>
+		  </el-form>
+		</el-dialog>
+		
+		<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 ref="pagination" background layout="total,prev, pager, next" :total="total"
+				:page-size="pagesize" :current-page="currentPage" prev-text="上一页" next-text="下一页"
+				@current-change="handleCurrentChange" />
+			<el-button type="primary" size="small"
+				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
+			</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
-import { dataConversionUtil } from "../../utils/Excel.js";
-import { getAccountSearch } from "@/api/account";
-export default {
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: "success",
-        draft: "gray",
-        deleted: "danger",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    return {
-      // 表单数据
-      formData: {
-        startTime: "",
-        endTime: "",
-        name: "",
-        status: "", //审核状态
-        isDeleted: "", //删除状态
-      },
-      /* 当前页数 */
-      currentPage: 1,
-      /* 每页显示个数 */
-      pagesize: 10,
-      /* 总条数 */
-      total: 20,
-      temporaryList: [],
-      srcList: [],
-      list: [],
-      listLoading: false,
-      status: "",
-      Auditstatus: "",
-      checked: false,
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-      value1: "",
-      value2: "",
-      exportExcelData1: [], //导出列表缓存数据整页
-      exportExcelData2: [], //导出列表缓存数据单选
-    };
-  },
+	import {
+		dataConversionUtil
+	} from "../../utils/Excel.js";
+	import {
+		getAccountSearch
+	} from "@/api/account";
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: "success",
+					draft: "gray",
+					deleted: "danger",
+				};
+				return statusMap[status];
+			},
+		},
+		data() {
+			return {
+				dialogVisible:false,
+				// 表单数据
+				formData: {
+					startTime: "",
+					endTime: "",
+					name: "",
+					status: "", //审核状态
+					isDeleted: "", //删除状态
+				},
+				// 重置密码
+				password: {
+				  newpassword: "",
+				  ConfirmnewPassword: "",
+				  userId: "",
+				},
+				/* 当前页数 */
+				currentPage: 1,
+				/* 每页显示个数 */
+				pagesize: 10,
+				/* 总条数 */
+				total: 20,
+				temporaryList: [],
+				srcList: [],
+				list: [],
+				listLoading: false,
+				status: "",
+				Auditstatus: "",
+				checked: false,
+				pickerOptions: {
+					shortcuts: [{
+							text: "最近一周",
+							onClick(picker) {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+								picker.$emit("pick", [start, end]);
+							},
+						},
+						{
+							text: "最近一个月",
+							onClick(picker) {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+								picker.$emit("pick", [start, end]);
+							},
+						},
+						{
+							text: "最近三个月",
+							onClick(picker) {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+								picker.$emit("pick", [start, end]);
+							},
+						},
+					],
+				},
+				value1: "",
+				value2: "",
+				exportExcelData1: [], //导出列表缓存数据整页
+				exportExcelData2: [], //导出列表缓存数据单选
+			};
+		},
 
-  mounted() {
-    this.getAllList();
-  },
-  methods: {
-    /* 获取列表数据 */
-    getAllList(searchForm = {}) {
-      const params = {
-        pageIndex: this.currentPage,
-        pageSize: this.pagesize,
-      };
-      getAccountSearch({ ...params, ...searchForm }).then((res) => {
-        const { data } = res;
-        this.temporaryList = data.result;
-        this.srcList = data.result;
-        this.total = res.data.total;
-      });
-    },
+		mounted() {
+			this.getAllList();
+		},
+		methods: {
+			/* 获取列表数据 */
+			getAllList(searchForm = {}) {
+				const params = {
+					pageIndex: this.currentPage,
+					pageSize: this.pagesize,
+				};
+				getAccountSearch({
+					...params,
+					...searchForm
+				}).then((res) => {
+					const {
+						data
+					} = res;
+					this.temporaryList = data.result;
+					this.srcList = data.result;
+					this.total = res.data.total;
+				});
+			},
 
-    success() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id);
-      this.$request({
-        url: "/api/Account/manager",
-        method: "post",
-        data: {
-          ids: ids,
-          operateType: 3,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: res.msg,
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "error",
-            message: res.msg,
-          });
-          this.getAllList();
-        }
-      });
-    },
-    failed() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id);
-      this.$request({
-        url: "/api/Account/manager",
-        method: "post",
-        data: {
-          ids: ids,
-          operateType: 4,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: res.msg,
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "error",
-            message: res.msg,
-          });
-          this.getAllList();
-        }
-      });
-    },
-    recover() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id);
-      this.$request({
-        url: "/api/Account/manager",
-        method: "post",
-        data: {
-          ids: ids,
-          operateType: 2,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: "恢复成功",
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "error",
-            message: "恢复失败",
-          });
-          this.getAllList();
-        }
-      });
-    },
-    deleted() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id);
-      this.$request({
-        url: "/api/Account/manager",
-        method: "post",
-        data: {
-          ids: ids,
-          operateType: 1,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: "删除成功",
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "error",
-            message: "删除失败",
-          });
-          this.getAllList();
-        }
-      });
-    },
-    Srecover(id) {
-      this.$request({
-        url: "/api/Account/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: "error",
-            message: "恢复失败",
-          });
-          this.getAllList();
-        }
-      });
-    },
-    Sdeleted(id) {
-      this.$request({
-        url: "/api/Account/manager",
-        method: "post",
-        data: {
-          ids: [id],
-          operateType: 1,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: "删除成功",
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "error",
-            message: "删除失败",
-          });
-          this.getAllList();
-        }
-      });
-    },
+			success() {
+				const ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id);
+				this.$request({
+					url: "/api/Account/manager",
+					method: "post",
+					data: {
+						ids: ids,
+						operateType: 3,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							type: "success",
+							message: res.msg,
+						});
+						this.getAllList();
+					} else {
+						this.$message({
+							type: "error",
+							message: res.msg,
+						});
+						this.getAllList();
+					}
+				});
+			},
+			failed() {
+				const ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id);
+				this.$request({
+					url: "/api/Account/manager",
+					method: "post",
+					data: {
+						ids: ids,
+						operateType: 4,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							type: "success",
+							message: res.msg,
+						});
+						this.getAllList();
+					} else {
+						this.$message({
+							type: "error",
+							message: res.msg,
+						});
+						this.getAllList();
+					}
+				});
+			},
+			recover() {
+				const ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id);
+				this.$request({
+					url: "/api/Account/manager",
+					method: "post",
+					data: {
+						ids: ids,
+						operateType: 2,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							type: "success",
+							message: "恢复成功",
+						});
+						this.getAllList();
+					} else {
+						this.$message({
+							type: "error",
+							message: "恢复失败",
+						});
+						this.getAllList();
+					}
+				});
+			},
+			deleted() {
+				const ids = Array.from(this.multipleSelection, ({
+					id
+				}) => id);
+				this.$request({
+					url: "/api/Account/manager",
+					method: "post",
+					data: {
+						ids: ids,
+						operateType: 1,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							type: "success",
+							message: "删除成功",
+						});
+						this.getAllList();
+					} else {
+						this.$message({
+							type: "error",
+							message: "删除失败",
+						});
+						this.getAllList();
+					}
+				});
+			},
+			Srecover(id) {
+				this.$request({
+					url: "/api/Account/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: "error",
+							message: "恢复失败",
+						});
+						this.getAllList();
+					}
+				});
+			},
+			Sdeleted(id) {
+				this.$request({
+					url: "/api/Account/manager",
+					method: "post",
+					data: {
+						ids: [id],
+						operateType: 1,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							type: "success",
+							message: "删除成功",
+						});
+						this.getAllList();
+					} else {
+						this.$message({
+							type: "error",
+							message: "删除失败",
+						});
+						this.getAllList();
+					}
+				});
+			},
 
-    /* 输入出票人名称查询 */
-    Search() {
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
-    },
-    /* 业务员状态筛选 */
-    handleCommand(command) {
-      this.status = command;
-      if (command === "全部") {
-        this.formData.isDeleted = "";
-      }
-      if (command === "正常") {
-        this.formData.isDeleted = 0;
-      }
-      if (command === "删除") {
-        this.formData.isDeleted = 1;
-      }
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
-    },
+			/* 输入出票人名称查询 */
+			Search() {
+				this.currentPage = 1;
+				this.searchForm = {
+					...this.formData
+				};
+				this.getAllList(this.searchForm);
+			},
+			/* 业务员状态筛选 */
+			handleCommand(command) {
+				this.status = command;
+				if (command === "全部") {
+					this.formData.isDeleted = "";
+				}
+				if (command === "正常") {
+					this.formData.isDeleted = 0;
+				}
+				if (command === "删除") {
+					this.formData.isDeleted = 1;
+				}
+				this.currentPage = 1;
+				this.searchForm = {
+					...this.formData
+				};
+				this.getAllList(this.searchForm);
+			},
 
-    /* 审核状态筛选 */
-    handlehpCommand(command) {
-      this.Auditstatus = command;
-      if (command === "全部") {
-        this.formData.status = "";
-      }
-      if (command === "待审核") {
-        this.formData.status = 1;
-      }
-      if (command === "通过") {
-        this.formData.status = 2;
-      }
-      if (command === "未通过") {
-        this.formData.status = 3;
-      }
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
-    },
+			/* 审核状态筛选 */
+			handlehpCommand(command) {
+				this.Auditstatus = command;
+				if (command === "全部") {
+					this.formData.status = "";
+				}
+				if (command === "待审核") {
+					this.formData.status = 1;
+				}
+				if (command === "通过") {
+					this.formData.status = 2;
+				}
+				if (command === "未通过") {
+					this.formData.status = 3;
+				}
+				this.currentPage = 1;
+				this.searchForm = {
+					...this.formData
+				};
+				this.getAllList(this.searchForm);
+			},
 
-    /* 分页功能,改变当前页 */
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getAllList(this.searchForm);
-    },
+			/* 分页功能,改变当前页 */
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getAllList(this.searchForm);
+			},
 
-    /* 分页功能去首页 */
-    jumpFirstPage() {
-      this.$refs.pagination.handleCurrentChange(1);
-      this.$emit("handleCurrentChange", 1);
-    },
-    /* 分页功能:去尾页 */
-    jumpLastPage() {
-      let font = this.$refs.pagination;
-      let cpage = Math.ceil(font.total / font.pageSize);
-      font.handleCurrentChange(cpage);
-    },
+			/* 分页功能去首页 */
+			jumpFirstPage() {
+				this.$refs.pagination.handleCurrentChange(1);
+				this.$emit("handleCurrentChange", 1);
+			},
+			/* 分页功能:去尾页 */
+			jumpLastPage() {
+				let font = this.$refs.pagination;
+				let cpage = Math.ceil(font.total / font.pageSize);
+				font.handleCurrentChange(cpage);
+			},
 
-    /* 批量导出数据 */
-    handleSelectionChange(data) {
-			this.multipleSelection=data
-      this.exportExcelData1.push(data);
-      this.exportExcelData2 = [
-        ...new Set(this.exportExcelData1.flat(Infinity)),
-      ];
+			/* 批量导出数据 */
+			handleSelectionChange(data) {
+				this.multipleSelection = data
+				this.exportExcelData1.push(data);
+				this.exportExcelData2 = [
+					...new Set(this.exportExcelData1.flat(Infinity)),
+				];
 
-    },
-    handleAll(data) {
-			this.multipleSelection=data
-      this.exportExcelData1.push(data);
-    },
+			},
+			handleAll(data) {
+				this.multipleSelection = data
+				this.exportExcelData1.push(data);
+			},
 
-    /* 批量导出 */
-    batchExports() {
-      this.multipleSelection =
-        [...new Set(this.exportExcelData1.flat(Infinity))] ||
-        this.exportExcelData2;
+			/* 批量导出 */
+			batchExports() {
+				this.multipleSelection = [...new Set(this.exportExcelData1.flat(Infinity))] ||
+					this.exportExcelData2;
 
-      if (this.multipleSelection == "") {
-        this.$message({
-          type: "warning",
-          message: "请选择数据!",
-        });
-      } else {
-        var tableHeader = [
-          [
-            "序号",
-            "业务管理员姓名",
-            "账号",
-            "联系电话",
-            "业务管理员状态",
-            "审核状态",
-            "时间",
-          ],
-        ];
-        var dataList = [];
-        this.multipleSelection.forEach((item, index) => {
-          dataList.push([
-            index + 1,
-            item.realName,
-            item.account,
-            item.mobile,
-            item.statusText,
-            item.approveStatusText,
-            item.createdAt,
-          ]);
-        });
-        dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
-        this.$message.success("导出成功!");
-      }
-    },
-    /* 全部导出合同列表数据 */
-    getContacts() {
-      const data = {
-        pageIndex: "",
-        pageSize: -1,
-        startTime: "",
-        endTime: "",
-        isDeleted: "",
-        status: "",
-      };
-      getAccountSearch({ data }).then((res) => {
-        const { result } = res.data;
-        this.multipleSelection = result;
-      });
-    },
+				if (this.multipleSelection == "") {
+					this.$message({
+						type: "warning",
+						message: "请选择数据!",
+					});
+				} else {
+					var tableHeader = [
+						[
+							"序号",
+							"业务管理员姓名",
+							"账号",
+							"联系电话",
+							"业务管理员状态",
+							"审核状态",
+							"时间",
+						],
+					];
+					var dataList = [];
+					this.multipleSelection.forEach((item, index) => {
+						dataList.push([
+							index + 1,
+							item.realName,
+							item.account,
+							item.mobile,
+							item.statusText,
+							item.approveStatusText,
+							item.createdAt,
+						]);
+					});
+					dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
+					this.$message.success("导出成功!");
+				}
+			},
+			/* 全部导出合同列表数据 */
+			getContacts() {
+				const data = {
+					pageIndex: "",
+					pageSize: -1,
+					startTime: "",
+					endTime: "",
+					isDeleted: "",
+					status: "",
+				};
+				getAccountSearch({
+					data
+				}).then((res) => {
+					const {
+						result
+					} = res.data;
+					this.multipleSelection = result;
+				});
+			},
 
-    /* 全部导出 */
-    Exports() {
-      this.getContacts();
-      setTimeout(() => {
-        var tableHeader = [
-          [
-            "序号",
-            "业务管理员姓名",
-            "账号",
-            "联系电话",
-            "业务管理员状态",
-            "审核状态",
-            "时间",
-          ],
-        ];
-        var dataList = [];
-        this.multipleSelection.forEach((item, index) => {
-          dataList.push([
-            index + 1,
-            item.realName,
-            item.account,
-            item.mobile,
-            item.statusText,
-            item.approveStatusText,
-            item.createdAt,
-          ]);
-        });
-        dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
-        this.$message.success("导出成功!");
-        this.multipleSelection = [];
-      }, 1000);
-    },
+			/* 全部导出 */
+			Exports() {
+				this.getContacts();
+				setTimeout(() => {
+					var tableHeader = [
+						[
+							"序号",
+							"业务管理员姓名",
+							"账号",
+							"联系电话",
+							"业务管理员状态",
+							"审核状态",
+							"时间",
+						],
+					];
+					var dataList = [];
+					this.multipleSelection.forEach((item, index) => {
+						dataList.push([
+							index + 1,
+							item.realName,
+							item.account,
+							item.mobile,
+							item.statusText,
+							item.approveStatusText,
+							item.createdAt,
+						]);
+					});
+					dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
+					this.$message.success("导出成功!");
+					this.multipleSelection = [];
+				}, 1000);
+			},
 
-    // 重置业务员密码
-    reset(id) {
-      this.$prompt("请输入密码", "重置密码", {
-        confirmButtonText: "确定",
-        cancleButtonText: "取消",
-      })
-        .then(({ value }) => {
-          if (value.length < 6) {
-            this.$message({
-              type: "error",
-              message: "密码至少六位",
-            });
-          } else {
-            this.$request({
-              url: "/api/Account/password/resetUser",
-              method: "post",
-              data: {
-                password: value,
-                userId: id,
-              },
-            }).then((res) => {
-              console.log(res);
-              if (res.code === 200) {
-                this.$message({
-                  type: "success",
-                  message: "重置成功",
-                });
-              }
-            });
-          }
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消重置密码",
-          });
-        });
-    },
-  },
-};
+			// 重置业务员密码
+			reset(id) {
+				this.dialogVisible = true;
+				this.password.userId = id;
+			},
+			// 提交修改密码
+			onSubmit() {
+			  if (this.password.newpassword !== this.password.ConfirmnewPassword) {
+			    this.$message({
+			      type: "error",
+			      message: "密码与确认密码不一致",
+			    });
+			  } else if (
+			    this.password.newpassword.length < 6 ||
+			    this.password.ConfirmnewPassword < 6
+			  ) {
+			    this.$message({
+			      type: "error",
+			      message: "密码与确认密码至少6位",
+			    });
+			  } else {
+			    this.$request({
+			      url: "/api/Account/password/resetUser",
+			      method: "post",
+			      data: {
+			        password: this.password.newpassword,
+			        userId: this.password.userId,
+			      },
+			    }).then((res) => {
+			      console.log(res);
+			      if (res.code === 200) {
+			        this.$message({
+			          type: "success",
+			          message: "重置成功",
+			        });
+			        this.dialogVisible = false;
+			      }
+			    });
+			  }
+			},
+		},
+	};
 </script>
 <style lang="scss" scoped>
-.pulldown {
-  width: 185px;
-  height: 40px;
-  border: 1px solid #e8e8e8;
-  border-radius: 10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 20px;
-  color: #999999;
-}
+	.pulldown {
+		width: 185px;
+		height: 40px;
+		border: 1px solid #e8e8e8;
+		border-radius: 10px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 20px;
+		color: #999999;
+	}
 
-.pagesip {
-  width: 100%;
-  margin: 20px auto;
-  display: flex;
-  // align-items: center;
-  justify-content: flex-end;
-}
+	.pagesip {
+		width: 100%;
+		margin: 20px auto;
+		display: flex;
+		// align-items: center;
+		justify-content: flex-end;
+	}
 
-.el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: #d8ab5a;
-}
+	.el-pagination.is-background .el-pager li:not(.disabled).active {
+		background-color: #d8ab5a;
+	}
 
-.el-col {
-  margin-bottom: 20px;
-}
+	.el-col {
+		margin-bottom: 20px;
+	}
 </style>

+ 67 - 55
src/views/register/index.vue

xqd xqd xqd xqd xqd
@@ -234,6 +234,10 @@
                   <el-dialog :visible.sync="dialogVisible">
                     <img width="100%" :src="providerForm.identifyPics" alt="" />
                   </el-dialog>
+				  <!-- <FileUpload
+				  v-model="providerForm.identifyPics"
+				  accept=".jpg, .jpeg, .png, .pdf"
+				  /> -->
                 </div>
                 <p class="usa">*注意上传法人手持身份证半身照</p>
               </el-form-item>
@@ -258,7 +262,7 @@
                   点击获取授权委托书
                 </span>
                 <div class="boximg">
-                  <el-upload
+                 <!-- <el-upload
                     action="https://ht.9026.com/api/File"
                     list-type="picture-card"
                     :on-success="handleSuccess"
@@ -267,7 +271,11 @@
                   </el-upload>
                   <el-dialog :visible.sync="dialogVisible">
                     <img width="100%" :src="providerForm.proxyFile" alt="" />
-                  </el-dialog>
+                  </el-dialog> -->
+				  <FileUpload
+				  v-model="providerForm.proxyFile"
+				  accept=".jpg, .jpeg, .png, .pdf"
+				  />
                 </div>
                 <p class="usa">*注意上传法人签署的授权委托书</p>
               </el-form-item>
@@ -439,16 +447,6 @@ export default {
       console.log(file, 88);
       this.imageUrl = file.url;
     },
-    showPwd() {
-      if (this.passwordType === "password") {
-        this.passwordType = "";
-      } else {
-        this.passwordType = "password";
-      }
-      this.$nextTick(() => {
-        this.$refs.password.focus();
-      });
-    },
     backLogin() {
       this.$router.replace({
         path: "/login",
@@ -458,49 +456,63 @@ export default {
 
     /* 供应商注册发送请求 */
     handleLogin(form) {
-      if (
-        this.loginForm.password !== this.loginForm.surepsd ||
-        this.providerForm.password !== this.providerForm.surepsd
-      ) {
-        this.$message({
-          type: "error",
-          message: "密码和确认密码不一致",
-        });
-      } else {
-        if (form == this.loginForm) {
-          this.$request({
-            url: "/api/Account/register",
-            method: "post",
-            data: form,
-          }).then((res) => {
-            if (res.code === 200) {
-              this.$message({
-                type: "success",
-                message: "注册成功",
-              });
-              this.$router.push({
-                path: "/login",
-              });
-            }
-          });
-        } else {
-          this.$request({
-            url: "/api/Supplier/register",
-            method: "post",
-            data: form,
-          }).then((res) => {
-            if (res.code === 200) {
-              this.$message({
-                type: "success",
-                message: "注册成功",
-              });
-              this.$router.push({
-                path: "/login",
-              });
-            }
-          });
-        }
-      }
+		if(form==this.loginForm){
+			if(this.loginForm.password !== this.loginForm.surepsd){
+				this.$message({
+				       type: "error",
+				       message: "密码和确认密码不一致",
+				});
+			}else if(this.loginForm.password.length<6){
+				this.$message({
+				       type: "error",
+				       message: "密码至少六位!",
+				});
+			}else{
+				this.$request({
+				         url: "/api/Account/register",
+				         method: "post",
+				         data: form,
+				       }).then((res) => {
+				         if (res.code === 200) {
+				           this.$message({
+				             type: "success",
+				             message: "业务员注册成功",
+				           });
+				           this.$router.push({
+				             path: "/login",
+				           });
+				         }
+				       });
+			}
+		}else{
+			if(this.providerForm.password !== this.providerForm.surepsd){
+				this.$message({
+				       type: "error",
+				       message: "密码和确认密码不一致",
+				});
+			}else if(this.providerForm.password.length<6){
+				this.$message({
+				       type: "error",
+				       message: "密码至少六位!",
+				});
+			}else{
+				this.$request({
+				         url: "/api/Supplier/register",
+				         method: "post",
+				         data: form,
+				       }).then((res) => {
+				         if (res.code === 200) {
+				           this.$message({
+				             type: "success",
+				             message: "供应商注册成功",
+				           });
+				           this.$router.push({
+				             path: "/login",
+				           });
+				         }
+				       });
+			}
+		}
     },
     // 下载委托书模板
     download() {

+ 11 - 7
src/views/sucuirtyaudit/annexList.vue

xqd xqd xqd
@@ -88,15 +88,17 @@
         width="300"
         prop="picUrls"
       >
-        <template slot-scope="scope">
-          <img
+       <template slot-scope="scope">
+          <!-- <img
             width="100"
             height="100"
             v-for="item in scope.row.picUrls"
             :key="item.id"
             :src="item"
-          />
+          /> -->
+		  <FileShow :files="scope.row.picUrls" />
         </template>
+				
       </el-table-column>
       <!-- 发票附件 -->
       <el-table-column
@@ -106,13 +108,14 @@
         prop="invoicePics"
       >
         <template slot-scope="scope">
-          <img
+         <!-- <img
             width="100"
             height="100"
             v-for="item in scope.row.invoicePics"
             :key="item.id"
             :src="item"
-          />
+          /> -->
+		  <FileShow :files="scope.row.invoicePics" />
         </template>
       </el-table-column>
       <!-- 贸易合同 -->
@@ -123,13 +126,14 @@
         prop="tradePics"
       >
         <template slot-scope="scope">
-          <img
+          <!-- <img
             width="100"
             height="100"
             v-for="item in scope.row.tradePics"
             :key="item.id"
             :src="item"
-          />
+          /> -->
+		  <FileShow :files="scope.row.tradePics" />
         </template>
       </el-table-column>
 

+ 28 - 19
src/views/table/index.vue

xqd xqd
@@ -297,6 +297,7 @@ export default {
         bankName: "",
         id: "",
       },
+	  oldTableData:'',
       /* 当前页数 */
       currentPage: 1,
       /* 每页显示个数 */
@@ -460,30 +461,38 @@ export default {
         console.log(res);
         this.tableData = res.data;
         this.tableData.id = id;
+		this.oldTableData={...this.tableData}
       });
       this.dialogVisible1 = true;
     },
     // 弹窗修改
     onSubmit() {
-      this.$request({
-        url: "/api/Acceptor/update",
-        method: "post",
-        data: this.tableData,
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: "修改成功!",
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "danger",
-            message: "修改失败!",
-          });
-        }
-      });
-      this.dialogVisible1 = false;
+	  if(JSON.stringify(this.oldTableData)===JSON.stringify(this.tableData)){
+		  this.$message({
+			  type:'error',
+			  message:'数据没有改变!'
+		  })
+	  }else{
+		  this.$request({
+		    url: "/api/Acceptor/update",
+		    method: "post",
+		    data: this.tableData,
+		  }).then((res) => {
+		    if (res.code == 200) {
+		      this.$message({
+		        type: "success",
+		        message: "修改成功!",
+		      });
+		      this.getAllList();
+		    } else {
+		      this.$message({
+		        type: "danger",
+		        message: "修改失败!",
+		      });
+		    }
+		  });
+		  this.dialogVisible1 = false;
+	  }
     },
 
     /* 输入承兑人状态查询 */