SH-Arbitrate/Mediation-Frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit was merged in pull request #52.
This commit is contained in:
hanchaobo
2024-02-23 15:18:28 +08:00
committed by Gitea
parent cde990a970 cd1856edc9
commit c4384eb208
11 changed files with 135 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/system/role.js
+8 -1
View File
@@ -8,7 +8,14 @@ export function listRole(query) {
params: query
})
}
// 查询角色列表
export function listRoleNotoken(query) {
return request({
url: '/weChatUser/roles',
method: 'get',
params: query
})
}
// 查询角色详细
export function getRole(roleId) {
return request({
src/views/caseManagement/caseList.vue
+1 -1
View File
@@ -53,7 +53,7 @@
<el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
<el-table-column label="申请人" align="center" prop="applicationName" :show-overflow-tooltip="true" />
<el-table-column label="被申请人" align="center" prop="respondentName" :show-overflow-tooltip="true" />
<el-table-column label="案件标的" align="center" prop="caseSubjectAmount" :show-overflow-tooltip="true" />
<!-- <el-table-column label="案件标的" align="center" prop="caseSubjectAmount" :show-overflow-tooltip="true" /> -->
<el-table-column label="调解员" align="center" prop="mediatorName" :show-overflow-tooltip="true" />
<el-table-column label="调解方式" align="center" prop="mediationMethodName" :show-overflow-tooltip="true" />
<el-table-column label="调解时间" align="center" prop="hearDate" :show-overflow-tooltip="true" />
src/views/caseManagement/components/addCase.vue
+2 -2
View File
@@ -213,7 +213,7 @@
<el-input v-model="formData.affiliate.applicationPhone" disabled placeholder="请输入申请人联系电话" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
<!-- <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
<el-form-item label="申请人电话" prop="affiliate.applicationPhone" :rules="[
{
required: true,
@@ -228,7 +228,7 @@
]">
<el-input v-model="formData.affiliate.applicationPhone" placeholder="请输入申请人联系电话" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
<el-form-item label="法定代表人" prop="affiliate.compLegalPerson" :rules="[
{
src/views/caseManagement/components/caseAcceptance.vue
+1 -1
View File
@@ -56,7 +56,7 @@ export default {
mediationMethod: 2,
paperFlag: 0,
arbitrateConfirm: 0,
agreeFlag: 0
agreeFlag: 1
},
};
},
src/views/caseManagement/components/mediation.vue
+3 -2
View File
@@ -113,12 +113,12 @@
'进入会议' }}</el-button>
<!-- v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" -->
<el-button @click="openArbitrationresults" type="primary"
v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'">确认会议结果</el-button>
v-if="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole">确认会议结果</el-button>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel" class="endbutton1" round>
<span>取 消</span>
</el-button>
<el-button v-if="isSecretaryRole" @click="submitMediation" :disabled="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'"
<el-button v-if="isSecretaryRole" @click="submitMediation" :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1'"
class="endbutton1" type="primary" round>
<span>提 交</span>
</el-button>
@@ -247,6 +247,7 @@ export default {
},
/**提交仲裁结果 */
openArbitrationresults() {
this.recordArr = [];
caseApplicationSelectById({
id: this.mediationData.id
}).then(res => {
src/views/caseManagement/components/payDialog.vue
+2 -2
View File
@@ -9,9 +9,9 @@
<el-descriptions-item label="申请人">{{
formPayDetailAffiliate.applicationName || ''
}}</el-descriptions-item>
<el-descriptions-item label="案件标的">{{
<!-- <el-descriptions-item label="案件标的">{{
formPayDetail.caseSubjectAmount
}}</el-descriptions-item>
}}</el-descriptions-item> -->
<el-descriptions-item label="申请人应缴费用">{{
formPayDetail.feePayable
}}</el-descriptions-item>
src/views/caseManagement/components/paymentdetailsDialog.vue
+2 -2
View File
@@ -5,9 +5,9 @@
<el-form-item label="案件编号：" prop="caseNum">
<el-input v-model="form.caseNum" placeholder="" :disabled="true"/>
</el-form-item>
<el-form-item label="案件标的：" prop="caseSubjectAmount">
<!-- <el-form-item label="案件标的：" prop="caseSubjectAmount">
<el-input v-model="form.caseSubjectAmount" :disabled="true"/>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="缴费人：" prop="applicantName">
<el-input v-model="form.applicationName" placeholder="" />
</el-form-item> -->
src/views/caseManagement/components/respondentPay.vue
+2 -2
View File
@@ -9,9 +9,9 @@
<el-descriptions-item label="申请人">{{
formResPay.applicationName || ''
}}</el-descriptions-item>
<el-descriptions-item label="案件标的">{{
<!-- <el-descriptions-item label="案件标的">{{
formResPayDetail.caseSubjectAmount
}}</el-descriptions-item>
}}</el-descriptions-item> -->
<el-descriptions-item label="被申请人应缴费用">{{
formResPayDetail.feePayable
}}</el-descriptions-item>
src/views/caseManagement/components/timeConfirm.vue
-12
View File
@@ -111,18 +111,6 @@ export default {
margin-right: 20px;
margin-bottom: 20px;
}
::v-deep .el-dialog__body {
height: 500px !important;
overflow: auto !important;
}
::v-deep .el-dialog {
width: 800px;
background: #ffffff;
border-radius: 20px;
}
.timeTitle {
width: 1000%;
text-align: center;
src/views/login.vue
+1 -1
View File
@@ -102,7 +102,7 @@ export default {
// 验证码开关
captchaEnabled: true,
// 注册开关
register: false,
register: true,
redirect: undefined
};
},
src/views/register.vue
+91 -48
View File
@@ -2,30 +2,20 @@
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<el-form-item prop="userName">
<el-input v-model="registerForm.userName" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input
v-model="registerForm.password"
type="password"
auto-complete="off"
placeholder="密码"
@keyup.enter.native="handleRegister"
>
<el-form-item prop="passWord">
<el-input v-model="registerForm.passWord" type="password" auto-complete="off" placeholder="密码"
@keyup.enter.native="handleRegister">
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="confirmPassword">
<el-input
v-model="registerForm.confirmPassword"
type="password"
auto-complete="off"
placeholder="确认密码"
@keyup.enter.native="handleRegister"
>
<el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码"
@keyup.enter.native="handleRegister">
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
@@ -44,17 +34,21 @@
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="roleId">
<el-select v-model="registerForm.roleId" placeholder="请选择角色" auto-complete="off" style="width: 100%;">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
<el-option v-for="item in roleList" :key="item.roleId" :label="item.roleName" :value="item.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="phone">
<el-input
v-model="registerForm.phone"
auto-complete="off"
placeholder="手机号"
style="width: 63%"
>
<el-input v-model="registerForm.phone" auto-complete="off" placeholder="手机号" style="width: 63%">
<svg-icon slot="prefix" icon-class="phone" class="el-input__icon input-icon" />
</el-input>
<div class="register-code">
<el-button type="primary" :disabled="codeDisabled" @click="getCodeNumber(registerForm.phone)">{{codeText}}</el-button>
<el-button type="primary" :disabled="codeDisabled" @click="getCodeNumber(registerForm.phone)">{{ codeText
}}</el-button>
</div>
</el-form-item>
<el-form-item prop="verifyCode">
@@ -63,27 +57,17 @@
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaEnabled">
<el-input
v-model="registerForm.code"
auto-complete="off"
placeholder="验证码"
style="width: 63%"
@keyup.enter.native="handleRegister"
>
<el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
@keyup.enter.native="handleRegister">
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
<div class="register-code">
<img :src="codeUrl" @click="getCode" class="register-code-img"/>
<img :src="codeUrl" @click="getCode" class="register-code-img" />
</div>
</el-form-item>
<el-form-item style="width:100%;">
<el-button
:loading="loading"
size="medium"
type="primary"
style="width:100%;"
@click.native.prevent="handleRegister"
>
<el-button :loading="loading" size="medium" type="primary" style="width:100%;"
@click.native.prevent="handleRegister">
<span v-if="!loading">注 册</span>
<span v-else>注 册 中...</span>
</el-button>
@@ -101,12 +85,12 @@
<script>
import { getCodeImg, register, sendCode, wxregister } from "@/api/login";
import { listRoleNotoken } from "@/api/system/role.js"
export default {
name: "Register",
data() {
const equalToPassword = (rule, value, callback) => {
if (this.registerForm.password !== value) {
if (this.registerForm.passWord !== value) {
callback(new Error("两次输入的密码不一致"));
} else {
callback();
@@ -114,12 +98,12 @@ export default {
};
return {
codeText: "发送验证码",
codeDisabled:false,
codeDisabled: false,
codeUrl: "",
registerForm: {
username: "",
password: "",
phone:"",
userName: "",
passWord: "",
phone: "",
confirmPassword: "",
code: "",
uuid: "",
@@ -137,16 +121,68 @@ export default {
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
{ required: true, validator: equalToPassword, trigger: "blur" }
],
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
code: [{ required: true, trigger: "change", message: "请输入验证码" }],
identityNo: [
{
required: true,
message: '被申请人身份证号不能为空',
trigger: 'blur',
},
{
pattern:
/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
message: '请输入正确的身份证号码',
trigger: 'blur',
},
],
email: [
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
{
pattern:
/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
message: '请输入正确的邮箱地址',
trigger: 'blur',
},
],
name: [
{ required: true, trigger: "blur", message: "请输入用户名" },
],
roleId: [
{ required: true, trigger: "blur", message: "请选择角色" },
],
phone: [
{
required: true,
message: '请输入手机号',
trigger: 'blur',
},
{
pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur',
},
],
verifyCode: [
{ required: true, trigger: "blur", message: "请输入验证码" },
],
},
loading: false,
captchaEnabled: true
captchaEnabled: true,
roleList: []
};
},
created() {
this.getCode();
this.getListRole();
},
methods: {
/**获取角色 */
getListRole() {
listRoleNotoken().then(res => {
console.log(res, "PPPPPPPPPPPPPPPPPPPPPPPPPPPP");
this.roleList = res.data;
})
},
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
@@ -167,7 +203,7 @@ export default {
type: 'success'
}).then(() => {
this.$router.push("/login");
}).catch(() => {});
}).catch(() => { });
}).catch(() => {
this.loading = false;
if (this.captchaEnabled) {
@@ -214,6 +250,7 @@ export default {
background-image: url("../assets/images/login-background.jpg");
background-size: cover;
}
.title {
margin: 0px auto 30px auto;
text-align: center;
@@ -226,6 +263,7 @@ export default {
width: 400px;
height: 90%;
padding: 25px 25px 5px 25px;
// .el-input {
// height: 38px;
// input {
@@ -238,20 +276,24 @@ export default {
margin-left: 2px;
}
}
.register-tip {
font-size: 13px;
text-align: center;
color: #bfbfbf;
}
.register-code {
width: 33%;
height: 38px;
float: right;
img {
cursor: pointer;
vertical-align: middle;
}
}
.el-register-footer {
height: 40px;
line-height: 40px;
@@ -264,6 +306,7 @@ export default {
font-size: 12px;
letter-spacing: 1px;
}
.register-code-img {
height: 38px;
}