params.timeLimit=""为空

src/views/main-navbar.vue

@@ -29,7 +29,7 @@
 					<el-menu-item index="3"  @click="$router.push({ path: '/main/base-smartExcel-filling' })">
 						<div class="nav-item" v-for="menu in $store.state.sidebarMenuList" v-show="menu.children.find(item => item.name === '任务填报')">
 							<img src="~@/assets/images/main/nav-sjjy.png" />
-							<span>填报任务</span>
+							<span>任务填报</span>
 							<img  v-if="dataRed" style="width: 10px;height: 10px;margin-bottom: 20px;" src="~@/assets/images/main/red.png"/>
 						</div>
 					</el-menu-item>

src/views/modules/base/smartExcel/cpts/excel-info.vue

@@ -108,12 +108,12 @@
 
         </div>
         <div v-if="showSummary" style="width: 100%;background: #ffffff;">
-            <excel-summary @close="closeSummary" :summaryDetal=summaryDetal></excel-summary>
+            <excel-summary v-if="showSummary" @close="closeSummary" :summaryDetal=summaryDetal></excel-summary>
         </div>
         <div class=''>
             <el-dialog :title="title" v-if="showPersonel" :visible.sync="showPersonel" width="50%"
                 :close-on-click-modal="false">
-                <acceptingPersonel :showType="showType" :acceptingId="formData.acceptingId" :taskId="taskId"
+                <acceptingPersonel v-if="showPersonel" :showType="showType" :acceptingId="formData.acceptingId" :taskId="taskId"
                     @handelPersonel="handelPersonel" :formDatas="formData"></acceptingPersonel>
             </el-dialog>
 
@@ -179,9 +179,11 @@ export default {
             console.log(value,"dslkjlksdf");
             this.showSummary = true
             this.summaryDetal=value
+            
         },
         closeSummary(){
             this.showSummary = false;
+            this.getDetail()
         },
         async getTableList(){
             let url = '/actual/base/communityOneTablePeriodPublish/getPeriodTaskList'

src/views/modules/base/smartExcel/cpts/excel-summary.vue

@@ -46,6 +46,8 @@ export default {
         
      },
   async  mounted(){
+     console.log(this.summaryDetal,"sdf;lksdf;");
+    
         this.getTableList()
     },
     methods: {
@@ -55,7 +57,7 @@ export default {
                 taskId:this.summaryDetal.taskId,
                 pageSize:100,
                 pageNo:1,
-                taskNum:1,
+                taskNum:this.summaryDetal.taskNum,
                 delReassign:"del"
             }
             let {code,msg,data} = await requestGet(url,params)
@@ -65,18 +67,23 @@ export default {
         },
         close() {
             this.showView = false
+            this.getTableList()
         },
         handleClickBack() {
             this.$emit('close')
         },
         handleClickShowView(val){
-            const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId,taskStateName} = val;
+            console.log(val,"dskfjsdl");
+            
+            const {taskPeriodName,taskNum, id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId,taskStateName} = val;
             this.$store.state.sidebarFold = true;
             this.showView = true;
             this.sheetTotal =  false
             this.workbookId = val.taskId;
             this.userId = val.userId;
-            this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
+            this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,taskNum,taskPeriodName};
+            console.log(this.infoObj,"dsfjs");
+            
             this.mergeObj = {subWorkBookId,workBookId,taskStateName }
             this.taskStateName=val.taskStateName
 

src/views/modules/base/smartExcel/cpts/excel-view.vue

@@ -104,7 +104,9 @@ export default {
   },
   watch: {},
   async mounted() {
-    console.log(this.mergeObj, "dskjlfsdklf");
+    console.log(this.infoObj,":sdfjsdf");
+    // this.menuActive=this.infoObj.taskNum-1
+    // console.log(this.mergeObj, "dskjlfsdklf");
 
     if (this.sheetTotal) {
       this.currentId = this.workbookId;
@@ -127,7 +129,9 @@ export default {
       let { data, code, msg } = await requestGet('/actual/base/communityOneTablePeriodPublish/myPageList', parm)
       if (code === 0) {
         this.menuList = data.list;
-        this.currentId = this.menuList[0].subWorkBookId
+        this.menuActive = this.menuList.findIndex(item => item.taskPeriodName === this.infoObj.taskPeriodName);
+        this.currentId = this.menuList[this.menuActive].subWorkBookId
+        
         this.loadWorkBook()
       }
     },

src/views/modules/base/smartExcel/cpts/filling-info.vue

@@ -13,7 +13,6 @@
                             <div style="display: flex; align-items: center;">
                                 <div>{{ formData.taskTitle }}</div>
                             </div>
-
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -103,7 +102,7 @@
                     </el-table-column>
                     <el-table-column prop="taskStateName" fixed="right" label="状态" align="center">
                         <template slot-scope="scope">
-                            <div
+                            <div  @click="handleClickShowView(scope.row.taskId, scope.row.taskStateName)"
                                 :class="scope.row.taskState === 'archived'?'green':scope.row.taskState === 'submit'?'blue':scope.row.taskState === 'rejected'?'black':'orange'">
                                 {{
                                 scope.row.taskStateName }}</div>

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

@@ -983,11 +983,8 @@ export default {
     color: #fff;
 }
   .canvas {
-
-      width: 100%;
-      height: 100%;
       z-index: 10;
-      position: absolute;
+      position: fixed;
       top: 0;
       left: 0;
       pointer-events: none;

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

@@ -6,10 +6,10 @@
                 事件详情
             </h3>
             <div class="m-detail-main">
-                <div class="flex-end">
+                <!-- <div class="flex-end">
                     <el-button size="small" icon="el-icon-printer">打印</el-button>
                     <el-button size="small" icon="el-icon-download">下载</el-button>
-                </div>
+                </div> -->
                 <div class="m-info">
                   
                     <div class="flex">
@@ -95,6 +95,7 @@
                     </div>
                 </div>
             </div>
+            <canvas id="watermarkCanvas1" class="canvas">  </canvas>
         </el-card>
     </div>
 </template>
@@ -158,7 +159,7 @@ export default {
                 return {
                     minHeight: 'calc(88vh - 50px)',
                     overflow: 'auto',
-                    position: 'relative'
+                    position: 'ab'
                 }
             } else {
                 return {}
@@ -166,9 +167,11 @@ export default {
         }
     },
     mounted() {
+        
         this.user = this.$store.state.user;
         this.phone = this.$store.state.user.phone;
         this.realName = this.$store.state.user.realName;
+        // this.getCanvas()
         if (this.eventId) {
             this.info = JSON.parse(JSON.stringify(this.eventDetailData));
         }
@@ -182,6 +185,30 @@ export default {
     },
 
     methods: {
+        // getCanvas() {
+        //     var canvas = document.getElementById('watermarkCanvas1');
+        //     var ctx = canvas.getContext('2d');
+        //     canvas.width = window.innerWidth ;  // 设置更高的分辨率
+        //     canvas.height = window.innerHeight ;
+        //     var watermarkText =  this.realName+ this.phone; //内容
+        //     ctx.font = '12px Arial'; //大小
+        //     ctx.fillStyle = 'rgba(0, 0, 255, 0.2)'; //颜色+透明度
+        //     // ctx.textBaseline = 'middle';
+        //     ctx.scale(2, 2);  // 缩放上下文以适应更高分辨率
+        //     var angle = -30 * Math.PI / 180;  // 旋转-30度
+        //     var x = canvas.width / 2;
+        //     var y = canvas.height / 2;
+        //     var space = 150;  // 水印间距
+        //     for (var i = 0; i < canvas.width; i += space) {
+        //         for (var j = 0; j < canvas.height; j += space) {
+        //             ctx.save();
+        //             ctx.translate(i, j);
+        //             ctx.rotate(angle);
+        //             ctx.fillText(watermarkText, 0, 0);
+        //             ctx.restore();
+        //         }
+        //     }
+        // },
         watchImg(src) {
             window.open(src);
         },
@@ -199,7 +226,14 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
-
+.canvas {
+z-index: 10;
+position: fixed;
+top: 0;
+left: 0;
+pointer-events: none;
+/* 确保canvas不干扰其他元素 */
+}
 .flex-end {
     display: flex;
     margin-bottom: 10px;

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

@@ -58,19 +58,23 @@
                                             <div class="detail-field">操作人：</div>
                                             <div class="detail-value">{{ item.departmentName }}</div>
                                         </div>
-                                        <div class="detail">
+                                        <div v-if="item.operationType!=='14'" class="detail">
                                             <div class="detail-field">指派部门：</div>
                                             <div class="detail-value">{{ item.agencyName }}</div>
                                         </div>
-                                        <div class="detail">
+                                        <div class="detail" v-if="item.operationType==='14'">
+                                            <div class="detail-field">取消指派部门：</div>
+                                            <div class="detail-value">{{ item.agencyName }}</div>
+                                        </div>
+                                        <div class="detail" v-if="item.operationType!=='14'">
                                             <div class="detail-field">转办意见：</div>
                                             <div class="detail-value">{{ item.publicReply }}</div>
                                         </div>
-                                        <div class="detail" >
+                                        <div class="detail" v-if="item.operationType!=='14'" >
                                             <div class="detail-field">响应时限：</div>
                                             <div class="detail-value">{{ item.contactTime }}</div>
                                         </div>
-                                        <div class="detail">
+                                        <div class="detail"  v-if="item.operationType!=='14'">
                                             <div class="detail-field">办结时限：</div>
                                             <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
                                         </div>
@@ -356,11 +360,11 @@ export default {
         if (this.eventId) {
             this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
         }
+
     },
     mounted() {
     },
     methods: {
-
       aTagDownload(url, filename){
           const a = document.createElement("a"); // 创建 a 标签
           a.href = url; // 下载路径
@@ -458,6 +462,9 @@ changeName(val) {
             }
         },
         async submitDispose(url, params) {
+            if (this.pageTypeCopy === "check") {
+                params.timeLimit=""
+            }
             const { data, code, msg } = await requestPost(url, {
                 ...params,
             });

src/views/modules/shequzhili/event/cpts/process-form-complete.vue

@@ -261,7 +261,7 @@
             </el-form-item>
           </div>
           <div class="item">
-            <el-form-item label="确认问题是否已解决" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
+            <el-form-item label="是否解决" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
               prop="examine">
               <div :class="{ 'visiual-form': source === 'visiual' }">
                 <el-select v-model.trim="formData.confirmSolved" clearable class="item_width_4">
@@ -272,7 +272,7 @@
             </el-form-item>
           </div>
           <div class="item">
-            <el-form-item  label="12345回访满意度结果" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
+            <el-form-item  label="是否满意" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
               prop="examine">
               <div :class="{ 'visiual-form': source === 'visiual' }">
                 <el-select v-model.trim="formData.satisfactionResult" clearable class="item_width_4">

src/views/modules/shequzhili/event/eventList.vue

@@ -387,9 +387,9 @@ export default {
         },
     },
     mounted() {
+        var canvas = document.getElementById('watermarkCanvas1');
         this.user = this.$store.state.user;
         this.agencyId = this.user.agencyId;
-
         this.getOrgTreeList()
         this.getGridList()
         this.getTableData();

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

@@ -111,20 +111,12 @@
                     </el-table-column>
                     <el-table-column prop="limitStatus" align="center" width="110" label="办理超期"
                         :show-overflow-tooltip="true">
-                        <!-- <template slot-scope="scope">
-                            <span v-if="scope.row.deliverystatus === 0">联系当事人超期</span>
-                            <span v-else-if="scope.row.deliverystatus ===1">部门办结超期</span>
-                            <span v-else>--</span>
-                        </template> -->
                     </el-table-column>
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                         <template slot-scope="scope">
                             <el-button @click="handleWatch(scope.row)" type="text" size="small" v-if="scope.row.operationTypeName!='正常退件'">查看</el-button>
-                            <!-- <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="scope.row.canOperate && scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>
-                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.canOperate && scope.row.deptId && scope.row.latestOperatedTime && isWithinTwoHours(scope.row.latestOperatedTime) && scope.row.operationType!='11' &&scope.row.operationType!= '12'">退件</el-button> -->
-                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if=" scope.row.operationType != '11'&&scope.row.operationType!= '12'&&scope.row.operationTypeName!='正常退件' ">办理</el-button>
-                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.status !=='closed_case'&&scope.row.operationTypeName!='正常退件'">退件</el-button>
-                           
+                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if=" scope.row.operationType != '11'&&scope.row.operationType!= '12'&&scope.row.operationType!= '14'&&scope.row.operationTypeName!='正常退件'&&scope.row.latestOperationType!='13'&&scope.row.latestOperationType!='14' ">办理</el-button>
+                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.status !=='closed_case'&&scope.row.operationTypeName!='正常退件'&&scope.row.operationType!= '14'&&scope.row.latestOperationType!='13'&&scope.row.latestOperationType!='14' ">退件</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -797,10 +789,8 @@ export default {
     color: #fff;
 }
 .canvas {
-width: 100%;
-height: 100%;
 z-index: 10;
-position: absolute;
+position: fixed;
 top: 0;
 left: 0;
 pointer-events: none;

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

@@ -824,10 +824,8 @@ export default {
     color: #fff;
 }
 .canvas {
-width: 100%;
-height: 100%;
 z-index: 10;
-position: absolute;
+position: fixed;
 top: 0;
 left: 0;
 pointer-events: none;

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

@@ -874,11 +874,8 @@ export default {
     color: #fff;
 }
   .canvas {
-
-      width: 100%;
-      height: 100%;
       z-index: 10;
-      position: absolute;
+      position: fixed;
       top: 0;
       left: 0;
       pointer-events: none;