From 9d75fd6fcf20d3f2ad352103155ce38e01b9e968 Mon Sep 17 00:00:00 2001 From: fz Date: Fri, 3 Nov 2023 17:02:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=86=E9=A2=91bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caseFiling/components/archiveDetailsDialog.vue | 3 ++- src/views/caseFiling/components/videoList.vue | 0 src/views/caseManagement/caseList.vue | 3 ++- .../caseManagement/components/caseentryDialog.vue | 12 ++++++++++++ .../caseManagement/components/courtReviewDialog.vue | 13 ++++++++++--- .../components/formateCourtDialog.vue | 5 +++++ src/views/caseManagement/components/payDialog.vue | 7 +++++++ src/views/caseManagement/components/timeDialog.vue | 4 ++-- src/views/deliveryRecord/smsRecord.vue | 10 ++++++++++ src/views/officialSeal/officialSealList.vue | 4 ++-- 10 files changed, 52 insertions(+), 9 deletions(-) delete mode 100644 src/views/caseFiling/components/videoList.vue diff --git a/src/views/caseFiling/components/archiveDetailsDialog.vue b/src/views/caseFiling/components/archiveDetailsDialog.vue index cc834d1..5969faf 100644 --- a/src/views/caseFiling/components/archiveDetailsDialog.vue +++ b/src/views/caseFiling/components/archiveDetailsDialog.vue @@ -16,7 +16,7 @@ - + @@ -97,6 +97,7 @@ export default { ::v-deep .el-tabs__content { height: 700px; overflow-y: scroll; + padding-bottom: 10%; } .loading { diff --git a/src/views/caseFiling/components/videoList.vue b/src/views/caseFiling/components/videoList.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index c4858ca..c3c0e5a 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -199,7 +199,7 @@ - + { // this.visible = true; // this.formData = res.data; + this.form.caseName = res.data.caseName; this.adjudicatename = { applicantName: res.data.applicantName, respondentName: res.data.respondentName, diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index ef01117..c0719c5 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -15,6 +15,11 @@ + + + + +
- + @@ -67,7 +67,9 @@ export default { data() { return { hearDate: "", - courtReviewform: {}, + courtReviewform: { + hearDate:null + }, noArbitrator: false, isAgreePendTral: 1, total: 0, @@ -87,9 +89,10 @@ export default { this.getarbitrAtor(); }, watch: { - showformateCourt(val) { + showcourtReview(val) { if (val) { this.isAgreePendTral = 1; + this.courtReviewform.hearDate = null } }, form: { @@ -112,6 +115,10 @@ export default { }, // 勾选仲裁员 handleSelectionChange(val) { + if (val.length > 1) { + this.$refs.selectTable.clearSelection(); + this.$refs.selectTable.toggleRowSelection(val.pop()); + } this.arbitrators = []; val.forEach((item) => { this.arbitrators.push({ diff --git a/src/views/caseManagement/components/formateCourtDialog.vue b/src/views/caseManagement/components/formateCourtDialog.vue index 22d3a85..5c7fd67 100644 --- a/src/views/caseManagement/components/formateCourtDialog.vue +++ b/src/views/caseManagement/components/formateCourtDialog.vue @@ -40,6 +40,7 @@
@@ -148,6 +149,10 @@ export default { }, // 勾选仲裁员 handleSelectionChange(val) { + if (val.length > 1) { + this.$refs.selectTable.clearSelection(); + this.$refs.selectTable.toggleRowSelection(val.pop()); + } this.arbitrators = []; val.forEach((item) => { this.arbitrators.push({ diff --git a/src/views/caseManagement/components/payDialog.vue b/src/views/caseManagement/components/payDialog.vue index 19beeeb..a21afe3 100644 --- a/src/views/caseManagement/components/payDialog.vue +++ b/src/views/caseManagement/components/payDialog.vue @@ -95,6 +95,10 @@ export default { }, //选择支付方式(线上,线下) changPayType(data) { + if(data == 1){ + document.getElementById("qrcodeImg").innerHTML = ""; + this.payMain = "" + } this.submitForm.payType = data; }, beforeUpload(flie, fileList) { @@ -198,6 +202,9 @@ export default { watch:{ openPay(val){ if(val){ + this.submitForm.payOrderList = [] + this.paySelect = 1; + this.fileList = []; this.filedata.id = this.payId; this.submitForm.caseId = this.payId; } diff --git a/src/views/caseManagement/components/timeDialog.vue b/src/views/caseManagement/components/timeDialog.vue index a78877a..7196c1f 100644 --- a/src/views/caseManagement/components/timeDialog.vue +++ b/src/views/caseManagement/components/timeDialog.vue @@ -29,7 +29,7 @@ import { updateHeardate } from '@/api/caseManagement/caseManagement' import { getToken } from "@/utils/auth"; import moment from "moment"; export default { - props: ["timeVisable", "timeData"], + props: ["timeVisable", "timeData","queryParams"], data() { return { loanStartDate: "", @@ -60,7 +60,7 @@ export default { updateHeardate(data).then(res => { this.$modal.msgSuccess("修改成功"); this.cancel(); - this.$emit("getcaseApply"); + this.$emit("getcaseApply",this.queryParams); }) }, submitTime() { diff --git a/src/views/deliveryRecord/smsRecord.vue b/src/views/deliveryRecord/smsRecord.vue index 088341b..0d7b3d5 100644 --- a/src/views/deliveryRecord/smsRecord.vue +++ b/src/views/deliveryRecord/smsRecord.vue @@ -20,6 +20,7 @@ + { this.dataList = response.rows; + this.dataList.forEach(item=>{ + if(item.sendstatus == 0){ + item.sendstatus = "未发送" + }else if(item.sendstatus == 1){ + item.sendstatus = "已发送" + }else{ + item.sendstatus = "未发送" + } + }) this.total = response.total; this.loading = false; }); diff --git a/src/views/officialSeal/officialSealList.vue b/src/views/officialSeal/officialSealList.vue index e549f32..156b943 100644 --- a/src/views/officialSeal/officialSealList.vue +++ b/src/views/officialSeal/officialSealList.vue @@ -117,12 +117,12 @@ export default { this.total = response.total; this.loading = false; this.dataList.forEach(item => { - if (item.identifyStatus == 0) { + if (item.identifyStatus == 0 || item.identifyStatus == null) { item.identifyStatus = '未认证' } else { item.identifyStatus = '已认证' } - if (item.isUse == 0) { + if (item.isUse == 0 || item.isUse == null) { item.isUse = '未启用' } else { item.isUse = '已启用' From 0fbc5ec4403f7beca52bc5a90f43eba0d8cb4bf1 Mon Sep 17 00:00:00 2001 From: fz Date: Fri, 10 Nov 2023 17:56:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseFiling/archiveList.vue | 29 +++++++++++++++---- .../components/archiveDetailsDialog.vue | 26 ++++++++--------- .../components/trialincourtDialog.vue | 8 +++-- src/views/deliveryRecord/emailRecord.vue | 14 +++++++-- src/views/deliveryRecord/smsRecord.vue | 12 ++++---- 5 files changed, 61 insertions(+), 28 deletions(-) diff --git a/src/views/caseFiling/archiveList.vue b/src/views/caseFiling/archiveList.vue index 2809305..005c304 100644 --- a/src/views/caseFiling/archiveList.vue +++ b/src/views/caseFiling/archiveList.vue @@ -62,14 +62,15 @@ -
diff --git a/src/views/caseFiling/components/archiveDetailsDialog.vue b/src/views/caseFiling/components/archiveDetailsDialog.vue index 5969faf..0a75a06 100644 --- a/src/views/caseFiling/components/archiveDetailsDialog.vue +++ b/src/views/caseFiling/components/archiveDetailsDialog.vue @@ -8,19 +8,19 @@
暂无数据！
- + - + - + - + - +
@@ -35,7 +35,7 @@ import caseInfo from "./caseInfo.vue"; import caselogInfo from "./caselogInfo.vue"; import expressDeliveryInfo from "./expressDeliveryInfo.vue"; export default { - props: ["showarchiveDetails", "detailform", "flagLoading", "videoList"], + props: ["showarchiveDetails", "detailform", "flagLoading", "videoList","caseDetail","caseLog"], components: { caseInfo, caselogInfo, @@ -49,17 +49,17 @@ export default { deliveryDataArr: [], //快递信息 noData: false, videoUrl:[], - headPath:"", + headPath:window.location.origin + "/API", videoFlag:false }; }, watch: { - detailform(newValue) { - this.headPath = window.location.origin + "/API"; + showarchiveDetails(newValue) { + // this.headPath = ; if (newValue) { - this.caseApplicationObj = this.detailform.caseApplication; - this.caselogDataArr = this.detailform.caseLogRecordList; - this.deliveryDataArr = this.detailform.logisticsInfoVOList; + // this.caseApplicationObj = this.detailform.caseApplication; + // this.caselogDataArr = this.detailform.caseLogRecordList; + // this.deliveryDataArr = this.detailform.logisticsInfoVOList; } }, }, diff --git a/src/views/caseManagement/components/trialincourtDialog.vue b/src/views/caseManagement/components/trialincourtDialog.vue index 7e4cb86..8ee953a 100644 --- a/src/views/caseManagement/components/trialincourtDialog.vue +++ b/src/views/caseManagement/components/trialincourtDialog.vue @@ -264,6 +264,7 @@ export default { return { formData: {}, user: "", + userId:1, showArbitrationresults: false, form2: {}, applicateArr: [], //申请人案件资料 @@ -278,6 +279,7 @@ export default { showtrialincourt: { handler(val) { if (val) { + this.getUser(); this.formData = this.form; this.applicateArr = []; this.quiltArr = []; @@ -314,7 +316,7 @@ export default { }, }, created() { - this.getUser(); + }, methods: { // 详情显示，展示申请人案件文件 @@ -341,12 +343,14 @@ export default { getUser() { getUserProfile().then((response) => { this.user = response.data.userName; + this.userId = response.data.userId; }); }, // 打开会议 openmeeting() { window.open( - `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}` + // `http://localhost:8081/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}` + `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}` ); }, // 提交仲裁结果 diff --git a/src/views/deliveryRecord/emailRecord.vue b/src/views/deliveryRecord/emailRecord.vue index bfb2208..90f858b 100644 --- a/src/views/deliveryRecord/emailRecord.vue +++ b/src/views/deliveryRecord/emailRecord.vue @@ -22,6 +22,7 @@ + @@ -29,7 +30,7 @@ - +
@@ -42,7 +43,7 @@ import { getDicts } from '@/api/system/dict/data.js' export default { name: "paymentList", dicts: ["case_status"], - components: { }, + components: {}, data() { return { queryParams: { @@ -83,6 +84,15 @@ export default { this.loading = true; emailList(parms).then((response) => { this.dataList = response.rows; + this.dataList.forEach(item => { + if (item.sendStatus == 0) { + item.sendStatus = "未发送" + } else if (item.sendStatus == 1) { + item.sendStatus = "已发送" + } else { + item.sendStatus = "未发送" + } + }) this.total = response.total; this.loading = false; }); diff --git a/src/views/deliveryRecord/smsRecord.vue b/src/views/deliveryRecord/smsRecord.vue index 0d7b3d5..4015278 100644 --- a/src/views/deliveryRecord/smsRecord.vue +++ b/src/views/deliveryRecord/smsRecord.vue @@ -20,7 +20,7 @@ - + { this.dataList = response.rows; this.dataList.forEach(item=>{ - if(item.sendstatus == 0){ - item.sendstatus = "未发送" - }else if(item.sendstatus == 1){ - item.sendstatus = "已发送" + if(item.sendStatus == 0){ + item.sendStatus = "未发送" + }else if(item.sendStatus == 1){ + item.sendStatus = "已发送" }else{ - item.sendstatus = "未发送" + item.sendStatus = "未发送" } }) this.total = response.total;