From cc1629f632ec4a68c5aa5e0bd7e73c9a4ea29039 Mon Sep 17 00:00:00 2001 From: gyj Date: Fri, 12 Jan 2024 18:15:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9A=84=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/deliveryRecord/deliveryRecord.js | 18 +- .../caseManagement/components/addCase.vue | 179 ++++++++++++------ .../deliveryRecord/components/emailEdits.vue | 57 ++++++ .../deliveryRecord/components/resend.vue | 25 ++- src/views/deliveryRecord/emailRecord.vue | 32 +++- src/views/deliveryRecord/smsRecord.vue | 31 ++- 6 files changed, 269 insertions(+), 73 deletions(-) create mode 100644 src/views/deliveryRecord/components/emailEdits.vue diff --git a/src/api/deliveryRecord/deliveryRecord.js b/src/api/deliveryRecord/deliveryRecord.js index 9e3b5cb..db4228a 100644 --- a/src/api/deliveryRecord/deliveryRecord.js +++ b/src/api/deliveryRecord/deliveryRecord.js @@ -25,4 +25,20 @@ export function updateSendContent(data) { method: 'post', data: data, }) -} \ No newline at end of file +} +// 分页查询短信 +export function recordList(data) { + return request({ + url: '/shortMessage/recordList', + method: 'get', + params: data + }) +} +// 重新发送短信 +export function reSendShortMessage(data) { + return request({ + url: 'shortMessage/reSendShortMessage', + method: 'post', + data: data, + }) +} diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue index 081d6ea..53e8022 100644 --- a/src/views/caseManagement/components/addCase.vue +++ b/src/views/caseManagement/components/addCase.vue @@ -104,14 +104,14 @@ - + 新增申请人信息 @@ -124,7 +124,15 @@ - + + + + 自然人 + 机构 + + + + - + - + + + + - + - + - + + - + - + - + @@ -337,7 +345,7 @@ - + - + + + + + 自然人 + 机构 + + + + - + - + @@ -414,7 +430,7 @@ - + - + - + - + - + - + + - + - + + - + - + +
+ +
+ + +
+
+ 取 消 + 确 认 +
+ +
+ + + + + \ No newline at end of file diff --git a/src/views/deliveryRecord/components/resend.vue b/src/views/deliveryRecord/components/resend.vue index 9262c62..6c3f6c4 100644 --- a/src/views/deliveryRecord/components/resend.vue +++ b/src/views/deliveryRecord/components/resend.vue @@ -2,10 +2,12 @@
-
- - -
+
发送内容:{{ sendData }}
+ + + + +
取 消 确 认 @@ -22,7 +24,10 @@ export default { props: ["resendVidable", "rowData","queryParams"], data() { return { - sendData:'' + sendData:'', + param:"", + paramValue:"" + }; }, watch: { @@ -37,9 +42,10 @@ export default { this.$emit("cancelSend"); }, submitSend() { + console.log(this.rowData) this.updateSendContentFn({ id:this.rowData.id, - sendContent:this.sendData + templateParams:this.rowData.templateParams }) }, updateSendContentFn(data){ @@ -48,6 +54,13 @@ export default { this.$emit("cancelSend"); this.$emit('getList',this.queryParams); }) + }, + changeContent(){ + let templateContent = this.rowData.templateContent + this.rowData.templateParams.forEach(item => { + templateContent = templateContent.replace(item.param,item.paramValue) + }); + this.sendData = templateContent } }, }; diff --git a/src/views/deliveryRecord/emailRecord.vue b/src/views/deliveryRecord/emailRecord.vue index 90f858b..6fdbcaf 100644 --- a/src/views/deliveryRecord/emailRecord.vue +++ b/src/views/deliveryRecord/emailRecord.vue @@ -27,7 +27,14 @@ + + + + @@ -38,12 +45,12 @@ import { emailList, } from "@/api/deliveryRecord/deliveryRecord.js"; - +import emailEdits from "./components/emailEdits.vue"; import { getDicts } from '@/api/system/dict/data.js' export default { name: "paymentList", dicts: ["case_status"], - components: {}, + components: {emailEdits}, data() { return { queryParams: { @@ -60,6 +67,9 @@ export default { // 校验表单 rules: {}, dataList: [], + emailVidable:false, + emailRow:{}, + sendStatusMessage:false, }; }, created() { @@ -86,17 +96,35 @@ export default { this.dataList = response.rows; this.dataList.forEach(item => { if (item.sendStatus == 0) { + this.sendStatusMessage = true item.sendStatus = "未发送" } else if (item.sendStatus == 1) { + this.sendStatusMessage = false item.sendStatus = "已发送" + } else { item.sendStatus = "未发送" + this.sendStatusMessage = true } }) this.total = response.total; this.loading = false; }); }, + // 邮箱编辑内容 + emailEditing(data){ + this.emailVidable = true + this.emailRow = data; + console.log(data) + }, + // 关闭弹窗 + cancelEmail(){ + this.emailVidable = false + }, + // 重新发送 + resendCounts(){ + + } }, }; diff --git a/src/views/deliveryRecord/smsRecord.vue b/src/views/deliveryRecord/smsRecord.vue index ec3fbae..75f07e2 100644 --- a/src/views/deliveryRecord/smsRecord.vue +++ b/src/views/deliveryRecord/smsRecord.vue @@ -28,6 +28,7 @@ 复制内容 编辑内容 + 重新发送 @@ -41,7 +42,7 @@ -- 2.54.0 From 5ecea9844c4980665cf973cd344b4030fd04da4b Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 15 Jan 2024 17:46:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=EF=BC=8C=E6=A1=88?= =?UTF-8?q?=E4=BB=B6=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/caseManagement/caseManagement.js | 17 + src/main.js | 8 +- src/utils/permission.js | 22 + src/views/caseManagement/caseList.vue | 132 +++++ .../caseManagement/components/addCase.vue | 455 ++++++++++++++++++ .../caseManagement/components/payDialog.vue | 47 ++ vue.config.js | 7 + 7 files changed, 687 insertions(+), 1 deletion(-) diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index abb0f0e..2772d21 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -34,6 +34,7 @@ export function getFileList(data) { } /** 批量上传证据 */ export function batchUpload(data) { +<<<<<<< HEAD return request({ url: "/caseApplication/batchUpload", method: "post", @@ -246,3 +247,19 @@ export function getIdType() { method: 'get', }) } +======= + return request({ + url: "/caseApplication/batchUpload", + method: "post", + data: data, + }); +} +// 提交 +export function submitCaseApply(data) { + return request({ + url: '/caseApplication/submit', + method: 'post', + data: data + }) + } +>>>>>>> 0ca62df (缴费，案件详情问题处理) diff --git a/src/main.js b/src/main.js index 5d51bfd..7e36fb0 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import Cookies from 'js-cookie' import Element from 'element-ui' import './assets/styles/element-variables.scss' - +import './assets/icons' // icon import '@/assets/styles/index.scss' // global css import '@/assets/styles/ruoyi.scss' // ruoyi css import App from './App' @@ -13,6 +13,7 @@ import router from './router' import directive from './directive' // directive import plugins from './plugins' // plugins import { download } from '@/utils/request' +<<<<<<< HEAD import { Message } from 'element-ui' import NProgress from 'nprogress' import 'nprogress/nprogress.css' @@ -22,6 +23,11 @@ import './assets/icons' // icon // 引入Iconfont 矢量图标库 import './assets/icon/iconfont.css' // import './permission' // permission control +======= + +import './assets/icon/iconfont.css' +import './permission' // permission control +>>>>>>> 0ca62df (缴费，案件详情问题处理) import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; diff --git a/src/utils/permission.js b/src/utils/permission.js index 603426a..5a24670 100644 --- a/src/utils/permission.js +++ b/src/utils/permission.js @@ -47,4 +47,26 @@ export function checkRole(value) { console.error(`need roles! Like checkRole="['admin','editor']"`) return false } +<<<<<<< HEAD +======= +} + +/** + * 状态权限校验 + * @param {Number} value 校验值 + * @returns {Boolean} + */ +export function statusRole(value) { + let caseStatusStr = sessionStorage.getItem('caseStatus'); + let caseStatus = []; + caseStatus = JSON.parse(caseStatusStr); + if (caseStatus.length == 0) { + return false + } + if (caseStatus.includes(value)) { + return true + } else { + return false + } +>>>>>>> 0ca62df (缴费，案件详情问题处理) } \ No newline at end of file diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 38f3a86..04b321c 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -63,6 +63,7 @@ @@ -94,15 +115,23 @@ :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" /> +======= + :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag"> +>>>>>>> 0ca62df (缴费，案件详情问题处理) +<<<<<<< HEAD +======= + +>>>>>>> 0ca62df (缴费，案件详情问题处理) +<<<<<<< HEAD @@ -148,10 +178,15 @@ +======= + +>>>>>>> 0ca62df (缴费，案件详情问题处理)
diff --git a/vue.config.js b/vue.config.js index dfb7aa2..a7d1973 100644 --- a/vue.config.js +++ b/vue.config.js @@ -14,10 +14,17 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口 // const API = 'http://121.40.189.20:7001' //生产 const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://192.168.3.18:6001' //B +<<<<<<< HEAD // const API = 'http://172.16.0.237:6001' //Q // const API = 'http://172.16.1.26:6001' //w // vue.config.js 配置说明 +======= +// const API = 'http://192.168.3.77:9001' //Q +// const API = 'http://172.16.1.14:6001' //w + +// vue.config.js 配置说明 +>>>>>>> 0ca62df (缴费，案件详情问题处理) //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions // 这里只列一部分，具体配置参考文档 module.exports = { -- 2.54.0 From 9806e7c9ef3e616675e81d4f966a9fc3df39e860 Mon Sep 17 00:00:00 2001 From: hanchaobo Date: Tue, 16 Apr 2024 18:14:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/caseManagement/caseManagement.js | 19 +- src/main.js | 6 - src/utils/permission.js | 3 - src/views/caseManagement/caseList.vue | 132 ----- .../caseManagement/components/addCase.vue | 455 ------------------ .../caseManagement/components/payDialog.vue | 47 -- vue.config.js | 11 +- 7 files changed, 3 insertions(+), 670 deletions(-) diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index 2772d21..4a4aae8 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -34,7 +34,6 @@ export function getFileList(data) { } /** 批量上传证据 */ export function batchUpload(data) { -<<<<<<< HEAD return request({ url: "/caseApplication/batchUpload", method: "post", @@ -246,20 +245,4 @@ export function getIdType() { url: '/system/dict/data/type/id_type', method: 'get', }) -} -======= - return request({ - url: "/caseApplication/batchUpload", - method: "post", - data: data, - }); -} -// 提交 -export function submitCaseApply(data) { - return request({ - url: '/caseApplication/submit', - method: 'post', - data: data - }) - } ->>>>>>> 0ca62df (缴费，案件详情问题处理) +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 7e36fb0..716f7e5 100644 --- a/src/main.js +++ b/src/main.js @@ -13,7 +13,6 @@ import router from './router' import directive from './directive' // directive import plugins from './plugins' // plugins import { download } from '@/utils/request' -<<<<<<< HEAD import { Message } from 'element-ui' import NProgress from 'nprogress' import 'nprogress/nprogress.css' @@ -23,11 +22,6 @@ import './assets/icons' // icon // 引入Iconfont 矢量图标库 import './assets/icon/iconfont.css' // import './permission' // permission control -======= - -import './assets/icon/iconfont.css' -import './permission' // permission control ->>>>>>> 0ca62df (缴费，案件详情问题处理) import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; diff --git a/src/utils/permission.js b/src/utils/permission.js index 5a24670..25299ca 100644 --- a/src/utils/permission.js +++ b/src/utils/permission.js @@ -47,8 +47,6 @@ export function checkRole(value) { console.error(`need roles! Like checkRole="['admin','editor']"`) return false } -<<<<<<< HEAD -======= } /** @@ -68,5 +66,4 @@ export function statusRole(value) { } else { return false } ->>>>>>> 0ca62df (缴费，案件详情问题处理) } \ No newline at end of file diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 04b321c..38f3a86 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -63,7 +63,6 @@ @@ -115,23 +94,15 @@ :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" /> -======= - :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag"> ->>>>>>> 0ca62df (缴费，案件详情问题处理) -<<<<<<< HEAD -======= - ->>>>>>> 0ca62df (缴费，案件详情问题处理) -<<<<<<< HEAD @@ -178,15 +148,10 @@ -======= - ->>>>>>> 0ca62df (缴费，案件详情问题处理)
diff --git a/vue.config.js b/vue.config.js index a7d1973..c4fc8c2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,19 +12,12 @@ 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:7001' //生产 -const API = 'http://121.40.189.20:6001' //测试 +// const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://192.168.3.18:6001' //B -<<<<<<< HEAD // const API = 'http://172.16.0.237:6001' //Q -// const API = 'http://172.16.1.26:6001' //w +const API = 'http://172.16.1.26:6001' //w // vue.config.js 配置说明 -======= -// const API = 'http://192.168.3.77:9001' //Q -// const API = 'http://172.16.1.14:6001' //w - -// vue.config.js 配置说明 ->>>>>>> 0ca62df (缴费，案件详情问题处理) //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions // 这里只列一部分，具体配置参考文档 module.exports = { -- 2.54.0