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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj

Browse Source
This commit is contained in:
gyj
2024-05-28 09:30:42 +08:00
parent 04e10ea37f 83624ae5a2
commit 1f1da394d5
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/caseList.vue
+8 -6
View File
@@ -22,8 +22,8 @@
style="width: 240px" @keyup.enter.native="handleQuery" /> style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="caseTime"> <el-form-item label="创建时间" prop="caseTime">
<el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至" <el-date-picker v-model="caseTime" type="datetimerange" align="right" unlink-panels range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" :default-time="['00:00:00', '23:59:59']"
@change="caseTimeChange"> @change="caseTimeChange">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@@ -76,8 +76,8 @@
<el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
v-hasPermi="['caseManagement:list:evidenceEdit']" v-hasPermi="['caseManagement:list:evidenceEdit']"
v-if="scope.row.caseFlowId <= 9">上传证据</el-button> v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
<el-button size="mini" v-if="scope.row.mediationFileFlag==1" @click="mediationApplication(scope.row)" type="text" <el-button size="mini" v-if="scope.row.mediationFileFlag == 1"
icon="el-icon-edit-outline">调解书</el-button> @click="mediationApplication(scope.row)" type="text" icon="el-icon-edit-outline">调解书</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 || <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
scope.row.caseFlowId == 16 || scope.row.caseFlowId == 16 ||
scope.row.caseFlowId == 17 scope.row.caseFlowId == 17
@@ -143,7 +143,8 @@
:timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm> :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
<!-- 待调解 --> <!-- 待调解 -->
<mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable" <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
:mediationData="mediationData" @getList="getList" :queryParams="queryParams" :applicant="applicant"></mediation> :mediationData="mediationData" @getList="getList" :queryParams="queryParams" :applicant="applicant">
</mediation>
<confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable" <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
:confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation> :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
<!-- 归档详情 --> <!-- 归档详情 -->
@@ -151,7 +152,8 @@
@cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS"> @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS">
</caseFilingDetailsPage> </caseFilingDetailsPage>
<!-- 调解申请书 --> <!-- 调解申请书 -->
<mediationApplications :mediationAppVisable="mediationAppVisable" @cancelmediationApp="cancelmediationApp" :mediationLise="mediationLise"></mediationApplications> <mediationApplications :mediationAppVisable="mediationAppVisable" @cancelmediationApp="cancelmediationApp"
:mediationLise="mediationLise"></mediationApplications>
</div> </div>
</template> </template>
src/views/caseManagement/components/addCase.vue
+4
View File
@@ -1272,6 +1272,8 @@ export default {
this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType); this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.getUserInfoList.home);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.getUserInfoList.address);
if (this.formZipData.affiliate) { if (this.formZipData.affiliate) {
// this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0); // this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
@@ -1321,6 +1323,8 @@ export default {
this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null); this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null);
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null); this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null);
this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null); this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', null);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', null);
} }
} }
} }