diff --git a/src/api/awardManagement/awardManagement.js b/src/api/awardManagement/awardManagement.js index a5cea42..e5bfeca 100644 --- a/src/api/awardManagement/awardManagement.js +++ b/src/api/awardManagement/awardManagement.js @@ -105,4 +105,12 @@ export function selectSealUrl(data) { method: 'post', data: data }) +} +// 裁决书列表查询裁决书 +export function selectSignSealUrl(data) { + return request({ + url: '/caseApplication/selectSignSealUrl', + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index 5fa194a..8bb9696 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -17,6 +17,14 @@ export function writtenHear(data) { data: data, }); } +// 生成庭审笔录 +export function creatTrialRecord(data) { + return request({ + url: "/caseApplication/creatTrialRecord", + method: "post", + data: data, + }); +} // 组庭确认 export function pendTralSure(data) { return request({ diff --git a/src/router/index.js b/src/router/index.js index 9968234..9ed9477 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -65,14 +65,14 @@ export const constantRoutes = [ path: '', component: Layout, redirect: 'index', - children: [ - { - path: 'index', - component: () => import('@/views/index'), - name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } - } - ] + // children: [ + // { + // path: 'index', + // component: () => import('@/views/index'), + // name: 'Index', + // meta: { title: '首页', icon: 'dashboard', affix: true } + // } + // ] }, { path: '/user', diff --git a/src/views/awardManagement/listofAwards.vue b/src/views/awardManagement/listofAwards.vue index e591183..19296ac 100644 --- a/src/views/awardManagement/listofAwards.vue +++ b/src/views/awardManagement/listofAwards.vue @@ -90,7 +90,8 @@ import { adjudicationCaseFile, adjudicationStamp, selectSignUrl, - selectSealUrl + selectSealUrl, + selectSignSealUrl } from "@/api/awardManagement/awardManagement"; import paymentdetailsDialog from "./components/paymentdetailsDialog.vue"; import mailawardDialog from './components/MailawardDialog.vue'; @@ -168,8 +169,10 @@ export default { switch (type) { case 0: - let url = row.filearbitraUrl; - window.open(url) + selectSignSealUrl({ id: row.id }).then(res => { + let url = res.data.filearbitraUrl; + window.open(url) + }) break; case 1: this.getDetail({ id: row.id }); diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 285a6a6..5d8a7c8 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -280,7 +280,7 @@ " >开庭审理 - 生成裁决书 - @@ -718,22 +709,22 @@ export default { canceltrialincourt() { this.showtrialincourt = false; }, - // 生成裁决书 - generateawardRow(row) { - console.log(row, "生成裁决书"); - this.$modal - .confirm("确定生成裁决书吗？") - .then(function () { - return document({ id: row.id }); - }) - .then((res) => { - if (res.code == 200) { - this.getcaseApply(this.queryParams); - this.$modal.msgSuccess("裁决书生成成功"); - } - }) - .catch(() => {}); - }, + // 生成裁决书 2023.10.15裁决书生成为自动，已合并如庭审提交 + // generateawardRow(row) { + // console.log(row, "生成裁决书"); + // this.$modal + // .confirm("确定生成裁决书吗？") + // .then(function () { + // return document({ id: row.id }); + // }) + // .then((res) => { + // if (res.code == 200) { + // this.getcaseApply(this.queryParams); + // this.$modal.msgSuccess("裁决书生成成功"); + // } + // }) + // .catch(() => {}); + // }, // 归档 fileRow(row) { console.log(row, "归档"); diff --git a/src/views/caseManagement/components/adjudicaterecordDialog.vue b/src/views/caseManagement/components/adjudicaterecordDialog.vue index 72441fb..1170799 100644 --- a/src/views/caseManagement/components/adjudicaterecordDialog.vue +++ b/src/views/caseManagement/components/adjudicaterecordDialog.vue @@ -13,7 +13,7 @@ label-width="180px" :disabled="true" > -

案件信息：

+
案件信息：
@@ -299,7 +299,7 @@
- 提交庭审笔录 + 提交仲裁结果 取 消
@@ -395,4 +395,8 @@ export default { background: #ffffff; border-radius: 20px; } +.caseInfo { + font-size: 17px; + font-weight: 600; +} \ No newline at end of file diff --git a/src/views/caseManagement/components/trialincourtDialog.vue b/src/views/caseManagement/components/trialincourtDialog.vue index 9b483ba..ecfe162 100644 --- a/src/views/caseManagement/components/trialincourtDialog.vue +++ b/src/views/caseManagement/components/trialincourtDialog.vue @@ -12,7 +12,7 @@ label-width="180px" :disabled="true" > -

案件信息：

+
案件信息：
@@ -124,52 +124,59 @@ --> - -
申请人暂未提供证据！
-
- - {{ item.annexName }} - -
- + +
申请人暂未提供证据！
+
+ + {{ item.annexName }} + +
+ - +
被申请人暂未提供证据！
- + - + + +
+ {{ item.annexName }} +
+ + + - 发起会议 - - - 发起会议 + 生成庭审笔录 -
- - 提交庭审笔录 +
+ 提交 关 闭
- 提交确定 取 消 import { getUserProfile } from "@/api/system/user"; -import { writtenHear } from "@/api/caseManagement/caseManagement.js"; +import { + writtenHear, + creatTrialRecord, + document, +} from "@/api/caseManagement/caseManagement.js"; export default { props: ["showtrialincourt", "adjudicatename", "form", "queryParams"], @@ -305,33 +316,49 @@ export default { user: "", showArbitrationresults: false, form2: {}, - applicateArr: [],//申请人案件资料 - quiltArr: [],//被申请人案件资料 + applicateArr: [], //申请人案件资料 + quiltArr: [], //被申请人案件资料 + recordArr: [], //笔录附件 + showsubmit: true, //生成庭审笔录，方可提交 + annexName: "", //笔录文件名 + annexPath: "", //笔录文件地址 }; }, watch: { showtrialincourt: { handler(val) { if (val) { - this.formData = this.form; + this.formData = this.form; this.applicateArr = []; this.quiltArr = []; - setTimeout(() => { - this.adjudicatename.caseAttachList.forEach(item => { - if (item.annexType == 2) { - this.applicateArr.push({ - annexName: item.annexName, - annexPath: item.annexPath, - }); - } - if (item.annexType == 6) { - this.quiltArr.push({ - annexName: item.annexName, - annexPath: item.annexPath, - }); - } - }); - }, 500); + this.recordArr = []; + setTimeout(() => { + if (this.adjudicatename.caseAttachList.length > 0) { + this.adjudicatename.caseAttachList.forEach((item) => { + // 申请人案件附件 + if (item.annexType == 2) { + this.applicateArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); + } + // 被申请人案件附件 + if (item.annexType == 6) { + this.quiltArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); + } + // 笔录生成附件 + if (item.annexType == 7) { + this.recordArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); + } + }); + } + }, 1000); } }, }, @@ -340,7 +367,7 @@ export default { this.getUser(); }, methods: { - // 详情显示，展示申请人案件文件 + // 详情显示，展示申请人案件文件 toFile(item, index) { window.open( window.location.origin + "/API" + this.applicateArr[index].annexPath, @@ -354,6 +381,13 @@ export default { "_black" ); }, + // 庭审笔录附件 + toFile2(item, index) { + window.open( + window.location.origin + "/API" + this.recordArr[index].annexPath, + "_black" + ); + }, getUser() { getUserProfile().then((response) => { this.user = response.data.userName; @@ -361,8 +395,9 @@ export default { }, // 打开会议 openmeeting() { - // window.open('https://txroom.xayunmei.com'); - window.open(`https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}`); + window.open( + `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}` + ); }, // 提交仲裁结果 openArbitrationresults() { @@ -371,10 +406,26 @@ export default { closeArbitrationresults() { this.showArbitrationresults = false; }, + // 提交庭审笔录弹框结果 submitForm() { this.$refs["form2"].validate((valid) => { if (valid) { - writtenHear({ + // 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.closeArbitrationresults(); + // this.$emit("getcaseApply", this.queryParams); + // }) + // .catch((err) => {}); + creatTrialRecord({ caseAppliId: this.formData.id, evidenDetermi: this.form2.evidenDetermi, factDetermi: this.form2.factDetermi, @@ -383,10 +434,17 @@ export default { rulingFollows: this.form2.rulingFollows, }) .then((res) => { + res.data.caseAttachList.forEach((item) => { + if (item.annexType == 7) { + this.recordArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); + } + }); this.$modal.msgSuccess("提交成功"); - this.cancel(); + this.showsubmit = false; this.closeArbitrationresults(); - this.$emit("getcaseApply", this.queryParams); }) .catch((err) => {}); } @@ -395,6 +453,20 @@ export default { cancel() { this.$emit("canceltrialincourt"); }, + // 提交开庭审理结果 + submitResults() { + console.log(this.formData.id, "this.formData.id"); + let id = this.formData.id; + document({ + id: id, + }).then((res) => { + console.log(res, "提交开庭审理结果"); + if (res.code == 200) { + this.$emit("getcaseApply", this.queryParams); + this.cancel(); + } + }); + }, }, }; @@ -410,6 +482,7 @@ export default { height: 37px; background: #488de2; border-radius: 19px; + color: #ffffff; span { width: 96px; height: 15px; @@ -425,13 +498,17 @@ export default { 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; - } + // span { + // width: 31px; + // height: 13px; + // font-size: 16px; + // font-family: Microsoft YaHei; + // font-weight: 400; + color: #959595; + // } +} +.caseInfo { + font-size: 17px; + font-weight: 600; } \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index 5d4db74..46b5ee4 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -5,31 +5,139 @@
我的待办事项
-
+
-
待审查案件
+
待立案审查
-
+
- +
-
待缴费案件
+
待缴费
-
+
- +
-
待送达案件
+
待缴费确认
+
+
+
+ +
+ +
+
+
待案件质证
+
+
+
+ +
+ +
+
+
待组庭审核
+
+
+
+ +
+ +
+
+
待组庭确定
+
+
+
+ +
+ +
+
+
待组庭通知
+
+
+
+ +
+ +
+
+
待审核仲裁方式
+
+
+
+ +
+ +
+
+
待开庭审理
+
+
+
+ +
+ +
+
+
待书面审理
+
+
+
+ +
+ +
+
+
待核验仲裁文书
+
+
+
+ +
+ +
+
+
待审核仲裁文书
+
+
+
+ +
+ +
+
+
待仲裁文书签发用印
+
+
+
+ +
+ +
+
+
待仲裁文书送达
+
+
+
+ +
+ +
+
+
待案件归档
@@ -81,14 +189,16 @@ export default { .homeMain { width: 100%; display: flex; - justify-content: space-between; - + flex-wrap: wrap; + // justify-content: space-between; .cardList { width: 30%; height: 300px; border-radius: 30px; background-color: #ffffff; position: relative; + margin-right: 30px; + margin-bottom: 30px; .badge{ width: 50px; height: 30px;