Merge branch '7.31' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang

src/views/modules/base/organization/organization.vue

@@ -992,6 +992,7 @@
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
       </el-form>
+      <!-- <div>*部分负责人联系电话可用于接收工作短信通知，请如实填写。</div> -->
       <div slot="footer">
         <el-button @click="cancelOrgUnitPop">取 消</el-button>
         <el-button type="primary"

src/views/modules/shequzhili/Delivery/index.vue

@@ -145,7 +145,7 @@
                     </el-table-column>
                     <el-table-column prop="deptName" align="center" width="110" label="指定部门" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="timeLimit" align="center" width="110" label="办结时限" :show-overflow-tooltip="true">
+                    <el-table-column prop="limitTime" align="center" width="110" label="办结时限（部门）" :show-overflow-tooltip="true">
                     </el-table-column>
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                         <template slot-scope="scope">

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.content }}</div>
+                            <div class="value flex-1">{{ info.transferAdvice }}</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.content = value;
+                this.info.transferAdvice = value;
             } else if (type === 'handlingReq') {
                 this.info.handlingReq = value;
             }

src/views/modules/shequzhili/event/cpts/event-info.vue

@@ -67,6 +67,10 @@
                                             <div class="detail-field">转办意见：</div>
                                             <div class="detail-value">{{ item.publicReply }}</div>
                                         </div>
+                                        <div class="detail" >
+                                            <div class="detail-field">响应时限：</div>
+                                            <div class="detail-value">{{ item.contactTime }}</div>
+                                        </div>
                                         <div class="detail">
                                             <div class="detail-field">办结时限：</div>
                                             <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
@@ -108,11 +112,11 @@
                                     </template>
                                     <template v-else>
                                         <div class="detail">
-                                            <div class="detail-field">回复人：</div>
+                                            <div class="detail-field">操作人：</div>
                                             <div class="detail-value">{{ item.departmentName }}</div>
                                         </div>
                                         <div class="detail">
-                                            <div class="detail-field">办理情况：</div>
+                                            <div class="detail-field">办理说明：</div>
                                             <div class="detail-value">{{ item.publicReply }}</div>
                                         </div>
                                         <div class="detail" v-if="item.timeLimit">

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="content" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+            <el-form-item label="转办意见" prop="transferAdvice" 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.content"
+                        placeholder="请输入转办意见，不超过500字" v-model.trim="formData.transferAdvice"
                         @input="handelInputContent"></el-input>
                 </div>
             </el-form-item>
@@ -75,7 +75,7 @@ export default {
             formData: {
                 operationType: "5", //处理方式[0:已回复 5、指派  6、完成并回复]
                 handlingReq:'',//办理要求
-                content:'',//转办意见
+                transferAdvice:'',//转办意见
                 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.content = this.eventDetailCopy.content;
+            this.formData.transferAdvice = this.eventDetailCopy.transferAdvice;
         }
     },
     methods: {

src/views/modules/shequzhili/eventHandling/index.vue

@@ -113,7 +113,7 @@
                             </span>
                         </template> -->
                     </el-table-column>
-                    <el-table-column prop="timeLimit" align="center" width="110" label="办结时限" :show-overflow-tooltip="true">
+                    <el-table-column prop="limitTime" align="center" width="110" label="办结时限（部门）" :show-overflow-tooltip="true">
                     </el-table-column>
 
                     <el-table-column prop="status" align="center" width="110" label="办理状态"