From 85f60a2e5b0d23b372ef0e41eeb93c5d2c6a010d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 31 Jul 2024 09:34:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B6=85=E6=97=B6=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/timeOut/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/timeOut/index.vue b/src/views/modules/shequzhili/timeOut/index.vue
index 04694479c..8d5499dc7 100644
--- a/src/views/modules/shequzhili/timeOut/index.vue
+++ b/src/views/modules/shequzhili/timeOut/index.vue
@@ -116,7 +116,7 @@
           </el-table-column> -->
                     <el-table-column prop="eventContent" label="事件描述" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="receptionTime" label="联系来电人时限" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="contactTime" label="联系来电人时限" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
                     <!-- <el-table-column prop="phone" align="center" width="110" label="联系电话" :show-overflow-tooltip="true">
                         <template slot-scope="scope">

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 2/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 @@
                              <el-button @click="handleWatch(scope.row)"   type="text" size="small" class="">查看</el-button>
                             <!-- <el-button  @click="handleDispose(scope.row)" type="text" size="small" class="">{{scope.row.deliverystatus==0?"派件":"办理"}}</el-button>
                              -->
-                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small"   v-if="scope.row.status == 'assigned'">处理</el-button>
-                            <el-button  @click="handleDispose(scope.row,'assign')" type="text" size="small"  v-if="scope.row.status !='assigned'">派件</el-button>
+                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small"   v-if="(scope.row.status == 'processing'|| scope.row.status === 'assigned') && scope.row.operationType === '5'">处理</el-button>
+                            <el-button  @click="handleDispose(scope.row,'assign')" type="text" size="small"  v-if="scope.row.status =='unassigned'">派件</el-button>
                             <el-button @click="handleDispose(scope.row,'check')" type="text" size="small"  v-if="scope.row.operationType === '11'">审核</el-button>
                         </template>
                     </el-table-column>
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 @@
                         </div>
                         <div class="item">
                             <div class="label">转办意见</div>
-                            <div class="value flex-1">{{ info.transferAdvice }}</div>
+                            <div class="value flex-1">{{ info.content }}</div>
                         </div>
                         <div class="item">
                             <div class="label">办理要求</div>
@@ -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 @@
                     </el-date-picker>
                 </div>
             </el-form-item>
-            <el-form-item label="转办意见" prop="transferAdvice" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+            <el-form-item label="转办意见" prop="content" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
                 style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
                     <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入转办意见，不超过500字" v-model.trim="formData.transferAdvice"
+                        placeholder="请输入转办意见，不超过500字" v-model.trim="formData.content"
                         @input="handelInputContent"></el-input>
                 </div>
             </el-form-item>
@@ -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: {