发布任务详情状态颜色修改，加标题跟周期，提报文件名称修改为社区名+分配人名

任务填报详情顺序调整

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

@@ -71,12 +71,13 @@
                     style="width: 70%;margin-left: 3%; margin-top: 30px;" >
                     <el-table-column label="序号" fixed="left" type="index" align="center" width="80" />
                     <el-table-column prop="taskPeriodName" align="center" :show-overflow-tooltip="true" label="任务周期">
+                        <template slot-scope="scope">
+                            {{taskPeriod === 'once'?'一次性':`第${scope.row.taskNum}个周期`}}
+                        </template>
                     </el-table-column>
                     <el-table-column fixed="right" label="汇报情况" align="center">
                         <template slot-scope="scope">
-                            <el-button @click=" handleInfo(scope.row)" type="text" size="small">{{ scope.row.resolveNum
+                            <el-button @click="handleInfo(scope.row)" type="text" size="small">{{ scope.row.resolveNum}}/{{ scope.row.totalNum }}</el-button>
-                                }}/{{ scope.row.totalNum
-                                }}</el-button>
                             <el-button @click="handelClickShowSummary(scope.row)" type="text" size="small">查看</el-button>
                         </template>
                     </el-table-column>

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

@@ -7,15 +7,16 @@
                 <el-button type="text" icon="el-icon-back" @click="handleClickBack">返回</el-button>
             </div>
             <div class="item flex flex-y flex-center-deputy " @click="handleClickShowViewAll(list[0].workBookId)">
-                <img :src="require(`@/assets/images/index/Excel.png`)" alt="">
+                <div><span>任务主题：{{list[0].taskIntroduction}}</span> <span>任务周期：{{list[0].taskPeriodName}}</span></div>
-                <div class="agencyName">周期更新表</div>
+                <img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="margin: 10px 0 0;">
+                <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="">
-                    <div class="agencyName">{{ item.taskTitle }}周期更新表</div>
+                    <div class="agencyName">{{ item.agencyName }}-{{item.userName}}</div>
-                    <div>（{{ getStateDescription(item.taskState) }}）</div>
+                    <div :class="item.taskState === 'archived'?'green':item.taskState === 'submit'?'blue':item.taskState === 'rejected'?'black':'orange'">（{{ item.taskStateName }}）</div>
                 </div>
             </div>
         </div>
@@ -48,20 +49,6 @@ export default {
         this.getTableList()
     },
     methods: {
-        getStateDescription(state) {
-            const stateMap = {
-                deal: "处理中",
-                resolve: "完结",
-                cancel: "取消",
-                notStart: "未开始",
-                notSubmit: "未提交",
-                rejected: "已驳回",
-                submit: "已提交",
-                archived: "已存档",
-                reassigne: "已改派"
-            };
-            return stateMap[state] || "未开始";
-        },
         async getTableList(){
             let url = '/actual/base/communityOneTablePeriodPublish/page'
             let params = {
@@ -152,4 +139,16 @@ export default {
 .agencyName {
     margin: 12px 0 12px;
 }
-</style>
+.orange{
+    color: #f87f3a;
+}
+.green{
+    color: #08b9b4;
+}
+.blue{
+    color: #5294ff;
+}
+.black{
+    color:#323888;
+}
+</style>

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

@@ -16,9 +16,14 @@
 
                         </el-form-item>
                     </el-col>
-                    <el-col :span="16">
+                    <el-col :span="8">
-                        <el-form-item label="任务发布时间">
+                        <el-form-item label="任务周期">
-                            <div>{{ formData.createdTime }}</div>
+                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : '每周' }}</div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="完成时限">
+                            <div style="color: #FF3300;"> <span v-if="formData.taskPeriod !== 'once'">每周</span>{{formData.completeLimitDay}} {{ formData.completeLimitHour }}</div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -31,16 +36,6 @@
                             <div>{{ formData.createByName }}</div>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="任务类型">
-                            <div>{{ formData.type }}</div>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="16">
-                        <el-form-item label="任务周期">
-                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : '每周' }}</div>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="任务接收人">
                             <div style="display: flex;flex-direction: row; align-items: center;">
@@ -51,6 +46,16 @@
 
                         </el-form-item>
                     </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="任务类型">
+                            <div>数据提报</div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8" v-if="formData.taskPeriod != 'once'">
+                        <el-form-item label="任务有效期">
+                            <div>{{ formData.startTime }} 至 {{ formData.endTime }}</div>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="任务说明">
                             <div style="display: flex;flex-direction: row; align-items: center;">
@@ -69,7 +74,7 @@
                     @click="handleClickShowView(formData.subWorkBookId, formData.taskStateName)" :key="index">
                     <img :src="require(`@/assets/images/index/Excel.png`)" alt="">
                     <div class="agencyName">{{ formData.taskTitle }}</div>
-                    <div>（{{ formData.taskStateName }}）</div>
+                    <div :class="formData.taskState === 'archived'?'green':formData.taskState === 'submit'?'blue':formData.taskState === 'rejected'?'black':'orange'">（{{ formData.taskStateName }}）</div>
                 </div>
             </div>
             <div class="flex title flex-center-deputy">
@@ -83,7 +88,7 @@
                     </el-table-column>
                     <el-table-column prop="taskStateName" fixed="right" label="状态" align="center">
                         <template slot-scope="scope">
-                            <div :style="{ color: scope.row.taskStateName == '已存档' ? '#08af58' : '' }">{{
+                            <div :class="scope.row.taskState === 'archived'?'green':scope.row.taskState === 'submit'?'blue':scope.row.taskState === 'rejected'?'black':'orange'">{{
             scope.row.taskStateName }}</div>
                         </template>
                     </el-table-column>
@@ -236,4 +241,16 @@ export default {
         height: 80px;
     }
 }
+.orange{
+    color: #f87f3a;
+}
+.green{
+    color: #08b9b4;
+}
+.blue{
+    color: #5294ff;
+}
+.black{
+    color:#323888;
+}
 </style>