From 37dc67e9ff52bc9460aaf7899faa1142fded7d33 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 20 Sep 2023 14:23:32 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseManagement/caseList.vue | 85 +++++++---- .../caseManagement/components/payDialog.vue | 138 ++++++++++++++++++ .../components/trialincourtDialog.vue | 32 +++- src/views/payAll/payList.vue | 9 +- vue.config.js | 4 +- 5 files changed, 232 insertions(+), 36 deletions(-) create mode 100644 src/views/caseManagement/components/payDialog.vue diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index df7fb89..b556112 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -165,15 +165,18 @@ v-hasPermi="['monitor:online:forceLogout']" >立案审查 - 查看缴费 + + 缴费 + + + + @@ -319,14 +330,17 @@ import formateCourtDialog from "./components/formateCourtDialog.vue"; import courtReviewDialog from "./components/courtReviewDialog.vue"; import choosetrialmethodDaiog from "./components/choosetrialmethodDaiog.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 { caseApplicationDetail } from "@/api/pay/pay"; import { caseApply, removeCaseApply, submitCaseApply, selectCaseApply, } from "@/api/caseAccess/caseEntry"; + export default { name: "caseList", dicts: ["case_status"], @@ -337,7 +351,8 @@ export default { courtReviewDialog, choosetrialmethodDaiog, adjudicaterecordDialog, - trialincourtDialog + trialincourtDialog, + payDialog, }, data() { return { @@ -370,10 +385,13 @@ export default { showformateCourt: false, //组庭界面显示 showcourtReview: false, //组庭审核页面 showchoosetrialmethod: false, //选择仲裁方式页面 - choosetrialmethodata:{}, + choosetrialmethodata: {}, showadjudicaterecord: false, //书面审理弹框 - adjudicatename: {},//书面仲裁（被）申请人姓名 + adjudicatename: {}, //书面仲裁（被）申请人姓名 showtrialincourt: false, //开庭审理 + openPay: false, //缴费弹框 + payTitle: "", + payForm: {}, }; }, created() { @@ -491,10 +509,26 @@ export default { }) .catch(() => {}); }, - // 查看缴费 - viewpaymentRow(row) { - console.log(row, "查看缴费"); + // 取消缴费 + paycancelRow(row) { + this.openPay = false; }, + payStatus(val) { + this.getDetail({ id: val.id }); + this.openPay = true; + this.payTitle = "缴费"; + }, + getDetail(parms) { + caseApplicationDetail(parms).then((res) => { + if (res.data.caseStatus == 1) { + res.data.caseStatusName = "待缴费"; + } + this.form = res.data; + this.payForm.feePayable = res.data.feePayable; + this.payForm.caseId = res.data.id; + }); + }, + // 组庭 // formationcourtRow(row) { // console.log(row, "组庭"); @@ -535,7 +569,7 @@ export default { // console.log(row, "书面审理"); this.showadjudicaterecord = true; this.form = row; - this.getInfo(row) + this.getInfo(row); }, canceladjudicaterecord() { this.showadjudicaterecord = false; @@ -545,10 +579,10 @@ export default { console.log(row, "开庭审理"); this.showtrialincourt = true; this.form = row; - this.getInfo(row) + this.getInfo(row); }, canceltrialincourt() { - this.showtrialincourt = false; + this.showtrialincourt = false; }, // 生成裁决书 generateawardRow(row) { @@ -562,15 +596,14 @@ export default { getInfo(row) { const id = row.id; selectCaseApply({ id }).then((res) => { - console.log(res,'nnnnnnnnnnnn'); // this.visible = true; // this.formData = res.data; this.adjudicatename = { applicantName: res.data.applicantName, respondentName: res.data.respondentName, feePayable: res.data.feePayable, - hearDate: res.data.hearDate - } + hearDate: res.data.hearDate, + }; this.initpaymentArr = []; this.initpaymentArr1 = []; res.data.caseAffiliates.forEach((item) => { diff --git a/src/views/caseManagement/components/payDialog.vue b/src/views/caseManagement/components/payDialog.vue new file mode 100644 index 0000000..caafa71 --- /dev/null +++ b/src/views/caseManagement/components/payDialog.vue @@ -0,0 +1,138 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManagement/components/trialincourtDialog.vue b/src/views/caseManagement/components/trialincourtDialog.vue index 7fb2136..a4ecf95 100644 --- a/src/views/caseManagement/components/trialincourtDialog.vue +++ b/src/views/caseManagement/components/trialincourtDialog.vue @@ -125,7 +125,10 @@ - 发起会议 + 发起会议 + + 提交仲裁结果
\ No newline at end of file diff --git a/src/views/caseManagement/components/trialincourtDialog.vue b/src/views/caseManagement/components/trialincourtDialog.vue index e54bc8b..81c5a0e 100644 --- a/src/views/caseManagement/components/trialincourtDialog.vue +++ b/src/views/caseManagement/components/trialincourtDialog.vue @@ -147,11 +147,11 @@ @@ -168,11 +168,11 @@ @@ -189,11 +189,11 @@ @@ -210,11 +210,11 @@ @@ -231,11 +231,11 @@ diff --git a/vue.config.js b/vue.config.js index d1d3369..5b35050 100644 --- a/vue.config.js +++ b/vue.config.js @@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页 const port = process.env.port || process.env.npm_config_port || 80 // 端口 -const API = 'http://121.40.189.20:9001' //测试 -// const API = 'http://192.168.3.77:8080' //Q +// const API = 'http://121.40.189.20:9001' //测试 +const API = 'http://192.168.3.77:8080' //Q // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions From 22d43781c6f3e77f23d887bc403210bbfeaf1383 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 21 Sep 2023 09:40:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/caseManagement/caseManagement.js | 5 +- src/views/caseManagement/caseList.vue | 75 +++++++++++++------ .../components/adjudicaterecordDialog.vue | 23 +++--- .../caseManagement/components/batchDialog.vue | 4 +- .../components/caseentryDialog.vue | 5 +- .../components/choosetrialmethodDaiog.vue | 4 +- .../components/courtReviewDialog.vue | 4 +- .../components/formateCourtDialog.vue | 10 +-- 8 files changed, 79 insertions(+), 51 deletions(-) diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index 0fabfab..91cc84a 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -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, }); } // 组庭确认 diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 11517ac..ebdd200 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -147,6 +147,15 @@ v-hasPermi="['monitor:online:forceLogout']" >修改 + 提交 开庭审理 - 生成裁决书 + + 生成裁决书 + @@ -264,6 +275,7 @@ :visible="visible" @cancel="cancel" :form="form" + :queryParams="queryParams" :dialogtitle="dialogtitle" :getcaseApply="getcaseApply" :flag="flag" @@ -273,6 +285,7 @@ @@ -280,6 +293,7 @@ @@ -287,6 +301,7 @@ @@ -294,6 +309,7 @@ @@ -302,6 +318,7 @@ :showadjudicaterecord="showadjudicaterecord" :form="form" :adjudicatename="adjudicatename" + :queryParams="queryParams" @canceladjudicaterecord="canceladjudicaterecord" @getcaseApply="getcaseApply" > @@ -410,24 +427,21 @@ 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.getcaseApply(this.queryParams); + (this.queryParams.caseStatusList = [0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 16]), + this.getcaseApply(this.queryParams); }, // 案件录入 filingApplication() { @@ -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(() => {}); diff --git a/src/views/caseManagement/components/adjudicaterecordDialog.vue b/src/views/caseManagement/components/adjudicaterecordDialog.vue index f7582c0..8826f92 100644 --- a/src/views/caseManagement/components/adjudicaterecordDialog.vue +++ b/src/views/caseManagement/components/adjudicaterecordDialog.vue @@ -182,7 +182,7 @@ > @@ -203,7 +203,7 @@ > @@ -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) => {}); } diff --git a/src/views/caseManagement/components/batchDialog.vue b/src/views/caseManagement/components/batchDialog.vue index 4003ce0..6c4e79b 100644 --- a/src/views/caseManagement/components/batchDialog.vue +++ b/src/views/caseManagement/components/batchDialog.vue @@ -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); }, }, }; diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index 2809bae..b2440ec 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -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"); diff --git a/src/views/caseManagement/components/choosetrialmethodDaiog.vue b/src/views/caseManagement/components/choosetrialmethodDaiog.vue index 8e38a7d..d3c3c04 100644 --- a/src/views/caseManagement/components/choosetrialmethodDaiog.vue +++ b/src/views/caseManagement/components/choosetrialmethodDaiog.vue @@ -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) => {}); }, diff --git a/src/views/caseManagement/components/courtReviewDialog.vue b/src/views/caseManagement/components/courtReviewDialog.vue index b9cbb98..a5865b0 100644 --- a/src/views/caseManagement/components/courtReviewDialog.vue +++ b/src/views/caseManagement/components/courtReviewDialog.vue @@ -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) => {}); } diff --git a/src/views/caseManagement/components/formateCourtDialog.vue b/src/views/caseManagement/components/formateCourtDialog.vue index ebe9646..691b2d1 100644 --- a/src/views/caseManagement/components/formateCourtDialog.vue +++ b/src/views/caseManagement/components/formateCourtDialog.vue @@ -52,8 +52,8 @@ @@ -74,12 +74,12 @@ + + \ No newline at end of file From b16f7e1b9d6189a3484a7f1ae9a9daf6b8df2cfd Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 21 Sep 2023 13:55:30 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BB=B2=E8=A3=81?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=A1=B5=E9=9D=A2=E5=8F=8A=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseManagement/caseList.vue | 6 +++--- .../caseManagement/components/choosetrialmethodDaiog.vue | 6 +++--- vue.config.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 2e6c71d..245bca2 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -313,7 +313,7 @@ @cancelcourtReview="cancelcourtReview" @getcaseApply="getcaseApply" > - +