From e883558cb68327f21d851f4c337d142c3c75a9f3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 31 Jul 2024 10:51:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E4=BC=98=E5=8C=96,=E8=BD=AC=E5=8A=9E=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main.js | 4 ++--
src/views/modules/shequzhili/Delivery/index.vue | 4 ++--
src/views/modules/shequzhili/event/cpts/event-detail.vue | 4 ++--
.../modules/shequzhili/event/cpts/process-form-assign.vue | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main.js b/src/main.js
index 3acc99f47..d6aa150ef 100644
--- a/src/main.js
+++ b/src/main.js
@@ -48,7 +48,7 @@ import PopTips from "@/components/PopTips/index.vue";
import PopHomeTip from "@/components/PopHomeTip/index.vue";
import NameSplit from "@/components/NameSplit/index.vue";
import RelationGraph from "relation-graph";
-// import dayjs from 'dayjs'
+import dayjs from 'dayjs'
// import AddNodeJw from "@/components/JwTree/addNode.vue";
//按钮
@@ -104,7 +104,7 @@ Vue.directive("fixed", {
// 挂载全局
Vue.prototype.$http = http;
Vue.prototype.$sensitive = desensitization;
-// Vue.prototype.$dayjs = dayjs
+Vue.prototype.$dayjs = dayjs
// el-uploader的header配置
Vue.prototype.$getElUploadHeaders = () => ({
Authorization: localStorage.getItem("token") || "",
diff --git a/src/views/modules/shequzhili/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue
index 8f84faadf..f0d4912ca 100644
--- a/src/views/modules/shequzhili/Delivery/index.vue
+++ b/src/views/modules/shequzhili/Delivery/index.vue
@@ -151,8 +151,8 @@
查看
- 处理
- 派件
+ 处理
+ 派件
审核
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 30c0d1fe0..18d49076f 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -66,7 +66,7 @@
转办意见
-
{{ info.transferAdvice }}
+
{{ info.content }}
办理要求
@@ -162,7 +162,7 @@ export default {
}
this.$EventBus.$on('handelInputEventContent', ({ type, value }) => {
if (type === 'opinion') {
- this.info.transferAdvice = value;
+ this.info.content = value;
} else if (type === 'handlingReq') {
this.info.handlingReq = value;
}
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-assign.vue b/src/views/modules/shequzhili/event/cpts/process-form-assign.vue
index 14cfadb01..6b51ada3a 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-assign.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-assign.vue
@@ -38,11 +38,11 @@
-
@@ -75,7 +75,7 @@ export default {
formData: {
operationType: "5", //处理方式[0:已回复 5、指派 6、完成并回复]
handlingReq:'',//办理要求
- transferAdvice:'',//转办意见
+ content:'',//转办意见
createdTime: '',
contactTime:'',
timeLimit:'',//办结时限
@@ -157,7 +157,7 @@ export default {
if (this.eventId) {
this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
this.formData.handlingReq = this.eventDetailCopy.handlingReq;
- this.formData.transferAdvice = this.eventDetailCopy.transferAdvice;
+ this.formData.content = this.eventDetailCopy.content;
}
},
methods: {
From 9c1856f39c0f2eb4ec2a4b8a409e2a596f51dd0d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 31 Jul 2024 15:21:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/shequzhili/eventHandling/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue
index e53746b54..f40b550e4 100644
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@@ -135,7 +135,7 @@
查看
- 办理
+ 办理