From f2be82b31a45300ddf89cf3f70b420ee20d62211 Mon Sep 17 00:00:00 2001 From: fz Date: Mon, 4 Dec 2023 10:03:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseManagement/caseList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 35265d8..3c5123d 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -849,6 +849,6 @@ export default { From 476c5a0b59e873f8edaea3b27889d013912f4fc2 Mon Sep 17 00:00:00 2001 From: fz Date: Tue, 5 Dec 2023 22:36:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BB=B2=E8=A3=81?= =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B,=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/awardManagement/awardManagement.js | 8 + src/api/officialSeal/officialSeal.js | 32 +++ .../components/paymentdetailsDialog.vue | 54 +++- src/views/awardManagement/listofAwards.vue | 27 +- src/views/caseManagement/caseList.vue | 4 +- .../components/trialincourtDialog.vue | 265 ++++++++++++------ src/views/index.vue | 22 +- .../officialSeal/components/addManager.vue | 94 +++++++ .../officialSeal/components/editManager.vue | 90 ++++++ src/views/officialSeal/templateManager.vue | 140 +++++++++ src/views/paymentManagement/paymentList.vue | 4 +- src/views/system/user/index.vue | 11 +- 12 files changed, 636 insertions(+), 115 deletions(-) create mode 100644 src/views/officialSeal/components/addManager.vue create mode 100644 src/views/officialSeal/components/editManager.vue create mode 100644 src/views/officialSeal/templateManager.vue diff --git a/src/api/awardManagement/awardManagement.js b/src/api/awardManagement/awardManagement.js index 9b07f60..5048759 100644 --- a/src/api/awardManagement/awardManagement.js +++ b/src/api/awardManagement/awardManagement.js @@ -131,3 +131,11 @@ export function emailByCaseId(data) { params: data }) } +// 仲裁员审核裁决书 +export function arbitratorCheckArbitrateRecord(data) { + return request({ + url: '/caseApplication/arbitrator/checkArbitrateRecord', + method: 'post', + data: data + }) +} diff --git a/src/api/officialSeal/officialSeal.js b/src/api/officialSeal/officialSeal.js index 47267c1..57c1eae 100644 --- a/src/api/officialSeal/officialSeal.js +++ b/src/api/officialSeal/officialSeal.js @@ -112,4 +112,36 @@ export function bindHandler(data) { method: 'get', params: data }) +} +// 查询模板 +export function getManagerList(data) { + return request({ + url: '/template/list', + method: 'get', + params: data + }) +} +// 新增模板 +export function insertManager(data) { + return request({ + url: '/template/insert', + method: 'post', + data: data + }) +} +// 删除模板 +export function deleteManager(data) { + return request({ + url: '/template/delete', + method: 'delete', + params: data + }) +} +// 修改模板 +export function updateManager(data) { + return request({ + url: '/template/update', + method: 'put', + data: data + }) } \ No newline at end of file diff --git a/src/views/awardManagement/components/paymentdetailsDialog.vue b/src/views/awardManagement/components/paymentdetailsDialog.vue index 22f663f..a6b8b3c 100644 --- a/src/views/awardManagement/components/paymentdetailsDialog.vue +++ b/src/views/awardManagement/components/paymentdetailsDialog.vue @@ -74,10 +74,11 @@ v-model="arbitrateRecord.verificaOpinion" /> --> - - - - + + + + @@ -94,6 +95,8 @@ 同 意 驳 回 提 交 + 同 意 + 驳 回 取 消 @@ -105,7 +108,8 @@ import { verificationArbitrateRecord, checkArbitrateRecord, adjudicationSignature, - regenerationDocument + regenerationDocument, + arbitratorCheckArbitrateRecord } from "@/api/awardManagement/awardManagement"; export default { props: ["openDialog", "title", "flag", "detailform"], @@ -116,7 +120,7 @@ export default { form: {}, arbitrateRecord: { // checkOpinion:"同意" - checkOpinion:"" + checkOpinion: "" }, // 表单校验 rules: { @@ -191,14 +195,14 @@ export default { (this.awardFileArr = []), //裁决书 (this.awardPathArr = []), //裁决书 // setTimeout(() => { - this.form = this.detailform; - // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){ - // this.form.arbitrateRecord.checkOpinion = '同意'; - this.arbitrateRecord.checkOpinion = ''; - // } - // this.arbitrateRecord = this.form.arbitrateRecord; - this.evidenceFile(this.form); - // }, 1000); + this.form = this.detailform; + // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){ + // this.form.arbitrateRecord.checkOpinion = '同意'; + this.arbitrateRecord.checkOpinion = ''; + // } + // this.arbitrateRecord = this.form.arbitrateRecord; + this.evidenceFile(this.form); + // }, 1000); } }, }, @@ -210,7 +214,7 @@ export default { this.applicantFileArr = []; this.applicantPathArr = []; this.respondentFileArr = []; - this.respondenPathArr = []; + this.respondenPathArr = []; this.awardFileArr = []; this.awardPathArr = []; this.bookFileArr = []; @@ -261,6 +265,14 @@ export default { this.$message("成功"); }); }, + // 仲裁员审核裁决书 + arbitratorCheckArbitrateRecordFn(parms) { + arbitratorCheckArbitrateRecord(parms).then((res) => { + this.cancel(); + this.$emit("updataList"); + this.$message("成功"); + }); + }, // 签名 adjudicationSignatureFn(parms) { adjudicationSignature(parms).then((res) => { @@ -308,6 +320,18 @@ export default { paramsData.arbitrateRecord = this.arbitrateRecord; paramsData.id = this.form.id this.getRegenerationDocument(paramsData) + } else if (parms == 5) { + this.arbitratorCheckArbitrateRecordFn({ + id: this.form.id, + agreeOrNotCheck: 1, + arbitrateRecord: this.arbitrateRecord, + }); + }else if (parms == 6) { + this.arbitratorCheckArbitrateRecordFn({ + id: this.form.id, + agreeOrNotCheck: 2, + arbitrateRecord: this.arbitrateRecord, + }); } } }); diff --git a/src/views/awardManagement/listofAwards.vue b/src/views/awardManagement/listofAwards.vue index 8f854cb..9b3bc7a 100644 --- a/src/views/awardManagement/listofAwards.vue +++ b/src/views/awardManagement/listofAwards.vue @@ -7,8 +7,8 @@ - + @@ -62,11 +62,14 @@ v-if="scope.row.filearbitraUrl && scope.row.filearbitraUrl !== ''" @click="showModel(scope.row, 0)">查看裁决书 核查 + v-if="scope.row.caseStatus == 11 && checkPermi(['awardManagement:list:secretarycheck'])" + @click="showModel(scope.row, 1)">秘书确认 + 仲裁员确认 确认裁决书 + @click="showModel(scope.row, 2)">部门长确认 签名 @@ -182,9 +185,9 @@ export default { this.caseStatus = res.data; let params = this.$route.params.status; if (params) { - this.queryParams.caseStatus = params; + this.queryParams.caseStatus = params + ''; } - this.queryParams.caseStatusList = [11, 12, 13, 14, 15, 16] + this.queryParams.caseStatusList = [11, 12, 13, 14, 15, 16, 18] this.getList(this.queryParams); }) // 裁决书列表不显示 生成裁决书 @@ -208,7 +211,7 @@ export default { } else if (type == 3) { this.operateTitle = '批量归档'; this.operateStatus = 3; - }else if (type == 5) { + } else if (type == 5) { this.operateTitle = '批量核查'; this.operateStatus = 5; } @@ -273,6 +276,12 @@ export default { window.open(url) }) break; + case 4: + this.getDetail({ id: row.id }); + this.openDialog = true; + this.title = "审核裁决书"; + this.flag = 4; + break; default: break; } @@ -339,7 +348,7 @@ export default { }, // 根据案件id查询邮件 emailByCaseIdFn(val) { - emailByCaseId({id: val}).then((res) => { + emailByCaseId({ id: val }).then((res) => { this.emailobj = res.data }) }, diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 5be93c0..f74a01c 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -17,8 +17,8 @@ - + diff --git a/src/views/caseManagement/components/trialincourtDialog.vue b/src/views/caseManagement/components/trialincourtDialog.vue index 8bebd28..45a7f91 100644 --- a/src/views/caseManagement/components/trialincourtDialog.vue +++ b/src/views/caseManagement/components/trialincourtDialog.vue @@ -110,16 +110,6 @@ - - -
{{ roomId }}
- - - - -
{{ startTime }}
- - 发起会议 @@ -129,8 +119,21 @@ 关 闭 - - - + + + 是 + 否 + + + + + + + + + + + + + + + + + + + + + +
确定 取 消
- --> + @@ -165,16 +289,16 @@ import { writtenHear, creatTrialRecord, document, - attachListByCaseId } from "@/api/caseManagement/caseManagement.js"; -import { reserveConferenceList } from '@/api/meeting/index.js' + export default { props: ["showtrialincourt", "adjudicatename", "form", "queryParams"], data() { return { formData: {}, user: "", - userId:1, + userId: 1, + showArbitrationresults: false, form2: {}, applicateArr: [], //申请人案件资料 quiltArr: [], //被申请人案件资料 @@ -182,15 +306,12 @@ export default { showsubmit: true, //生成庭审笔录，方可提交 annexName: "", //笔录文件名 annexPath: "", //笔录文件地址 - roomId:null, - startTime:"" }; }, watch: { showtrialincourt: { handler(val) { if (val) { - this.reserveConferenceListFn({caseId:this.form.id}); this.getUser(); this.formData = this.form; this.applicateArr = []; @@ -228,16 +349,9 @@ export default { }, }, created() { - + }, methods: { - // 根据案件id查询会议号 - reserveConferenceListFn(data){ - reserveConferenceList(data).then(res=>{ - this.roomId = res.data[0].roomId; - this.startTime = res.data[0].scheduleStartTime; - }) - }, // 详情显示，展示申请人案件文件 toFile(item, index) { window.open( @@ -262,7 +376,7 @@ export default { getUser() { getUserProfile().then((response) => { this.user = response.data.userName; - this.userId = response.data.userId; + this.userId = response.data.userId; }); }, // 打开会议 @@ -272,58 +386,53 @@ export default { `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.roomId}` ); }, - // 生成庭申笔录 + // 提交仲裁结果 openArbitrationresults() { - attachListByCaseId({ - caseAppliId:this.formData.id, - annexType:7 - }).then(res=>{ - console.log(res,"llllllll"); - if(res.data.length == 0){ - this.$modal.msgSuccess("请先进行会议"); - }else{ - this.recordArr = res.data; - this.$modal.msgSuccess("生成成功"); - } - }) + this.showArbitrationresults = true; + }, + closeArbitrationresults() { + this.showArbitrationresults = false; }, - // closeArbitrationresults() { - // this.showArbitrationresults = false; - // }, // 提交庭审笔录弹框结果 - // submitForm() { - // this.$refs["form2"].validate((valid) => { - // if (valid) { - // creatTrialRecord({ - // caseAppliId: this.formData.id, - // evidenDetermi: this.form2.evidenDetermi, - // factDetermi: this.form2.factDetermi, - // caseSketch: this.form2.caseSketch, - // arbitrateThink: this.form2.arbitrateThink, - // rulingFollows: this.form2.rulingFollows, - // isAbsence: this.form2.isAbsence, - // appliIsAbsen: this.form2.appliIsAbsen, - // responCrossOpin: this.form2.responCrossOpin, - // applicaCrossOpin: this.form2.applicaCrossOpin, - // responDefenOpini: this.form2.responDefenOpini, - // }) - // .then((res) => { - // res.data.caseAttachList.forEach((item) => { - // if (item.annexType == 7) { - // this.recordArr.push({ - // annexName: item.annexName, - // annexPath: item.annexPath, - // }); - // } - // }); - // this.$modal.msgSuccess("提交成功"); - // this.showsubmit = false; - // this.closeArbitrationresults(); - // }) - // .catch((err) => { }); - // } - // }); - // }, + submitForm() { + this.$refs["form2"].validate((valid) => { + if (valid) { + creatTrialRecord({ + caseAppliId: this.formData.id, + // evidenDetermi: this.form2.evidenDetermi, + // factDetermi: this.form2.factDetermi, + // caseSketch: this.form2.caseSketch, + // arbitrateThink: this.form2.arbitrateThink, + // rulingFollows: this.form2.rulingFollows, + // isAbsence: this.form2.isAbsence, + // appliIsAbsen: this.form2.appliIsAbsen, + // responCrossOpin: this.form2.responCrossOpin, + // applicaCrossOpin: this.form2.applicaCrossOpin, + // responDefenOpini: this.form2.responDefenOpini, + isAbsence: this.form2.isAbsence, + appliIsAbsen: this.form2.appliIsAbsen, + respondentOpinion: this.form2.respondentOpinion, + applicantOpinion: this.form2.applicaCrossOpin, + caseFacts: this.form2.caseFacts, + caseFocus: this.form2.caseFocus + }) + .then((res) => { + res.data.caseAttachList.forEach((item) => { + if (item.annexType == 7) { + this.recordArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); + } + }); + this.$modal.msgSuccess("提交成功"); + this.showsubmit = false; + this.closeArbitrationresults(); + }) + .catch((err) => { }); + } + }); + }, cancel() { this.$emit("canceltrialincourt"); }, diff --git a/src/views/index.vue b/src/views/index.vue index 76cf267..6adea49 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -113,6 +113,15 @@
待核验仲裁文书
+
+
{{ dataCount.caseApplyAwardCheck }}
+
+ +
+
+
待仲裁员核验仲裁文书
+
+
{{ dataCount.caseApplyAwardConfirm }}
@@ -131,12 +140,13 @@
待仲裁文书签名
-
+
{{ dataCount.caseApplyAwardSeal }}
+
待仲裁文书用印
@@ -185,11 +195,11 @@ export default { // 点击代办案件按钮 pushPage(status) { if (status == 0 || status == 1 || status == 2 || status == 5 || status == 6 || status == 7 || status == 31 || status == 8 || status == 9) { - this.$router.push({ name: 'CaseManagement/caseList', params: { status: status } }) - } else if (status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16) { - this.$router.push({ name: 'AwardManagement/listofAwards', params: { status: status } }) + this.$router.push({ name: 'CaseManagement/caseList', params: { status: status + '' } }) + } else if (status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16 || status == 18) { + this.$router.push({ name: 'AwardManagement/listofAwards', params: { status: status + '' } }) } else if (status == 3){ - this.$router.push({ name: 'PaymentManagement/paymentList', params: { status: status } }) + this.$router.push({ name: 'PaymentManagement/paymentList', params: { status: status + ''} }) } } // goTarget(href) { @@ -270,7 +280,7 @@ export default { } .imgTitle { - font-size: 20px; + font-size: 18px; font-weight: 600; } } diff --git a/src/views/officialSeal/components/addManager.vue b/src/views/officialSeal/components/addManager.vue new file mode 100644 index 0000000..d9396b6 --- /dev/null +++ b/src/views/officialSeal/components/addManager.vue @@ -0,0 +1,94 @@ + + + + \ No newline at end of file diff --git a/src/views/officialSeal/components/editManager.vue b/src/views/officialSeal/components/editManager.vue new file mode 100644 index 0000000..cf7db0b --- /dev/null +++ b/src/views/officialSeal/components/editManager.vue @@ -0,0 +1,90 @@ + + + + \ No newline at end of file diff --git a/src/views/officialSeal/templateManager.vue b/src/views/officialSeal/templateManager.vue new file mode 100644 index 0000000..f560b1e --- /dev/null +++ b/src/views/officialSeal/templateManager.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file diff --git a/src/views/paymentManagement/paymentList.vue b/src/views/paymentManagement/paymentList.vue index d209a42..d807d51 100644 --- a/src/views/paymentManagement/paymentList.vue +++ b/src/views/paymentManagement/paymentList.vue @@ -6,8 +6,8 @@ - + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9f388b3..b704d14 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -122,7 +122,12 @@ - + + + {{ node.label }} + + @@ -189,7 +194,7 @@ - + @@ -327,7 +332,7 @@ export default { { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' } ], email: [ - { + { required: true, message: '邮箱不能为空', trigger: 'blur',