diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index abb0f0e..4a4aae8 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -245,4 +245,4 @@ export function getIdType() { url: '/system/dict/data/type/id_type', method: 'get', }) -} +} \ No newline at end of file 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/main.js b/src/main.js index 5d51bfd..716f7e5 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' diff --git a/src/utils/permission.js b/src/utils/permission.js index 603426a..25299ca 100644 --- a/src/utils/permission.js +++ b/src/utils/permission.js @@ -47,4 +47,23 @@ export function checkRole(value) { console.error(`need roles! Like checkRole="['admin','editor']"`) return false } +} + +/** + * 状态权限校验 + * @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 + } } \ No newline at end of file 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 @@ diff --git a/vue.config.js b/vue.config.js index dfb7aa2..c4fc8c2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,10 +12,10 @@ 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 // 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 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions