From a341852c8a59ea0dffcd58e352141390ffc71869 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 2 Jun 2023 15:04:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sup/userPerson.js                    |  4 +--
 src/views/improveInfo.vue                    |  4 +--
 src/views/purchase/cert/supCertAddDialog.vue | 14 ++++----
 src/views/userManage/customerUser.vue        | 35 ++++++++++++--------
 src/views/userManage/registerManage.vue      |  4 +--
 5 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/api/sup/userPerson.js b/src/api/sup/userPerson.js
index f1ca13f..f909af4 100644
--- a/src/api/sup/userPerson.js
+++ b/src/api/sup/userPerson.js
@@ -2,8 +2,8 @@ import request from "@/utils/request";
 export function filterList(param) {
   return request({
     url: "/sup/company/person/filterList",
-    method: "get",
-    params :param
+    method: "post",
+    data :param
   });
 }
 
diff --git a/src/views/improveInfo.vue b/src/views/improveInfo.vue
index a3351d4..5b4b672 100644
--- a/src/views/improveInfo.vue
+++ b/src/views/improveInfo.vue
@@ -148,7 +148,7 @@
                 ></el-option>
                 <el-option label="流通企业" value="2"></el-option>
                 <el-option label="医疗机构" value="3"></el-option>
-                <el-option label="监管机构" value="4"></el-option>
+                <!--<el-option label="监管机构" value="4"></el-option>-->
               </el-select>
             </el-form-item>
           </el-col>
@@ -443,7 +443,7 @@
           ></el-table-column>
           <el-table-column label="证书名称" prop="name"></el-table-column>
           <el-table-column label="证书编号" prop="code"></el-table-column>
-          <el-table-column label="生效期" prop="vailDate"></el-table-column>
+          <el-table-column label="生效期" prop="validDate"></el-table-column>
           <el-table-column label="失效期" prop="expireDate"></el-table-column>
           <el-table-column label="确认状态" prop="checkStatus" width="120">
             <template slot-scope="scope">
diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue
index 3940569..3e6ae2b 100644
--- a/src/views/purchase/cert/supCertAddDialog.vue
+++ b/src/views/purchase/cert/supCertAddDialog.vue
@@ -34,14 +34,14 @@
         <el-row>
           <el-col :span="3">
             <div class="ao-text">
-              <span>起始日期：</span>
+              <span>生效期：</span>
             </div>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="vailDate">
+            <el-form-item prop="validDate">
 
               <el-date-picker
-                v-model="formData.vailDate"
+                v-model="formData.validDate"
                 type="date"
                 :disabled="formData.auditStatus == 1"
                 value-format="yyyy-MM-dd"
@@ -53,7 +53,7 @@
 
           <el-col :span="3">
             <div class="ao-text">
-              <span>有效期：</span>
+              <span>失效期：</span>
             </div>
           </el-col>
           <el-col :span="8">
@@ -165,7 +165,7 @@ export default {
       code: "",
       isCleck:false,
       formData: {
-        vailDate: null,
+        validDate: null,
         expireDate: null,
         remark: null,
         checkComment:null,
@@ -249,7 +249,6 @@ export default {
     },
 
     submitUpload(){
-      debugger
           if(this.editTye == 1){
             this.onConfirmSubmit();
           }else{
@@ -273,9 +272,10 @@ export default {
     updateCert(){
       updateCert(this.formData).then((res)=>{
         if(res.code == 20000){
-          debugger
           this.$message.success("修改成功!")
           this.closeDialog();
+        }else{
+          this.$message.error(res.message);
         }
       })
     },
diff --git a/src/views/userManage/customerUser.vue b/src/views/userManage/customerUser.vue
index 6886788..6f9e5d5 100644
--- a/src/views/userManage/customerUser.vue
+++ b/src/views/userManage/customerUser.vue
@@ -33,7 +33,7 @@
             type="primary"
             icon="el-icon-refresh"
             @click="onReset"
-          ></el-button>
+          >重置</el-button>
           <el-button type="primary" icon="search" @click="onSubmit"
             >查询</el-button
           >
@@ -277,14 +277,20 @@ export default {
           },
           { validator: validatePass2, trigger: "blur" },
         ],
-        userFlag: [
-          { required: true, message: "请选择状态", trigger: "change" },
-        ],
       },
       editRules: {
         userName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
-        userFlag: [
-          { required: true, message: "请选择状态", trigger: "change" },
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+          { validator: validatePass, trigger: "blur" },
+        ],
+        checkPassword: [
+          {
+            required: true,
+            message: "请再次输入密码",
+            trigger: "blur",
+          },
+          { validator: validatePass2, trigger: "blur" },
         ],
       },
       deleteLoading: false,
@@ -315,23 +321,24 @@ export default {
       });
       this.query = {
         userName: "",
-        userFlag: "",
+        name: "",
         page: 1,
         limit: 20,
-        roleId: "",
-        customerId: this.currentCustomer,
+        tel: "",
+        qq: "",
+        weChat: "",
+        email: "",
+        createTime: "",
+        companyId: this.currentCustomer,
       };
       this.getList();
     },
     onSubmit() {
-      this.$router.push({
-        path: "",
-        query: this.query,
-      });
+      this.query.page = 1;
       this.getList();
     },
     handleCurrentChange(val) {
-      this.query.page = val;
+      this.query.page = val.page;
       this.getList();
     },
     getList() {
diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue
index 8dc716d..7a697bd 100644
--- a/src/views/userManage/registerManage.vue
+++ b/src/views/userManage/registerManage.vue
@@ -65,8 +65,8 @@
         ></el-table-column>
 
         <el-table-column
-          label="法人身份证"
-          prop="legalPerson"
+          label="法人身份证号"
+          prop="legalIdCard"
           width="230"
         ></el-table-column>