From 393e7c639a49e561dba6722fdb2d9690673302fc 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: Thu, 6 Feb 2025 17:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=91=A8=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smartExcel/cpts/acceptingPersonel.vue     | 19 ++++++++--
 .../base/smartExcel/cpts/filling-info.vue     | 37 +++++++++----------
 src/views/modules/base/smartExcel/index.vue   |  2 +-
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
index 034449807..0e274fc29 100644
--- a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
+++ b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
@@ -1,6 +1,6 @@
 <template>
     <div style="position:relative;">
-        <el-form v-if="showType=='adjust'" ref="form" label-position="left" :model="formData" label-width="150px"
+        <el-form v-if="showType=='adjust'||showType=='adjust1'" ref="form" label-position="left" :model="formData" label-width="150px"
             style="margin-left: 3%; margin-top: 10px;">
             <el-row>
                 <el-col :span="24">
@@ -50,7 +50,7 @@
 
             </el-row>
         </el-form>
-        <span v-if="showType=='adjust'||showType=='edit'" slot="footer" class="dialog-footer" style="margin-left: 40%;">
+        <span v-if="showType=='adjust'||showType=='edit'||showType=='adjust1'" slot="footer" class="dialog-footer" style="margin-left: 40%;">
             <el-button @click="handleCancel">取 消</el-button>
             <el-button type="primary" @click="handleConfirm">确 定</el-button>
         </span>
@@ -112,7 +112,19 @@ export default {
               return  this.$emit('handelPersonel')
              
             });
-            }else{
+            } else if(this.showType=="adjust1"){
+                let parms={
+                userId:userIdList.toString(),
+                id:this.taskId,
+                reassignedReason:""
+                
+            }
+            requestPost('/actual/base/communityOneTablePeriodPublish/reAssignWorker', parms).then(res => {
+              return  this.$emit('handelPersonel')
+             
+            });
+            } 
+            else{
                 let parms={
                 userIdList:userIdList,
                 id:this.taskId,
@@ -222,6 +234,7 @@ export default {
             type: String,
             default: '' 
         }
+        
     },
     components: {},
     computed: {
diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue
index 3a1ce4033..f2debaf7d 100644
--- a/src/views/modules/base/smartExcel/cpts/filling-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue
@@ -45,7 +45,7 @@
                         <el-form-item label="任务接收人">
                             <div style="display: flex;flex-direction: row; align-items: center;">
                                 <div>{{formData.userName}}</div>
-                                <el-button @click="oncClickInfo('adjust')" style="margin-left: 10px;"
+                                <el-button @click="oncClickInfo('adjust1')" style="margin-left: 10px;"
                                     type="primary">转派其他接受人</el-button>
                             </div>
 
@@ -79,9 +79,9 @@
                 <el-table :data="tableData" border class="m-table-item"
                     style="width: 70%;margin-left: 3%; margin-top: 30px;" :height="maxTableHeight">
                     <el-table-column label="序号" fixed="left" type="index" align="center" width="80" />
-                    <el-table-column prop="renwu" align="center" :show-overflow-tooltip="true" label="任务周期">
+                    <el-table-column prop="taskPeriodName" align="center" :show-overflow-tooltip="true" label="任务周期">
                     </el-table-column>
-                    <el-table-column prop="status" fixed="right" label="状态" align="center">
+                    <el-table-column prop="taskPeriod" fixed="right" label="状态" align="center">
                         <template slot-scope="scope">
                             <div  :style="{ color: scope.row.status ? '#08af58' : '' }">{{ scope.row.status?"已存档":"未完成" }}</div>
                         </template>
@@ -93,7 +93,7 @@
             <excel-view @close="close" :workbookId="workbookId" :pageType="'filling'" :sheetTotal="true"></excel-view>
         </div>
         <el-dialog title="转派其他接收人" :visible.sync="showPersonel" width="50%" :close-on-click-modal="false">
-                <acceptingPersonel :showType="showType" :acceptingId="formData.acceptingId"
+                <acceptingPersonel :showType="showType" :taskId="formData.id"
                     @handelPersonel="handelPersonel"></acceptingPersonel>
             </el-dialog>
     </div>
@@ -112,32 +112,28 @@ export default {
             showType:"",
             showPersonel:false,
             tableData:[
-                {
-                    renwu:"2024年11月 第三周",
-                    data:"12/16",
-                    status:1
-                    
-                }
             ],
             formData:{
-                acceptingId:"12313",
-                title:"请各社区提报党员信息进行中",
-                date:"2024-11-18 11:20:32",
-                person:"张三",
-                bumen:"xx区xx街道",
-                status:1,
-                type:"数据采集",
-                cycle:"每周",
-                fenfa:"16",
-                shuoming:"请各社区技照模板表格提报各自的党员信息，并于每周五前完成提报。请各社区按照模板表格提报各自的党员信息，并于每周五完成提报。请各社区按照模板表格提报各自的党员信息，并于每周五前完成提报"
             },
         };
     },
     created() { },
     async mounted() {
         this.getDetail()
+        this.getPeriodTaskList()
     },
     methods: {
+        getPeriodTaskList(){
+            let parms = {
+                pageNo:1,
+                pageSize:100,
+                taskId: this.taskId,
+            };
+            requestGet('/actual/base/communityOneTablePeriodPublish/getPeriodTaskList', parms).then(res => {
+                this.tableData=res.data.list
+            });
+        },
+
         getDetail() {
             let parms = {
                 id: this.taskId,
@@ -156,6 +152,7 @@ export default {
             this.showPersonel = false;
         },
         oncClickInfo(value){
+            console.log(value,"dslkjflksjd");
             this.showType=value
             this.showPersonel=true
         },
diff --git a/src/views/modules/base/smartExcel/index.vue b/src/views/modules/base/smartExcel/index.vue
index 4b2e135cc..70f6ad4a8 100644
--- a/src/views/modules/base/smartExcel/index.vue
+++ b/src/views/modules/base/smartExcel/index.vue
@@ -74,7 +74,7 @@
           <el-table-column prop="resolveNum" align="center" width="110" label="任务进度" :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="taskState" align="center" width="100" label="任务状态" :show-overflow-tooltip="true">
+          <el-table-column prop="taskStateName" align="center" width="100" label="任务状态" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{ scope.row.taskStateName
                 }}</span>