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

解决冲突更改 #119

Merged
gaogaoyujie merged 2 commits from gyj into dev 2024-05-06 08:01:24 +00:00
Conversation 0 Commits 2 Files Changed 4
+29 -27
4 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/caseList.vue
+3 -1
View File
@@ -287,7 +287,9 @@ export default {
};
},
created() {
this.queryParams.caseNum = this.$route.query.caseNum;
// this.queryParams.caseNum = this.$route.query.caseNum;
this.$set(this.queryParams,"caseNum",this.$route.query.caseNum);
console.log(this.$route.query)
if (this.$route.query.token) {
this.queryDisable = true;
} else {
src/views/caseManagement/components/addCase.vue
+24 -24
View File
@@ -330,28 +330,28 @@
<el-divider></el-divider>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 1">
<el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[
{
required: true,
message: '代理人联系电话不能为空',
trigger: 'blur',
},
{
pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur',
},
]">
<el-form-item v-if="addModifyData==2 && !item.applicantAgent.phone?false:true" label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[
{
required: true,
message: '代理人联系电话不能为空',
trigger: 'blur',
},
{
pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur',
},
]">
<el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
<el-form-item v-if="addModifyData==2 && !item.applicantAgent.phone?false:true" label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
<el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 1">
<el-form-item label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
<el-form-item v-if="addModifyData==2 && !item.applicantAgent.name?false:true" label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
{
required: true,
message: '代理人姓名不能为空',
@@ -362,12 +362,12 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
<el-form-item v-if="addModifyData==2 && !item.applicantAgent.name?false:true" label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
<el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'">
<el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'">
<el-select v-model="item.applicantAgent.operatorFlag" placeholder="请选择" auto-complete="off"
style="width: 100%;">
<el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
@@ -377,7 +377,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 1">
<el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
<el-form-item v-if="addModifyData==2 && !item.applicantAgent.email?false:true" label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
{
required: true,
message: '代理人邮箱不能为空',
@@ -394,7 +394,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
<el-form-item v-if="addModifyData==2 && !item.applicantAgent.email?false:true" label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
{
pattern:
/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -614,7 +614,7 @@
<el-divider></el-divider>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
<el-form-item v-if="addModifyData==2 && !item.resAgent.phone?false:true" label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
{
required: true,
message: '代理人联系电话不能为空',
@@ -630,12 +630,12 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
<el-form-item v-if="addModifyData==2 && !item.resAgent.phone?false:true" label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
<el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
<el-form-item v-if="addModifyData==2 && !item.resAgent.name?false:true" label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
{
required: true,
message: '代理人姓名不能为空',
@@ -656,12 +656,12 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
<el-form-item v-if="addModifyData==2 && !item.resAgent.name?false:true" label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
<el-input v-model="item.resAgent.name" placeholder="请输入代理人姓名" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
<el-form-item v-if="addModifyData==2 && !item.resAgent.email?false:true" label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
{
required: true,
message: '代理人邮箱不能为空',
@@ -678,7 +678,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
<el-form-item v-if="addModifyData==2 && !item.resAgent.email?false:true" label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
{
pattern:
/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
src/views/login.vue
+1 -1
View File
@@ -124,7 +124,7 @@
<!-- 底部 -->
<div class="el-login-footer">
<div>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</div>
<div>Version：1.1.0</div>
<div>Version：1.1.2</div>
</div>
</div>
</template>
vue.config.js
+1 -1
View File
@@ -15,7 +15,7 @@ const API = 'http://121.40.189.20:7001' //生产
// const API = 'http://121.40.189.20:6001' //测试
// const API = 'http://192.168.3.18:6001' //B
// const API = 'http://172.16.0.237:6001' //Q
// const API = 'http://172.16.1.26:6001' //w
// const API = 'http://172.16.1.26:7001' //w
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions