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

解决代码冲突

Browse Source
This commit is contained in:
gyj
2024-05-08 17:13:06 +08:00
parent d4a850cf4b 888ecb02a5
commit f5d9d37514
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/caseList.vue
+7 -7
View File
@@ -51,7 +51,7 @@
v-hasPermi="['caseManagement:list:add']">案件录入</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="compressedPackages"
v-hasPermi="['caseManagement:list:zip']"
>案件压缩包导入</el-button>
>导入压缩包</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchApplication"
v-hasPermi="['caseManagement:list:import']">案件批量导入</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(2)"
@@ -117,13 +117,13 @@
<el-button size="mini" type="text" icon="el-icon-edit" @click="undoRow(scope.row,1)" v-if="(scope.row.updateSubmitStatus == 1 || scope.row.updateSubmitStatus == 3) && scope.row.caseStatus > 0 && checkPermi(['caseManagement:list:undo'])">撤销修改</el-button>
<el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="scope.row.caseStatus == 0 &&
checkPermi(['caseManagement:list:submit']) && btnStatus
">提交</el-button>
">提交案件</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteRow(scope.row)" v-if="scope.row.caseStatus == 0 &&
checkPermi(['caseManagement:list:delete']) && btnStatus
">删除</el-button> -->
<el-button size="mini" type="text" icon="el-icon-view" @click="filingreviewRow(scope.row)" v-if="scope.row.caseStatus == 1 &&
checkPermi(['caseManagement:list:check']) && btnStatus
">立案审查</el-button>
">审查案件</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)"
v-if="scope.row.caseStatus == 2" v-hasPermi="['caseManagement:list:pay']">缴费</el-button> -->
<el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)" v-if="scope.row.caseStatus == 2 &&
@@ -146,7 +146,7 @@
<el-button size="mini" type="text" icon="el-icon-s-check" @click="reviewRevocation(scope.row)" v-if="scope.row.updateSubmitStatus == 2 && checkPermi(['caseManagement:list:reviewRevocation'])">审核撤销</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="courtconfirmationRow(scope.row)" v-if="scope.row.caseStatus == 6 &&
checkPermi(['caseManagement:list:confirmgroup']) && btnStatus
">组庭确认</el-button>
">确认组庭</el-button>
<el-button size="mini" type="text" icon="el-icon-check" @click="courtreviewRow(scope.row)" v-if="scope.row.caseStatus == 5 &&
checkPermi(['caseManagement:list:checkgroup']) && btnStatus
">组庭审核</el-button>
@@ -167,12 +167,12 @@
@click="evidenceUpload(scope.row)">证据修改</el-button> -->
<el-button size="mini" type="text" icon="el-icon-edit" v-if="(scope.row.caseStatus < 10 && scope.row.caseStatus != 2 && scope.row.caseStatus != 0) &&
checkPermi(['caseManagement:list:evidenceUpdate']) && btnStatus"
@click="evidenceUpload(scope.row)">证据修改</el-button>
@click="evidenceUpload(scope.row)">修改证据</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 31 && btnStatus && checkPermi(['caseManagement:list:timer'])"
@click="timeUpdata(scope.row)">开庭时间</el-button>
@click="timeUpdata(scope.row)">设定开庭时间</el-button>
<el-button size="mini" type="text" icon="el-icon-lock"
v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 0 && btnStatus"
@click="lockClick(scope.row)">锁定</el-button>
@click="lockClick(scope.row)">锁定案件</el-button>
<el-button size="mini" type="text" icon="el-icon-unlock"
v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1 && btnStatus"
@click="ulockClick(scope.row)">解锁</el-button>
src/views/caseManagement/components/caseentryDialog.vue
-8
View File
@@ -320,7 +320,6 @@
<el-col :span="12">
<el-form-item label="姓名：" :prop="'paymentArr.' + index + '.nameAgent'" :rules="[
{
required: true,
message: '姓名不能为空',
trigger: 'blur',
},
@@ -332,7 +331,6 @@
<el-col :span="12">
<el-form-item label="身份证号：" :prop="'paymentArr.' + index + '.identityNumAgent'" :rules="[
{
required: true,
message: '身份证号不能为空',
trigger: 'blur',
},
@@ -349,7 +347,6 @@
<el-col :span="12">
<el-form-item label="联系电话：" :prop="'paymentArr.' + index + '.contactTelphoneAgent'" :rules="[
{
required: true,
message: '联系电话不能为空',
trigger: 'blur',
},
@@ -365,7 +362,6 @@
<el-col :span="12">
<el-form-item label="联系地址：" :prop="'paymentArr.' + index + '.contactAddressAgent'" :rules="[
{
required: true,
message: '联系地址不能为空',
trigger: 'blur',
},
@@ -547,7 +543,6 @@
<el-col :span="12">
<el-form-item label="姓名：" :prop="'paymentArr1.' + index + '.nameAgent'" :rules="[
{
required: true,
message: '姓名不能为空',
trigger: 'blur',
},
@@ -560,7 +555,6 @@
<!-- -->
<el-form-item label="身份证号：" :prop="'paymentArr1.' + index + '.identityNumAgent'" :rules="[
{
required: true,
message: '身份证号不能为空',
trigger: 'blur',
},
@@ -577,7 +571,6 @@
<el-col :span="12">
<el-form-item label="联系电话：" :prop="'paymentArr1.' + index + '.contactTelphoneAgent'" :rules="[
{
required: true,
message: '联系电话不能为空',
trigger: 'blur',
},
@@ -593,7 +586,6 @@
<el-col :span="12">
<el-form-item label="联系地址：" :prop="'paymentArr1.' + index + '.contactAddressAgent'" :rules="[
{
required: true,
message: '联系地址不能为空',
trigger: 'blur',
},