From f73cb2f6c47ee90601f5afbe6053c3bb4f74f88d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 17 Feb 2025 10:09:50 +0800
Subject: [PATCH] =?UTF-8?q?2-17=E5=8F=B7=E7=A6=85=E9=81=93bug=EF=BC=881860?=
 =?UTF-8?q?=E7=AD=89=E7=AD=89=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartExcel/cpts/acceptingPersonel.vue      | 13 +++++++------
 .../modules/base/smartExcel/cpts/excel-add.vue      |  6 +++---
 .../modules/base/smartExcel/cpts/excel-info.vue     |  2 +-
 .../modules/base/smartExcel/cpts/excel-summary.vue  |  4 ++--
 .../modules/base/smartExcel/cpts/excel-view.vue     | 11 +++++------
 .../modules/base/smartExcel/cpts/filling-info.vue   |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
index 6c334fd6f..23c453d43 100644
--- a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
+++ b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
@@ -39,9 +39,6 @@
         <el-form v-if="showType == 'edit'" ref="formData " label-position="left" :model="formData" label-width="150px"
             style="margin-left: 3%; margin-top: 10px;">
             <el-row>
-                <!-- <el-form-item prop="taskTitle" label="任务主题">
-                    <el-input v-model="formData.taskTitle" placeholder="请输入内容" clearable class="cell-width-1"></el-input>
-                </el-form-item> -->
                 <el-form-item label="任务要求" prop="taskIntroduction" style="display: block">
                     <el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
                         placeholder="请输入事件内容，不超过500字" v-model.trim="formData.taskIntroduction"></el-input>
@@ -94,7 +91,9 @@ export default {
             pageSize: 10
         };
     },
-    created() { },
+    created() {
+
+     },
     methods: {
       async  handleConfirm() {
             console.log(this.selfTag),"dsfkljdslk";
@@ -147,9 +146,9 @@ export default {
 
         },
         async updateState() {
+            console.log(this.formDatas,"sdfkljslkdjf");
             if(this.showType=="adjust1"){
                 const url = '/actual/base/communityOneTablePeriodPublish/update'
-            console.log(this.formDatas,"sdfkljslkdjf");
             const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction } = this.formDatas;
             const parm = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction }
             parm.taskState = 'reassigned';
@@ -272,6 +271,9 @@ export default {
     },
     mounted() {
         console.log(this.showType, this.taskId, "sdlfkl;sdf");
+        this.formData.taskIntroduction = this.formDatas.taskIntroduction
+        console.log(this.formData.taskIntroduction,"dsfjhfds");
+        
         this.getOrgTreeList()
         if(this.showType=="adjust"){
             this.getPeriodPublish()
@@ -289,7 +291,6 @@ export default {
         },
         formDatas: {
             type: Object,
-            default: () => { }
         }
 
     },
diff --git a/src/views/modules/base/smartExcel/cpts/excel-add.vue b/src/views/modules/base/smartExcel/cpts/excel-add.vue
index b6dbb2fdf..5a7865c12 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-add.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-add.vue
@@ -8,7 +8,7 @@
             </div>
             <el-form :model="form" label-width="120px" :rules="dataRule" ref="dataForm">
                 <el-form-item prop="taskTitle" label="任务主题">
-                    <el-input v-model="form.taskTitle" placeholder="请输入内容" clearable class="cell-width-2"></el-input>
+                    <el-input v-model="form.taskTitle" placeholder="请输入任务主题" clearable class="cell-width-2"></el-input>
                 </el-form-item>
                 <el-form-item label="任务类型" prop="taskType">
                     <el-select v-model.trim="form.taskType" placeholder="请选择" size="small" clearable
@@ -26,7 +26,7 @@
                         <el-radio label="quarterly">每季度</el-radio>
                     </el-radio-group>
                     <br>
-                    <div>（说明：当任务周期选择每周/每月/每半月/每季度时，系统会于每个时间阶段的第一天自动创建阶段性子任务）</div>
+                    <div>说明：当任务周期选择每周/每月/每半月/每季度时，系统会于每个时间阶段的第一天自动创建阶段性子任务</div>
                 </el-form-item>
                 <el-form-item label="完成时限" prop="completeLimitDay" v-if="form.taskPeriod">
                     <template v-if="form.taskPeriod === 'once'">
@@ -88,7 +88,7 @@
                 </el-form-item>
                 <el-form-item label="任务要求" prop="taskIntroduction" style="display: block">
                     <el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
-                        placeholder="请输入事件内容，不超过500字" v-model.trim="form.taskIntroduction"></el-input>
+                        placeholder="请输入任务要求，不超过500字" v-model.trim="form.taskIntroduction"></el-input>
                 </el-form-item>
             </el-form>
             <div class="div-btn">
diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue
index 936f54953..287e952ea 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="g-main">
+    <div class="g-main" :style="{ height: tableHeight }">
         <div class="right" v-if="!showSummary">
             <div class="title-small" id="base">任务信息
                 <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button>
diff --git a/src/views/modules/base/smartExcel/cpts/excel-summary.vue b/src/views/modules/base/smartExcel/cpts/excel-summary.vue
index 8a0d000db..874bb37d3 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-summary.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-summary.vue
@@ -8,13 +8,13 @@
             </div>
             <div><span style="margin-right: 10px;">任务主题：{{list[0].taskTitle}}</span> <span>任务周期：{{list[0].taskPeriodName}}</span></div>
             <div class="item flex flex-y flex-center-deputy " @click="handleClickShowViewAll(list[0].workBookId)">
-                <img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="margin: 10px 0 0;">
+                <img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="margin: 10px 0 0; cursor:pointer ;">
                 <div class="agencyName">{{list[0].taskTitle}}</div>
             </div>
             <h3 class="title">提报的文件</h3>
             <div class="flex-wrap flex">
                 <div class="item flex flex-y flex-center-deputy" v-for="(item, index) in list"  @click="handleClickShowView(item)" :key="index">
-                    <img :src="require(`@/assets/images/index/Excel.png`)" alt="">
+                    <img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="cursor:pointer ;">
                     <div class="agencyName">{{ item.agencyName }}-{{item.userName}}</div>
                     <div :class="item.taskState === 'archived'?'green':item.taskState === 'submit'?'blue':item.taskState === 'rejected'?'black':'orange'">（{{ item.taskStateName }}）</div>
                 </div>
diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue
index f874fae4c..a8e706a31 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-view.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue
@@ -1,6 +1,5 @@
 <template>
-  <!--  :style="{ height: tableHeight }" -->
-  <div class='flex'>
+  <div class='flex'  :style="{ height: tableHeight }">
     <div class="left_menu flex flex-y" v-if="!sheetTotal">
       <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button>
       <section>
@@ -34,9 +33,9 @@
             <el-button type="primary" @click="handleClickExportExcel()"> 导出</el-button>
         </div>
       </div>
-      <div id="luckysheet"></div>
+      <div id="luckysheet" style="height: 100%"></div>
     </div>
-    <el-dialog title="上传共享数据" v-if="showUploadData" :visible.sync="showUploadData" width="60%"
+    <el-dialog title="上传共享数据" v-if="showUploadData" :visible.sync="showUploadData" width="60%"  
       :close-on-click-modal="false">
       <excelUploadData @handleUploadDataHide="handleUploadDataHide" :currentTable="currentTable"
         :btnLoading="btnLoading">
@@ -301,7 +300,7 @@ export default {
   padding: 0px;
   z-index: 2;
   width: calc(100vw - 400px);
-  height: calc(100vh - 250px);
+  height: calc(100vh - 200px);
 }
 
 .luckysheet-wrap-all {
@@ -309,7 +308,7 @@ export default {
   padding: 0px;
   z-index: 2;
   width: calc(100vw - 100px);
-  height: calc(100vh - 250px);
+  height: calc(100vh - 200px);
 }
 
 #luckysheet {
diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue
index 1b216d99c..0c3b36ded 100644
--- a/src/views/modules/base/smartExcel/cpts/filling-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue
@@ -82,7 +82,7 @@
             <div class="flex-wrap flex">
                 <div class="item flex flex-y flex-center-deputy"
                     @click="handleClickShowView(formData.subWorkBookId, formData.taskStateName)" :key="index">
-                    <img :src="require(`@/assets/images/index/Excel.png`)" alt="">
+                    <img :src="require(`@/assets/images/index/Excel.png`)" alt=""  style="cursor:pointer ;">
                     <div class="agencyName">{{ formData.taskTitle }}</div>
                     <div :class="formData.taskState === 'archived'?'green':formData.taskState === 'submit'?'blue':formData.taskState === 'rejected'?'black':'orange'">（{{ formData.taskStateName }}）</div>
                 </div>