Merge remote-tracking branch 'origin/main'

src/api/business/userRegister.js

@@ -60,3 +60,12 @@ export function addUserInfoBus(data) {
     data: data
   })
 }
+
+// 重置用户密码
+export function resetUserPassword(id) {
+  return request({
+    url: '/business/userRegister/passwordReset',
+    method: 'post',
+    data: id
+  })
+}

src/views/business/userInfo/index.vue

@@ -1,25 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.userInfo.userCode')" prop="userCode" label-width="120">
+      <el-form-item label="登录账号" prop="account" label-width="120">
-        <el-input v-model="queryParams.userCode" :placeholder="$t('business.userInfo.userCodePlaceholder')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.account" placeholder="请输入登录账号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.userInfo.name')" prop="name">
+      <el-form-item label="身份证号" prop="idCard">
-        <el-input v-model="queryParams.name" :placeholder="$t('business.userInfo.namePlaceholder')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.idCard" :placeholder="$t('business.userInfo.namePlaceholder')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item :label="$t('business.userInfo.gender')" prop="gender">
-      <el-select v-model="form.gender" placeholder="请选择性别">
-        <el-option label="男" value="1"></el-option>
-        <el-option label="女" value="0"></el-option>
-      </el-select>
-<!--        <el-input v-model="queryParams.gender" :placeholder="$t('business.userInfo.genderPlaceholder')" clearable @keyup.enter.native="handleQuery" />-->
       </el-form-item>
       <el-form-item :label="$t('business.userInfo.phone')" prop="phone">
         <el-input v-model="queryParams.phone" :placeholder="$t('business.userInfo.phonePlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.userInfo.addr')" prop="addr">
-        <el-input v-model="queryParams.addr" :placeholder="$t('business.userInfo.addrPlaceholder')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
@@ -27,10 +17,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['business:userInfo:add']">{{ $t('common.add') }}</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['business:userInfo:edit']">{{ $t('common.edit') }}</el-button>
@@ -48,6 +34,7 @@
 
     <el-table v-loading="loading" :data="userInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="登录账号" align="center" prop="account" />
       <el-table-column :label="$t('business.userInfo.name')" align="center" prop="name" />
       <el-table-column :label="$t('business.userInfo.gender')" align="center" prop="gender" >
         <template slot-scope="scope">
@@ -67,7 +54,6 @@
       </el-table-column>
       <el-table-column :label="$t('common.operation')" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">{{ $t('common.detail') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['business:userInfo:edit']">{{ $t('common.edit') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -186,6 +172,7 @@
           pageSize: 10,
           userId: undefined,
           userCode: undefined,
+          account: undefined,
           name: undefined,
           gender: undefined,
           idCard: undefined,
@@ -289,13 +276,6 @@
         this.open = true;
         this.title = this.$t('business.userInfo.addTitle');
       },
-      /** 详情按钮操作 */
-      handleDetail(row) {
-        this.reset();
-        this.form = row;
-        this.detailOpen = true;
-        this.title = this.$t('business.userInfo.detailTitle');
-      },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.loading = true;

src/views/business/userInfoBus/index.vue

@@ -1,26 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="营业执照" prop="license">
+      <el-form-item label="登录账号" prop="account" label-width="120">
         <el-input
-          v-model="queryParams.license"
+          v-model="queryParams.account"
-          placeholder="请输入营业执照"
+          placeholder="请输入登录账号"
           clearable
-          @keyup.enter.native="handleQuery"
+          @keyup.enter.native="handleQuery" />
-        />
       </el-form-item>
-      <el-form-item label="其它证照" prop="licenseOther">
+      <el-form-item label="营业执照" prop="license">
-        <el-input
-          v-model="queryParams.licenseOther"
-          placeholder="请输入其它证照信息"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="法人姓名" prop="legalPerson">
         <el-input
-          v-model="queryParams.legalPerson"
+          v-model="queryParams.license"
-          placeholder="请输入法人姓名"
+          placeholder="请输入营业执照"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -40,16 +31,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['business:userInfoBus:add']"
-        >新增</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -87,6 +68,7 @@
 
     <el-table v-loading="loading" :data="userInfoBusList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="登录账号" align="center" prop="account" />
       <el-table-column label="营业执照" align="center" prop="license" />
       <el-table-column label="其它证照信息" align="center" prop="licenseOther" />
       <el-table-column label="法人姓名" align="center" prop="legalPerson" />
@@ -94,12 +76,6 @@
       <el-table-column label="经营地址" align="center" prop="operateAddr" />
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleDetail(scope.row)"
-            >详情</el-button>
           <el-button
             size="mini"
             type="text"

src/views/business/userRegister/index.vue

@@ -92,7 +92,6 @@
     <el-table v-loading="loading" :data="userRegisterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="登录账号" align="center" prop="account" />
-      <el-table-column label="电话" align="center" prop="phone" />
       <el-table-column label="用户状态" align="center" prop="status" >
         <template slot-scope="scope">
           <el-tag type="primary" v-if="scope.row.status == '0'">发起</el-tag>
@@ -114,15 +113,22 @@
           <span v-if="scope.row.userLevel == '2'">商企用户</span>
         </template>
       </el-table-column>
+      <el-table-column label="联系电话" align="center" prop="phone" />
+      <el-table-column label="地址" align="center">
+        <template #default="scope">
+          <span v-if="scope.row.userType == '0'">{{ scope.row.addressInfo }}</span>
+          <span v-if="scope.row.userType == '1'">{{ scope.row.address }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-if="(scope.row.name == null && scope.row.userType == '0') || (scope.row.address == null && scope.row.userType == '1')"
+          <el-button v-if="(scope.row.addressInfo == '' && scope.row.userType == '0') || (scope.row.address == '' && scope.row.userType == '1')"
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-document-add"
             @click="handleAddInfo(scope.row)"
           >补充</el-button>
-          <el-button v-if="(scope.row.name != null && scope.row.userType == '0') || (scope.row.address != null && scope.row.userType == '1')"
+          <el-button v-if="(scope.row.addressInfo != '' && scope.row.userType == '0') || (scope.row.address != '' && scope.row.userType == '1')"
             size="mini"
             type="text"
               icon="el-icon-view"
@@ -142,6 +148,13 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:userRegister:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-refresh"
+            @click="passwordReset(scope.row)"
+            v-hasPermi="['business:userRegister:edit']"
+          >重置</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -183,12 +196,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="登录密码" prop="passwd">
-          <el-input v-model="form.passwd" show-password placeholder="请输入密码" />
-        </el-form-item>
-        <el-form-item label="确认密码" prop="passwd_re">
-          <el-input v-model="form.passwd_re" show-password placeholder="请再次输入密码" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -283,7 +290,7 @@
                 {{formDetail.userInfoVo.addr}}
               </el-form-item>
               <el-form-item label="联系电话：">
-                {{formDetail.phone}}
+                {{formDetail.userInfoVo.phone}}
               </el-form-item>
               <el-form-item label="用户类型：">
                 <template slot-scope="scope">
@@ -334,7 +341,16 @@
 </template>
 
 <script>
-import { listUserRegister, getUserRegister, delUserRegister, addUserRegister, updateUserRegister ,addUserInfo ,addUserInfoBus} from "@/api/business/userRegister";
+import {
+  listUserRegister,
+  getUserRegister,
+  delUserRegister,
+  addUserRegister,
+  updateUserRegister,
+  addUserInfo,
+  addUserInfoBus,
+  resetUserPassword
+} from "@/api/business/userRegister";
 
 export default {
   name: "UserRegister",
@@ -415,12 +431,6 @@ export default {
         userLevel: [
           { required: true, message: "用户级别不能为空", trigger: "change" }
         ],
-        passwd: [
-          { required: true, message: "登录密码不能为空", trigger: "change" }
-        ],
-        passwd_re: [
-          { required: true, message: "登录密码确认不能为空", trigger: "change" }
-        ],
         legalPerson: [
           { required: true, message: "法人姓名不能为空", trigger: "blur" }
         ],
@@ -430,6 +440,24 @@ export default {
         operateAddr: [
           { required: true, message: "经营地址不能为空", trigger: "blur" }
         ],
+        name: [
+          { required: true, message: "登录账号不能为空", trigger: "blur" }
+        ],
+        gender: [
+          { required: true, message: "登录账号不能为空", trigger: "blur" }
+        ],
+        idCard: [
+          { required: true, message: "登录账号不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "登录账号不能为空", trigger: "blur" }
+        ],
+        age: [
+          { required: true, message: "登录账号不能为空", trigger: "blur" }
+        ],
+        addr: [
+          { required: true, message: "登录账号不能为空", trigger: "blur" }
+        ],
       },
       options_userType: [{
         value: '0',
@@ -547,26 +575,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          if (this.form.passwd != this.form.passwd_re){
+          if (this.form.id != null) {
-            this.$modal.msgError("修改失败，两次输入的密码不同");
+            updateUserRegister(this.form).then(response => {
-          }else{
+              this.$modal.msgSuccess("修改成功");
-            if (this.form.id != null) {
+              this.open = false;
-              updateUserRegister(this.form).then(response => {
+              this.getList();
-                this.$modal.msgSuccess("修改成功");
+            }).finally(() => {
-                this.open = false;
+              this.buttonLoading = false;
-                this.getList();
+            });
-              }).finally(() => {
+          } else {
-                this.buttonLoading = false;
+            addUserRegister(this.form).then(response => {
-              });
+              this.$modal.msgSuccess("新增成功");
-            } else {
+              this.open = false;
-              addUserRegister(this.form).then(response => {
+              this.getList();
-                this.$modal.msgSuccess("新增成功");
+            }).finally(() => {
-                this.open = false;
+              this.buttonLoading = false;
-                this.getList();
+            });
-              }).finally(() => {
-                this.buttonLoading = false;
-              });
-            }
           }
         }
       });
@@ -631,6 +655,24 @@ export default {
         this.openInfoBus = true;
       }
       this.title = this.$t('business.userInfo.addTitle');
+    },
+
+    /**
+     * 密码重置
+     * @param row
+     */
+    passwordReset(row) {
+      this.$modal.confirm('是否确认重置登录密码？').then(() => {
+        this.loading = true;
+        return resetUserPassword(row.id);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("重置成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
     }
   }
 };