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

Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

Browse Source
This commit was merged in pull request #34.
This commit is contained in:
hhlxayunmei
2023-09-21 16:07:21 +08:00
committed by Gitea
parent ac1614dcd1 5262a8f01d
commit d89f4f05da
8 changed files with 220 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/caseList.vue
+16 -9
View File
@@ -115,7 +115,11 @@
prop="hearDate" prop="hearDate"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="案件状态" align="center" prop="caseStatusName" /> <el-table-column label="案件状态" align="center" prop="caseStatusName">
<template slot-scope="scope">
<el-tag type="success">{{ scope.row.caseStatusName }}</el-tag>
</template>
</el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@@ -239,7 +243,10 @@
v-hasPermi="['monitor:online:forceLogout']" v-hasPermi="['monitor:online:forceLogout']"
>开庭审理</el-button >开庭审理</el-button
> >
<el-popconfirm title="确定生成裁决书吗？" @confirm="generateawardRow(scope.row)"> <el-popconfirm
title="确定生成裁决书吗？"
@confirm="generateawardRow(scope.row)"
>
<el-button <el-button
size="mini" size="mini"
slot="reference" slot="reference"
@@ -291,11 +298,11 @@
></batchDialog> ></batchDialog>
<!-- 立案审查页面 --> <!-- 立案审查页面 -->
<filingreviewDialog <filingreviewDialog
:showfilingreview="showfilingreview" :showfilingreview="showfilingreview"
:filingreviewdata="filingreviewdata" :filingreviewdata="filingreviewdata"
:queryParams="queryParams" :queryParams="queryParams"
@getcaseApply="getcaseApply" @getcaseApply="getcaseApply"
@cancelFilingreview="cancelFilingreview" @cancelFilingreview="cancelFilingreview"
></filingreviewDialog> ></filingreviewDialog>
<!-- 组庭页面---改为组庭审核 --> <!-- 组庭页面---改为组庭审核 -->
<formateCourtDialog <formateCourtDialog
@@ -357,7 +364,7 @@ import choosetrialmethodDaiog from "./components/choosetrialmethodDaiog.vue";
import adjudicaterecordDialog from "./components/adjudicaterecordDialog.vue"; import adjudicaterecordDialog from "./components/adjudicaterecordDialog.vue";
import trialincourtDialog from "./components/trialincourtDialog.vue"; import trialincourtDialog from "./components/trialincourtDialog.vue";
import payDialog from "./components/payDialog.vue"; import payDialog from "./components/payDialog.vue";
import filingreviewDialog from './components/filingreviewDialog.vue'; import filingreviewDialog from "./components/filingreviewDialog.vue";
import { caseApplicationDetail } from "@/api/pay/pay"; import { caseApplicationDetail } from "@/api/pay/pay";
import { import {
@@ -379,7 +386,7 @@ export default {
adjudicaterecordDialog, adjudicaterecordDialog,
trialincourtDialog, trialincourtDialog,
payDialog, payDialog,
filingreviewDialog filingreviewDialog,
}, },
data() { data() {
return { return {
src/views/caseManagement/components/batchDialog.vue
+37 -2
View File
@@ -7,6 +7,7 @@
width="600px" width="600px"
append-to-body append-to-body
@close="cancel" @close="cancel"
center
> >
<el-form ref="form" :model="form" :rules="rules" label-width="150px"> <el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-row> <el-row>
@@ -54,8 +55,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm" class="endbutton"><span>确 定</span></el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -156,4 +157,38 @@ export default {
} }
} }
} }
::v-deep .el-dialog {
width: 800px;
background: #ffffff;
border-radius: 20px;
}
.endbutton {
width: 154px;
height: 37px;
background: #0072ff;
border-radius: 19px;
span {
width: 96px;
height: 15px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
}
}
.endbutton1 {
width: 154px;
height: 37px;
background: #ffffff;
border: 1px solid #d0d0d0;
border-radius: 19px;
span {
width: 31px;
height: 13px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #959595;
}
}
</style> </style>
src/views/caseManagement/components/caseentryDialog.vue
+38 -3
View File
@@ -7,6 +7,7 @@
width="1000px" width="1000px"
append-to-body append-to-body
:destroy-on-close= true :destroy-on-close= true
center
> >
<!-- 案件信息 --> <!-- 案件信息 -->
<el-form <el-form
@@ -519,10 +520,10 @@
>新增被申请人主体信息</el-button >新增被申请人主体信息</el-button
> >
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" v-if="flag != 0" <el-button type="primary" @click="submitForm" v-if="flag != 0" class="endbutton"
>确 定</el-button ><span>确 定</span></el-button
> >
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -786,4 +787,38 @@ export default {
height: 700px !important; height: 700px !important;
overflow: auto !important; overflow: auto !important;
} }
::v-deep .el-dialog {
width: 800px;
background: #ffffff;
border-radius: 20px;
}
.endbutton {
width: 154px;
height: 37px;
background: #0072ff;
border-radius: 19px;
span {
width: 96px;
height: 15px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
}
}
.endbutton1 {
width: 154px;
height: 37px;
background: #ffffff;
border: 1px solid #d0d0d0;
border-radius: 19px;
span {
width: 31px;
height: 13px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #959595;
}
}
</style> </style>
src/views/caseManagement/components/formateCourtDialog.vue
+42 -4
View File
@@ -4,9 +4,9 @@
<el-dialog <el-dialog
title="组庭审核" title="组庭审核"
:visible="showformateCourt" :visible="showformateCourt"
width="800px"
@close="cancel" @close="cancel"
:destroy-on-close="true" :destroy-on-close="true"
center
> >
<el-form label-width="150px"> <el-form label-width="150px">
<el-form-item label="是否同意组庭："> <el-form-item label="是否同意组庭：">
@@ -63,9 +63,12 @@
type="primary" type="primary"
@click="submitForm" @click="submitForm"
:disabled="!this.arbitrators.length > 0 && isAgreePendTral == 0" :disabled="!this.arbitrators.length > 0 && isAgreePendTral == 0"
>确 定</el-button class="endbutton"
><span>确 定</span></el-button
>
<el-button @click="cancel" class="endbutton1"
><span>取 消</span></el-button
> >
<el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -127,7 +130,7 @@ export default {
pendTralCheck(this.paramsdata).then((res) => { pendTralCheck(this.paramsdata).then((res) => {
this.cancel(); this.cancel();
this.$modal.msgSuccess("组庭成功"); this.$modal.msgSuccess("组庭成功");
this.$emit("getcaseApply",this.queryParams); this.$emit("getcaseApply", this.queryParams);
}); });
// } // }
}, },
@@ -141,4 +144,39 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-dialog {
width: 422px;
height: 245px;
background: #ffffff;
border-radius: 20px;
}
.endbutton {
width: 124px;
height: 37px;
background: #0072ff;
border-radius: 19px;
span {
width: 32px;
height: 15px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
}
}
.endbutton1 {
width: 124px;
height: 37px;
background: #ffffff;
border: 1px solid #d0d0d0;
border-radius: 19px;
span {
width: 31px;
height: 13px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #959595;
}
}
</style> </style>
src/views/caseManagement/components/payDialog.vue
+22 -1
View File
@@ -7,6 +7,7 @@
width="800px" width="800px"
append-to-body append-to-body
:destroy-on-close="true" :destroy-on-close="true"
center
> >
<el-descriptions title="订单信息"> <el-descriptions title="订单信息">
<el-descriptions-item label="案件编号：">{{ <el-descriptions-item label="案件编号：">{{
@@ -41,7 +42,7 @@
</div> </div>
<div class="payTitle">{{ payMain }}</div> <div class="payTitle">{{ payMain }}</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="payCancel">取 消</el-button> <el-button @click="payCancel" class="endbutton"><span>取 消</span></el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -135,4 +136,24 @@ export default {
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
::v-deep .el-dialog {
width: 800px;
background: #ffffff;
border-radius: 20px;
}
.endbutton {
width: 154px;
height: 37px;
background: #ffffff;
border: 1px solid #d0d0d0;
border-radius: 19px;
span {
width: 31px;
height: 13px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #959595;
}
}
</style> </style>
src/views/caseManagement/components/trialincourtDialog.vue
+15 -9
View File
@@ -128,7 +128,9 @@
>发起会议 >发起会议
<!-- <iframe src="http://47.97.117.253:9005/#/">发起会议</iframe> --> <!-- <iframe src="http://47.97.117.253:9005/#/">发起会议</iframe> -->
</el-button> </el-button>
<el-button @click="openArbitrationresults" type="primary">提交仲裁结果</el-button> <el-button @click="openArbitrationresults" type="primary"
>提交仲裁结果</el-button
>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<!-- <el-button @click="submitForm" class="endbutton" <!-- <el-button @click="submitForm" class="endbutton"
><span>结束审理</span></el-button ><span>结束审理</span></el-button
@@ -139,9 +141,10 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="仲裁结果" title="提交仲裁结果"
:visible="showArbitrationresults" :visible="showArbitrationresults"
@close="closeArbitrationresults" @close="closeArbitrationresults"
center
> >
<el-form ref="form2" :model="form2" label-width="150px"> <el-form ref="form2" :model="form2" label-width="150px">
<el-col :span="24"> <el-col :span="24">
@@ -251,8 +254,12 @@
</el-col> </el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="submitForm">提交</el-button> <el-button @click="submitForm" class="endbutton">
<el-button @click="closeArbitrationresults">取 消</el-button> <span>提交仲裁结果</span></el-button
>
<el-button @click="closeArbitrationresults" class="endbutton1"
><span>取 消</span></el-button
>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -322,22 +329,22 @@ export default {
.endbutton { .endbutton {
width: 154px; width: 154px;
height: 37px; height: 37px;
background: #ff5a00; background: #0072ff;
border-radius: 19px; border-radius: 19px;
span { span {
width: 65px; width: 96px;
height: 16px; height: 15px;
font-size: 16px; font-size: 16px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #ffffff; color: #ffffff;
// line-height: 48px;
} }
} }
.endbutton1 { .endbutton1 {
width: 154px; width: 154px;
height: 37px; height: 37px;
background: #ffffff; background: #ffffff;
border: 1px solid #d0d0d0;
border-radius: 19px; border-radius: 19px;
span { span {
width: 31px; width: 31px;
@@ -346,7 +353,6 @@ export default {
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #959595; color: #959595;
// line-height: 48px;
} }
} }
</style> </style>
src/views/paymentManagement/components/paymentdetailsDialog.vue
+39 -3
View File
@@ -6,6 +6,7 @@
width="800px" width="800px"
@close="cancel" @close="cancel"
:destroy-on-close="true" :destroy-on-close="true"
center
> >
<el-form ref="form" :model="form" label-width="150px" :disabled="true"> <el-form ref="form" :model="form" label-width="150px" :disabled="true">
<el-form-item label="案件编号：" prop="caseNum"> <el-form-item label="案件编号：" prop="caseNum">
@@ -36,10 +37,10 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" v-if="flag == 0" <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton"
>提 交</el-button >确认已缴费</el-button
> >
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel" class="endbutton1">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -76,4 +77,39 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-dialog {
width: 800px;
background: #ffffff;
border-radius: 20px;
}
.endbutton {
width: 124px;
height: 37px;
background: #0072ff;
border-radius: 19px;
span {
width: 32px;
height: 15px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
// line-height: 48px;
}
}
.endbutton1 {
width: 124px;
height: 37px;
background: #ffffff;
border: 1px solid #d0d0d0;
border-radius: 19px;
span {
width: 31px;
height: 13px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #959595;
}
}
</style> </style>
src/views/paymentManagement/paymentList.vue
+11 -6
View File
@@ -15,7 +15,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="案件状态" prop="caseStatus"> <!-- <el-form-item label="案件状态" prop="caseStatus">
<el-select <el-select
v-model="queryParams.caseStatus" v-model="queryParams.caseStatus"
placeholder="请选择案件状态" placeholder="请选择案件状态"
@@ -29,10 +29,10 @@
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="开庭日期" prop="hearDate"> <el-form-item label="立案日期" prop="registerDate">
<el-date-picker <el-date-picker
v-model="queryParams.hearDate" v-model="queryParams.registerDate"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
@@ -79,8 +79,12 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- 缴费人 --> <!-- 缴费人 -->
<el-table-column label="缴费人" align="center" prop="caseArbitrator" /> <!-- <el-table-column label="缴费人" align="center" prop="caseArbitrator" /> -->
<el-table-column label="缴费状态" align="center" prop="caseStatus" /> <el-table-column label="案件状态" align="center" prop="caseStatusName">
<template slot-scope="scope">
<el-tag type="warning">{{ scope.row.caseStatusName }}</el-tag>
</template>
</el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@@ -141,6 +145,7 @@ export default {
queryParams: { queryParams: {
caseNum: undefined, caseNum: undefined,
pageNum: 1, pageNum: 1,
caseStatusList: [3],
registerDate: "", registerDate: "",
pageSize: 10, pageSize: 10,
}, },