From 87ba33ff17ac90d35658c707a53f6a35833e31b4 Mon Sep 17 00:00:00 2001 From: fz Date: Thu, 30 Nov 2023 16:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=981130bug=E4=BF=AE=E6=94=B9=20git=20comm?= =?UTF-8?q?it=20-m=201130bug=E4=BF=AE=E6=94=B9=20git=20commit=20-m=20?= =?UTF-8?q?=E2=80=981130bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/caseManagement/caseManagement.js | 9 +- .../components/caseCompressionPackage.vue | 4 +- .../components/trialincourtDialog.vue | 199 +++++------------- .../components/viewprocessDialog.vue | 2 +- src/views/login.vue | 2 +- .../officialSeal/components/editTemplate.vue | 1 + src/views/register.vue | 2 +- 7 files changed, 66 insertions(+), 153 deletions(-) diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index a0a8db2..f13770b 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -129,5 +129,12 @@ export function selectCompareCase(data) { data: data, }) } - +// 根据案件id和类型查询附件 +export function attachListByCaseId(data) { + return request({ + url: "/video/attachListByCaseId", + method: "get", + params: data, + }) +} diff --git a/src/views/caseManagement/components/caseCompressionPackage.vue b/src/views/caseManagement/components/caseCompressionPackage.vue index dcf12e8..3d62917 100644 --- a/src/views/caseManagement/components/caseCompressionPackage.vue +++ b/src/views/caseManagement/components/caseCompressionPackage.vue @@ -44,7 +44,7 @@ :limit="1" accept=".zip" :headers="upload.headers" - :action="upload.url + '?updateSupport=' + upload.updateSupport" + :action="upload.url" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" @@ -93,7 +93,7 @@ export default { // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 - updateSupport: 0, + // updateSupport: 0, // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 diff --git a/src/views/caseManagement/components/trialincourtDialog.vue b/src/views/caseManagement/components/trialincourtDialog.vue index e514f51..8bebd28 100644 --- a/src/views/caseManagement/components/trialincourtDialog.vue +++ b/src/views/caseManagement/components/trialincourtDialog.vue @@ -129,21 +129,8 @@ 关 闭 - + -
确定 取 消
- + --> @@ -271,6 +165,7 @@ import { writtenHear, creatTrialRecord, document, + attachListByCaseId } from "@/api/caseManagement/caseManagement.js"; import { reserveConferenceList } from '@/api/meeting/index.js' export default { @@ -280,7 +175,6 @@ export default { formData: {}, user: "", userId:1, - showArbitrationresults: false, form2: {}, applicateArr: [], //申请人案件资料 quiltArr: [], //被申请人案件资料 @@ -378,47 +272,58 @@ export default { `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.roomId}` ); }, - // 提交仲裁结果 + // 生成庭申笔录 openArbitrationresults() { - this.showArbitrationresults = true; - }, - closeArbitrationresults() { - this.showArbitrationresults = false; + 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("生成成功"); + } + }) }, + // 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, + // }) + // .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/caseManagement/components/viewprocessDialog.vue b/src/views/caseManagement/components/viewprocessDialog.vue index 2d342d6..c243749 100644 --- a/src/views/caseManagement/components/viewprocessDialog.vue +++ b/src/views/caseManagement/components/viewprocessDialog.vue @@ -3,7 +3,7 @@
- +
diff --git a/src/views/login.vue b/src/views/login.vue index c431b21..6a3b354 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -56,7 +56,7 @@ diff --git a/src/views/officialSeal/components/editTemplate.vue b/src/views/officialSeal/components/editTemplate.vue index 624c383..e96acc5 100644 --- a/src/views/officialSeal/components/editTemplate.vue +++ b/src/views/officialSeal/components/editTemplate.vue @@ -60,6 +60,7 @@ export default { editData(val) { if (val) { this.ruleForm = val; + this.fileList = []; this.ruleForm.temType = this.ruleForm.temType + ''; } } diff --git a/src/views/register.vue b/src/views/register.vue index 89c8e31..4cbbc06 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -61,7 +61,7 @@
- Copyright © 2018-2023 Smart arbitration.vip All Rights Reserved. + Copyright © 2023 乙巢（上海）企业管理服务有限公司
-- 2.54.0