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 #30.
This commit is contained in:
hhlxayunmei
2023-09-21 09:42:33 +08:00
committed by Gitea
parent 70f5563f8f 22d43781c6
commit 4bb39e81f8
8 changed files with 79 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/caseManagement/caseManagement.js
+2 -3
View File
@@ -10,12 +10,11 @@ export function arbitrateMethod(data, id) {
});
}
// 书面审理
export function writtenHear(data, id) {
export function writtenHear(data) {
return request({
url: "/arbitrate/writtenHear",
method: "post",
params: data,
data: id,
data: data,
});
}
// 组庭确认
src/views/caseManagement/caseList.vue
+42 -15
View File
@@ -147,6 +147,15 @@
v-hasPermi="['monitor:online:forceLogout']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="onsubmitRow(scope.row)"
v-if="scope.row.caseStatus == 0"
v-hasPermi="['monitor:online:forceLogout']"
>提交</el-button
>
<el-button
size="mini"
type="text"
@@ -230,15 +239,17 @@
v-hasPermi="['monitor:online:forceLogout']"
>开庭审理</el-button
>
<el-popconfirm title="确定生成裁决书吗？" @confirm="generateawardRow(scope.row)">
<el-button
size="mini"
slot="reference"
type="text"
icon="el-icon-document"
@click="generateawardRow(scope.row)"
v-if="scope.row.caseStatus == 10"
v-hasPermi="['monitor:online:forceLogout']"
>生成裁决书</el-button
>
</el-popconfirm>
<el-button
size="mini"
type="text"
@@ -256,7 +267,7 @@
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getcaseApply"
@pagination="getcaseApply(queryParams)"
/>
<!-- 立案申请弹框 -->
@@ -264,6 +275,7 @@
:visible="visible"
@cancel="cancel"
:form="form"
:queryParams="queryParams"
:dialogtitle="dialogtitle"
:getcaseApply="getcaseApply"
:flag="flag"
@@ -273,6 +285,7 @@
<!-- 批量申请弹框 openbatch-->
<batchDialog
:openbatch="openbatch"
:queryParams="queryParams"
@cancelBatch="cancelBatch"
:getcaseApply="getcaseApply"
></batchDialog>
@@ -280,6 +293,7 @@
<formateCourtDialog
:showformateCourt="showformateCourt"
@cancelcourtDialog="cancelcourtDialog"
:queryParams="queryParams"
:formateCourtData="formateCourtData"
@getcaseApply="getcaseApply"
></formateCourtDialog>
@@ -287,6 +301,7 @@
<courtReviewDialog
:showcourtReview="showcourtReview"
:form="form"
:queryParams="queryParams"
@cancelcourtReview="cancelcourtReview"
@getcaseApply="getcaseApply"
></courtReviewDialog>
@@ -294,6 +309,7 @@
<choosetrialmethodDaiog
:showchoosetrialmethod="showchoosetrialmethod"
:choosetrialmethodata="choosetrialmethodata"
:queryParams="queryParams"
@getcaseApply="getcaseApply"
@cancelshowchoosetrialMethod="cancelshowchoosetrialMethod"
></choosetrialmethodDaiog>
@@ -302,6 +318,7 @@
:showadjudicaterecord="showadjudicaterecord"
:form="form"
:adjudicatename="adjudicatename"
:queryParams="queryParams"
@canceladjudicaterecord="canceladjudicaterecord"
@getcaseApply="getcaseApply"
></adjudicaterecordDialog>
@@ -410,23 +427,20 @@ export default {
this.loading = true;
caseApply(val).then((response) => {
this.dataList = response.rows;
// this.dataList.forEach((item) => {
// item.caseStatus = item.caseStatus == 0 ? "立案申请" : "待缴费";
// });
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.caseStatusList = []
this.queryParams.caseStatusList = [];
this.queryParams.pageNum = 1;
this.getcaseApply(this.queryParams);
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.caseStatusList = [0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 16],
(this.queryParams.caseStatusList = [0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 16]),
this.getcaseApply(this.queryParams);
},
// 案件录入
@@ -477,7 +491,7 @@ export default {
return submitCaseApply({ id: row.id });
})
.then(() => {
this.getcaseApply();
this.getcaseApply(this.queryParams);
this.$modal.msgSuccess("立案成功");
})
.catch(() => {});
@@ -498,20 +512,33 @@ export default {
this.dialogtitle = "立案修改";
this.getInfo(row);
},
// 立案审查
filingreviewRow(row) {
console.log(row, "立案审查");
// 列表提交立案
onsubmitRow(row) {
this.$modal
.confirm("确定提交案件数据吗？")
.confirm("是否提交立案申请？")
.then(function () {
return submitCaseApply({ id: row.id });
})
.then(() => {
this.getcaseApply();
this.$modal.msgSuccess("立案成功");
this.getcaseApply(this.queryParams);
this.$modal.msgSuccess("立案申请成功");
})
.catch(() => {});
},
// 立案审查
filingreviewRow(row) {
console.log(row, "立案审查");
// this.$modal
// .confirm("确定提交案件数据吗？")
// .then(function () {
// return submitCaseApply({ id: row.id });
// })
// .then(() => {
// this.getcaseApply(this.queryParams);
// this.$modal.msgSuccess("立案审查成功");
// })
// .catch(() => {});
},
// 取消缴费
paycancelRow(row) {
this.openPay = false;
@@ -627,7 +654,7 @@ export default {
return removeCaseApply({ id: row.id });
})
.then((res) => {
this.getcaseApply();
this.getcaseApply(this.queryParams);
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
src/views/caseManagement/components/adjudicaterecordDialog.vue
+10 -9
View File
@@ -286,7 +286,7 @@
import { writtenHear } from "@/api/caseManagement/caseManagement.js";
export default {
props: ["showadjudicaterecord", "form", "adjudicatename"],
props: ["showadjudicaterecord", "form", "adjudicatename", "queryParams"],
data() {
return {
formData: {},
@@ -307,17 +307,18 @@ export default {
submitForm() {
this.$refs["form2"].validate((valid) => {
if (valid) {
writtenHear(
{
accidentDescription: this.form2.accidentDescription,
arbitrationResult: this.form2.arbitrationResult,
},
{ id: this.formData.id }
)
writtenHear({
caseAppliId: this.formData.id,
evidenDetermi: this.form2.evidenDetermi,
factDetermi: this.form2.factDetermi,
caseSketch: this.form2.caseSketch,
arbitrateThink: this.form2.arbitrateThink,
rulingFollows: this.form2.rulingFollows,
})
.then((res) => {
this.$modal.msgSuccess("提交成功");
this.cancel();
this.$emit("getcaseApply");
this.$emit("getcaseApply",this.queryParams);
})
.catch((err) => {});
}
src/views/caseManagement/components/batchDialog.vue
+2 -2
View File
@@ -65,7 +65,7 @@
import { importTemplate } from "@/api/caseAccess/caseEntry";
import { getToken } from "@/utils/auth";
export default {
props: ["openbatch","getcaseApply"],
props: ["openbatch","getcaseApply","queryParams"],
data() {
return {
// key: value,
@@ -141,7 +141,7 @@ export default {
"导入结果",
{ dangerouslyUseHTMLString: true }
);
this.getcaseApply();
this.getcaseApply(this.queryParams);
},
},
};
src/views/caseManagement/components/caseentryDialog.vue
+3 -2
View File
@@ -540,6 +540,7 @@ export default {
"flag",
"initpaymentArr",
"initpaymentArr1",
"queryParams"
],
data() {
return {
@@ -755,7 +756,7 @@ export default {
}).then((res) => {
this.$modal.msgSuccess("修改成功");
this.$emit("cancel");
this.getcaseApply();
this.getcaseApply(this.queryParams);
});
} else {
addCaseApply({
@@ -764,7 +765,7 @@ export default {
}).then((response) => {
this.$modal.msgSuccess("新增成功");
this.$emit("cancel");
this.getcaseApply();
this.getcaseApply(this.queryParams);
});
}
// this.$emit("cancel");
src/views/caseManagement/components/choosetrialmethodDaiog.vue
+2 -2
View File
@@ -31,7 +31,7 @@
import { arbitrateMethod } from "@/api/caseManagement/caseManagement.js";
export default {
name: "showchoosetrialmethodDialog",
props: ["showchoosetrialmethod", "choosetrialmethodata"],
props: ["showchoosetrialmethod", "choosetrialmethodata", "queryParams"],
data() {
return {
radio: 2,
@@ -50,7 +50,7 @@ export default {
.then((res) => {
this.$modal.msgSuccess("提交成功");
this.cancel();
this.$emit("getcaseApply");
this.$emit("getcaseApply",this.queryParams);
})
.catch((err) => {});
},
src/views/caseManagement/components/courtReviewDialog.vue
+2 -2
View File
@@ -47,7 +47,7 @@ import { pendTralSure } from "@/api/caseManagement/caseManagement.js";
import moment from "moment";
export default {
name: "courtReviewDialog",
props: ["showcourtReview", "form"],
props: ["showcourtReview", "form", "queryParams"],
data() {
return {
hearDate: "",
@@ -68,7 +68,7 @@ export default {
.then((res) => {
this.$modal.msgSuccess("确认成功");
this.cancel();
this.$emit("getcaseApply");
this.$emit("getcaseApply",this.queryParams);
})
.catch((err) => {});
}
src/views/caseManagement/components/formateCourtDialog.vue
+5 -5
View File
@@ -52,8 +52,8 @@
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams1.pageNum"
:limit.sync="queryParams1.pageSize"
@pagination="getarbitrAtor"
v-if="isAgreePendTral == 0"
/>
@@ -74,12 +74,12 @@
<script>
import { arbitrAtor, pendTralCheck } from "@/api/formationCourt/formationCourt";
export default {
props: ["showformateCourt", "formateCourtData"],
props: ["showformateCourt", "formateCourtData", "queryParams"],
data() {
return {
dataList: [],
total: 0,
queryParams: {
queryParams1: {
pageNum: 1,
pageSize: 10,
},
@@ -127,7 +127,7 @@ export default {
pendTralCheck(this.paramsdata).then((res) => {
this.cancel();
this.$modal.msgSuccess("组庭成功");
this.$emit("getcaseApply");
this.$emit("getcaseApply",this.queryParams);
});
// }
},