会员bug修复

src/views/member/user/index.vue

@@ -113,7 +113,11 @@
       <el-table :data="operationLogList">
         <el-table-column label="标题" prop="title"></el-table-column>
         <el-table-column label="操作内容" prop="content"></el-table-column>
-        <el-table-column label="操作人" prop="userId"></el-table-column>
+        <el-table-column label="操作人" prop="userId">
+          <template v-slot="{row}">
+            {{list.find(i => i.id == row.userId).identityName}}
+          </template>
+        </el-table-column>
         <el-table-column label="操作时间">
           <template v-slot:default ="scope">
             {{parseTime(scope.row.createTime) }}
@@ -533,6 +537,7 @@ export default {
         if(valid && this.IdDetails.status === 3){
        let res = await new Promise((resolve)=>{
          this.$confirm('是否要将当前状态修改为审核成功？', '状态修改', {
+           distinguishCancelAndClose: true,
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning'
@@ -542,7 +547,8 @@ export default {
            resolve(r)
          })
        })
-          p.auditPass = res === 'confirm' ? true : false;
+          if(res === 'close') return
+         else p.auditPass = res === 'confirm' ? true : false;
         } else if(valid) {
           p.auditPass =  false;
         } else {
@@ -572,12 +578,14 @@ export default {
         if(valid && this.enterpriseFrom.status === 3){
           let res = await  new Promise((resolve)=>{
             this.$confirm('是否要将当前状态修改为审核成功?', '状态修改', {
+              distinguishCancelAndClose: true,
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
             }).then(r =>resolve(r)).catch(r => resolve(r))
           })
-          p.auditPass = res === 'confirm' ? true : false;
+          if (res === 'close') return
+          else p.auditPass = res === 'confirm' ? true : false;
         }else if(valid){
           p.auditPass = false;
         }else {

src/views/member/user/underReview.vue

@@ -73,62 +73,20 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope" >
-          <el-button size="mini" type="text"  @click="guarantee(scope.row)">保函/证书</el-button>
-          <el-button size="mini" type="text"  @click="operationLogFn(scope.row)">操作日志</el-button>
-          <el-button v-if="scope.row.identityAuditStatus !== 0 && scope.row.identityAuditStatus !== undefined" size="mini" type="text"  @click="identityFn(scope.row , '1')">身份证</el-button>
-          <el-button  size="mini" type="text"  @click="identityFn(scope.row, '2')">营业执照</el-button>
-          <el-button  size="mini" type="text" @click="deleteFn(scope.row)">删 除</el-button>
+          <el-button v-if="scope.row.identityAuditStatus !== 0 && scope.row.identityAuditStatus !== undefined" size="mini" type="text"  @click="identityFn(scope.row , '1')">身份证审核</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
                 @pagination="getList"/>
-    <el-dialog
-      title="保函/证书"
-      :visible.sync="guaranteeShow"
-      :before-close="()=>{guaranteeUrl = ''; guaranteeShow = false;}"
-      width="50%">
-      <el-form>
-        <el-form-item label="保函/证书">
-          <el-row :gutter="20" type="flex" justify="center" >
-            <el-col :span="12"><el-input v-model="guaranteeUrl" ></el-input></el-col>
-            <el-col :span="4"><div style="height: 45px;overflow: hidden;">
-              <file-upload v-model="guaranteeUrl" :fileType="['png', 'jpg', 'jpeg','pdf']" :limit="1" :isShowTip="false"></file-upload>
-            </div></el-col>
-            <el-col :span="6">
-              <div>可上传图片,pdf文档</div>
-            </el-col>
-          </el-row>
-        </el-form-item>
-      </el-form>
-      <div style="text-align: center;"><el-button @click="setGuarantee">保 存</el-button></div>
-    </el-dialog>
-    <el-dialog
-      title="操作日志"
-      :visible.sync="operationLogShow"
-      width="50%">
-      <el-table :data="operationLogList">
-        <el-table-column label="标题" prop="title"></el-table-column>
-        <el-table-column label="操作内容" prop="content"></el-table-column>
-        <el-table-column label="操作人" prop="userId"></el-table-column>
-        <el-table-column label="操作时间">
-          <template v-slot:default ="scope">
-            {{parseTime(scope.row.createTime) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作ip" prop="ip"></el-table-column>
-      </el-table>
-      <pagination  v-show="totalLog >   0" :total="totalLog" :page.sync="operationLogFrom.page" :limit.sync="operationLogFrom.row"
-                   @pagination="getOperationLogList"/>
-    </el-dialog>
     <el-dialog
       title="认证"
       :visible.sync="attestationShow"
       width="80%">
       <div class="details">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="身份证" name="1" v-if="this.publicObj && this.publicObj.identityAuditStatus !== 0 && this.publicObj.identityAuditStatus !== undefined">
+        <el-tabs v-model="activeName" >
+          <el-tab-pane label="身份证" name="1">
             <div style="padding:0 40px;box-sizing: border-box;">
               <el-form ref="formId" label-position="left" label-width="100px" :rules="rulesId"  :model="IdDetails" >
                 <el-form-item label="姓名" prop="name">
@@ -167,53 +125,6 @@
                 <el-button type="primary" @click="idCardAuditFn(3)">审核不通过</el-button>
                 <el-button @click="attestationShow = false">取 消</el-button>
               </div>
-              <div v-if="IdDetails.status === 2 || IdDetails.status === 3" style="text-align: center;margin-top: 20px;">
-                <el-button type="primary" @click="setMemberUserUpdateIdCard">修 改</el-button>
-                <el-button @click="attestationShow = false">取 消</el-button>
-              </div>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="营业执照" name="2" >
-            <div style="width: 500px;padding:0 40px;box-sizing: border-box;">
-              <el-form :rules="rulesEnterprise" :model="enterpriseFrom" label-position="left" ref="formEnter" label-width="100px">
-                <el-form-item label="企业名称" prop="name">
-                  <el-input v-model="enterpriseFrom.name" ></el-input>
-                </el-form-item>
-                <el-form-item label="企业法人" prop="legalName">
-                  <el-input v-model="enterpriseFrom.legalName" ></el-input>
-                </el-form-item>
-                <el-form-item label="证件号码" prop="cardNumber">
-                  <el-input v-model="enterpriseFrom.cardNumber"></el-input>
-                </el-form-item>
-                <el-form-item label="证件照" prop="img1">
-                  <div>
-                    <el-input readonly style="margin-bottom: 20px" v-model="enterpriseFrom.img1"></el-input>
-                    <ImageUpload :isShowTip="false" :limit="1" v-model="enterpriseFrom.img1"></ImageUpload>
-                  </div>
-                </el-form-item>
-                <el-form-item label="附件">
-                  <el-input readonly v-model="enterpriseFrom.img2"></el-input>
-                  <ImageUpload :isShowTip="false" :limit="1" v-model="enterpriseFrom.img2"></ImageUpload>
-                </el-form-item>
-                <el-form-item label="审核状态">{{getDictDatas(DICT_TYPE.AUDIT_STATUS)[enterpriseFrom.status].label}}</el-form-item>
-                <el-form-item v-if="enterpriseFrom.status === 2 || enterpriseFrom.status === 3" label="审核时间">{{parseTime(enterpriseFrom.auditTime)}}</el-form-item>
-                <el-form-item v-if="enterpriseFrom.status === 1 || enterpriseFrom.status === 3" label="审核备注">
-                  <el-input v-model="enterpriseFrom.auditRemark" :disabled="enterpriseFrom.status === 3" type="textarea"></el-input>
-                </el-form-item>
-              </el-form>
-              <div v-if="enterpriseFrom.status === 1" style="text-align: center;margin-top: 20px;">
-                <el-button type="primary" @click="certificateVerificationFn(2)">审核通过</el-button>
-                <el-button type="primary" @click="certificateVerificationFn(3)">审核不通过</el-button>
-                <el-button @click="attestationShow = false">取 消</el-button>
-              </div>
-              <div v-if="enterpriseFrom.status === 2 || enterpriseFrom.status === 3" style="text-align: center;margin-top: 20px;">
-                <el-button type="primary" @click="setMemberUserUpdateEnterprise">修 改</el-button>
-                <el-button @click="attestationShow = false">取 消</el-button>
-              </div>
-              <div v-if="enterpriseFrom.status === 0" style="text-align: center;margin-top: 20px;">
-                <el-button type="primary" @click="submit">上 传</el-button>
-                <el-button @click="attestationShow = false">取 消</el-button>
-              </div>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -302,12 +213,6 @@ export default {
         img1: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }],
         img2: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }],
       },
-      rulesEnterprise: {
-        name: [{required: true, message: "企业名称不能为空", trigger: "blur"}],
-        legalName: [{required: true, message: "企业法人不能为空", trigger: "blur"}],
-        cardNumber: [{required: true, message: "证件号码不能为空", trigger: "blur"}],
-        img1: [{required: true, message: "证件照不能为空", trigger: ['blur','change']}],
-      },
       publicObj:undefined,
       operationLogShow:false,
       guaranteeShow:false,
@@ -417,22 +322,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 保函证书
-    guarantee(row) {
-      this.publicObj = row;
-      this.guaranteeShow = true;
-      this.guaranteeUrl = row.backLetterImg;
-    },
-    // 操作日志
-    operationLogFn(row){
-      this.publicObj = row;
-      this.operationLogFrom.page = 1;
-      this.operationLogFrom.userId = row.id
-      this.operationLogShow = true;
-      this.operationLogList = [];
-      this.getOperationLogList();
 
-    },
     getOperationLogList(){
       operationLogApi(this.operationLogFrom).then(r=>{
         if(r.code === 0){
@@ -454,18 +344,7 @@ export default {
       this.attestationShow = true;
       this.activeName = val;
       this.publicObj = row;
-      if(val == 1){
-        this.getIdentityDetails();
-      }else {
-        this.getEnterpriseFn();
-      }
-    },
-    handleClick(val){
-      if(val.name == 1){
       this.getIdentityDetails();
-      }else {
-        this.getEnterpriseFn();
-      }
     },
     getIdentityDetails(){
       this.resetId();
@@ -497,100 +376,10 @@ export default {
         if(r.code === 0){
           this.$message.success('修改成功');
           this.getList()
-          this.getIdentityDetails()
-        }
-      })
-    },
-    //  企业证书审核
-    certificateVerificationFn(val){
-      let p = {
-        auditStatus:val,
-        userCardAuthId:this.enterpriseFrom.id,
-        auditRemark:this.enterpriseFrom.auditRemark
-      }
-      if(val === 2){
-        p.auditRemark = undefined
-      }
-      memberUserAuditEnterprise(p).then(r => {
-        if(r.code === 0){
-          this.getList()
-          this.getEnterpriseFn();
-        }
-      })
-    },
-    setMemberUserUpdateIdCard(){
-      this.$refs.formId.validate(async valid =>{
-        let p ={
-          cardNumber:this.IdDetails.cardNumber,
-          cardType:this.IdDetails.cardType,
-          img1:this.IdDetails.img1,
-          img2:this.IdDetails.img2,
-          name:this.IdDetails.name,
-          userCardAuthId:this.IdDetails.id,
-        };
-        if(valid && this.IdDetails.status === 3){
-          let res = await new Promise((resolve)=>{
-            this.$confirm('是否要将当前状态修改为审核成功？', '状态修改', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(r =>{
-              resolve(r)
-            }).catch((r)=>{
-              resolve(r)
-            })
-          })
-          p.auditPass = res === 'confirm' ? true : false;
-        } else if(valid) {
-          p.auditPass =  false;
-        } else {
-          return
-        }
-        memberUserUpdateIdCard(p).then(r => {
-          if(r.code === 0){
-            this.$message.success('修改成功')
-            if(p.auditPass === true ){
-              this.getIdentityDetails()
-            }
-            this.getList()
-          }
-        })
-      })
-    },
-    setMemberUserUpdateEnterprise(){
-      this.$refs.formEnter.validate(async valid =>{
-        let p = {
-          cardNumber:this.enterpriseFrom.cardNumber,
-          img1:this.enterpriseFrom.img1,
-          img2:this.enterpriseFrom.img2,
-          legalName:this.enterpriseFrom.legalName,
-          name:this.enterpriseFrom.name,
-          userEnterpriseAuthId:this.enterpriseFrom.id,
-        }
-        if(valid && this.enterpriseFrom.status === 3){
-          let res = await  new Promise((resolve)=>{
-            this.$confirm('是否要将当前状态修改为审核成功?', '状态修改', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(r =>resolve(r)).catch(r => resolve(r))
-          })
-          p.auditPass = res === 'confirm' ? true : false;
-        }else if(valid){
-          p.auditPass = false;
-        }else {
-          return
-        }
-        memberUserUpdateEnterprise(p).then(r =>{
-          if(r.code === 0){
-            if(p.auditPass === 3){
-              this.getEnterpriseFn();
-            }
-            this.getList()
-            this.$message.success('修改成功');
+          this.attestationShow = false;
+
         }
       })
-      })
     },
     authentication(row){
       if(!row.identityAuditStatus && !row.enterpriseAuditRemark){