Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

src/api/login.js

@@ -76,3 +76,11 @@ export function wxregister(data) {
 		data: data
 	})
 }
+// 检测用户名是否已经存在
+export function verifyUserName(data) {
+	return request({
+		url: '/weChatUser/verifyUserName',
+		method: 'get',
+		params:data
+	})
+}

src/views/caseManagement/caseList.vue

@@ -61,32 +61,19 @@
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <!-- <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button> -->
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
                         icon="el-icon-edit" v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
-                    <!-- <el-button size="mini" @click="consultantApplica(scope.row)" type="text" icon="el-icon-tickets">法律顾问用印申请</el-button> -->
-                    <!-- <el-button size="mini" @click="departmentApplica(scope.row)" type="text" icon="el-icon-edit-outline">部门长用印</el-button> -->
                     <el-button size="mini" @click="caseFlow(scope.row)" type="text" icon="el-icon-zoom-in">查看流程</el-button>
                     <el-button size="mini" @click="caseLog(scope.row)" type="text"
                         icon="el-icon-edit-outline">案件日志</el-button>
-                    <!-- <el-button size="mini" @click="paymentconfirmationRow(scope.row)" type="text" icon="el-icon-zoom-in">缴费确认</el-button> -->
-                    <!-- <el-button size="mini" @click="caseAccep(scope.row)" type="text" icon="el-icon-zoom-in">案件受理</el-button> -->
                     <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text"
                         icon="el-icon-edit">查看缴费单</el-button>
-                    <!-- <el-button size="mini" @click="caseFiling(scope.row)" type="text" icon="el-icon-tickets">案件归档</el-button> -->
-                    <!-- <el-button size="mini" @click="signMediation(scope.row)" type="text" icon="el-icon-edit-outline">申请人签收</el-button> -->
-                    <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']" v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 || scope.row.caseFlowId == 16 || scope.row.caseFlowId == 17" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button> -->
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="secretaryConfirm(scope.row)">秘书审核</el-button> -->
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="department(scope.row)">部门长审核</el-button> -->
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="timeConfirm(scope.row)">确认调解时间</el-button> -->
                     <el-button size="mini" type="text" icon="el-icon-tickets" v-for="(item) in buttonList" :key="item.id"
-                        @click="caseClick(scope.row,item.id)" v-if="item.id == scope.row.caseFlowId && checkPermi([item.buttonAuthFlag])">{{ item.nodeName }}</el-button>
+                        @click="caseClick(scope.row,item.id)" v-if="item.id == scope.row.caseFlowId && checkPermi([item.buttonAuthFlag]) && scope.row.signButtonFlag != 1">{{ item.nodeName }}</el-button>
                 </template>
             </el-table-column>
         </el-table>

src/views/caseManagement/components/payDialog.vue

@@ -57,8 +57,8 @@
       </div>
       <div class="payTitle">{{ payMain }}</div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="payCancel" class="endbutton" round><span>取 消</span></el-button>
+        <el-button @click="payCancel" round><span>取 消</span></el-button>
-        <el-button @click="submitUpload" class="endbutton" type="primary" round><span>确认缴费</span></el-button>
+        <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
       </div>
     </el-dialog>
   </div>
@@ -88,7 +88,8 @@ export default {
         payType:1,
         payOrderList:[],
         caseId:null
-      }
+      },
+      payFlagSubmit:true
     };
   },
   methods: {
@@ -112,6 +113,7 @@ export default {
         annexId: res.annexId,
         annexName:res.annexName
       });
+      this.payFlagSubmit = false;
     },
     submitUpload() {
       if (this.fileList.length < 1) {

src/views/caseManagement/components/respondentPay.vue

@@ -57,8 +57,8 @@
         </div>
         <div class="resPayTitle">{{ payMain }}</div>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="payCancel" class="endbutton" round><span>取 消</span></el-button>
+          <el-button @click="payCancel" round><span>取 消</span></el-button>
-          <el-button @click="submitUpload" class="endbutton" type="primary" round><span>确认缴费</span></el-button>
+          <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
         </div>
       </el-dialog>
     </div>
@@ -88,7 +88,8 @@
           payType:1,
           payOrderList:[],
           caseId:null
-        }
+        },
+        payFlagSubmit:true
       };
     },
     methods: {
@@ -112,6 +113,7 @@
           annexId: res.annexId,
           annexName:res.annexName
         });
+        this.payFlagSubmit = false;
       },
       submitUpload() {
         if (this.fileList.length < 1) {

src/views/register.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">智慧调解系统注册</h3>
       <el-form-item prop="userName">
-        <el-input v-model="registerForm.userName" type="text" auto-complete="off" placeholder="账号">
+        <el-input v-model="registerForm.userName" type="text" auto-complete="off" @blur="changeInput" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
@@ -77,14 +77,14 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-register-footer">
+    <!-- <div class="el-register-footer">
       <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
-import { getCodeImg, register, sendCode, wxregister } from "@/api/login";
+import { getCodeImg, register, sendCode, wxregister,verifyUserName } from "@/api/login";
 import { listRoleNotoken } from "@/api/system/role.js"
 export default {
   name: "Register",
@@ -109,9 +109,15 @@ export default {
         uuid: "",
       },
       registerRules: {
-        username: [
+        userName: [
           { required: true, trigger: "blur", message: "请输入您的账号" },
-          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' },
+          {
+            pattern:
+            /^[0-9a-zA-Z]*$/g,
+            message: '只能输入英文或者数字',
+            trigger: 'blur',
+          },
         ],
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" },
@@ -176,11 +182,14 @@ export default {
     this.getListRole();
   },
   methods: {
+    changeInput(){
+      verifyUserName({userName:this.registerForm.userName})
+    },
     /**获取角色 */
     getListRole() {
       listRoleNotoken().then(res => {
-        console.log(res, "PPPPPPPPPPPPPPPPPPPPPPPPPPPP");
+        const roleList = res.data.filter((item) => item.roleName == '申请人' || item.roleName == '被申请人');
-        this.roleList = res.data;
+        this.roleList = roleList;
       })
     },
     getCode() {
@@ -197,8 +206,8 @@ export default {
         if (valid) {
           this.loading = true;
           wxregister(this.registerForm).then(res => {
-            const username = this.registerForm.username;
+            const userName = this.registerForm.userName;
-            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
+            this.$alert("<font color='red'>恭喜你，您的账号 " + userName + " 注册成功！</font>", '系统提示', {
               dangerouslyUseHTMLString: true,
               type: 'success'
             }).then(() => {
@@ -246,7 +255,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 100%;
+  //height: 100%;
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
@@ -261,7 +270,7 @@ export default {
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
-  height: 90%;
+  height: 80%;
   padding: 25px 25px 5px 25px;
 
   // .el-input {