Browse Source

样式修改,功能修改

wangcahngsheng 11 months ago
parent
commit
7bd26b1264

+ 20 - 2
src/components/assessment/evaluationMonthPage.vue

@@ -73,7 +73,7 @@
                     </el-table-column> -->
                     </el-table-column> -->
                     <el-table-column label="操作" width="300">
                     <el-table-column label="操作" width="300">
                         <template #default="scope">
                         <template #default="scope">
-                            <div style="display:flex;justify-content: left;">
+                            <!-- <div style="display:flex;justify-content: left;">
                                 <div style="display:flex;justify-content: left;">
                                 <div style="display:flex;justify-content: left;">
                                     <p class="indicitem" v-if="scope.row.stage === '数据已生成'" @click="agetdeptresponsibility(scope.row)">启动</p>
                                     <p class="indicitem" v-if="scope.row.stage === '数据已生成'" @click="agetdeptresponsibility(scope.row)">启动</p>
                                     <p class="indicitem" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'"
                                     <p class="indicitem" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'"
@@ -85,7 +85,25 @@
                                     <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
                                     <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
                                     <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
                                     <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
                                 </div>
                                 </div>
-                            </div>
+                            </div> -->
+                            <el-row>
+                                <el-col :span="8" v-if="scope.row.stage === '数据已生成'">
+                                    <p class="indicitem" @click="agetdeptresponsibility(scope.row)">启动</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'">
+                                    <p class="indicitem" @click="getGenerateUnitMonthFn(scope.row)">数据生成</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId && scope.row.stage !== '流程已结束'">
+                                    <p class="indicitem" @click="calculateScore(scope.row)">计算得分</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId">
+                                    <p class="indicitem" style="cursor: no-drop;color: #d9d9d9" v-if="isReportshow">生成报表</p>
+                                    <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId">
+                                    <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
+                                </el-col>
+                            </el-row>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                 </el-table>
                 </el-table>

+ 20 - 2
src/components/assessment/evaluationQuarterPage.vue

@@ -73,7 +73,7 @@
                     </el-table-column> -->
                     </el-table-column> -->
                     <el-table-column label="操作" width="300">
                     <el-table-column label="操作" width="300">
                         <template #default="scope">
                         <template #default="scope">
-                            <div style="display:flex;justify-content: left;">
+                            <!-- <div style="display:flex;justify-content: left;">
                                 <div style="display:flex;justify-content: left;">
                                 <div style="display:flex;justify-content: left;">
                                     <p class="indicitem" v-if="scope.row.stage === '数据已生成'" @click="agetdeptresponsibility(scope.row)">启动</p>
                                     <p class="indicitem" v-if="scope.row.stage === '数据已生成'" @click="agetdeptresponsibility(scope.row)">启动</p>
                                     <p class="indicitem" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'"
                                     <p class="indicitem" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'"
@@ -85,7 +85,25 @@
                                     <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
                                     <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
                                     <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
                                     <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
                                 </div>
                                 </div>
-                            </div>
+                            </div> -->
+                            <el-row>
+                                <el-col :span="8" v-if="scope.row.stage === '数据已生成'">
+                                    <p class="indicitem" @click="agetdeptresponsibility(scope.row)">启动</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'">
+                                    <p class="indicitem" @click="getGenerateUnitQuarter(scope.row)">数据生成</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId && scope.row.stage !== '流程已结束'">
+                                    <p class="indicitem" @click="calculateScore(scope.row)">计算得分</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId">
+                                    <p class="indicitem" style="cursor: no-drop;color: #d9d9d9" v-if="isReportshow">生成报表</p>
+                                    <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId">
+                                    <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
+                                </el-col>
+                            </el-row>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                 </el-table>
                 </el-table>

+ 20 - 3
src/components/assessment/evaluationYearPage.vue

@@ -71,7 +71,7 @@
                     </el-table-column>
                     </el-table-column>
                     <el-table-column label="操作" width="300">
                     <el-table-column label="操作" width="300">
                         <template #default="scope">
                         <template #default="scope">
-                            <div style="display:flex;justify-content: left;">
+                            <!-- <div style="display:flex;justify-content: left;">
                                 <div style="display:flex;justify-content: left;">
                                 <div style="display:flex;justify-content: left;">
                                     <p class="indicitem" v-if="scope.row.stage === '数据已生成'" @click="agetdeptresponsibility(scope.row)">启动</p>
                                     <p class="indicitem" v-if="scope.row.stage === '数据已生成'" @click="agetdeptresponsibility(scope.row)">启动</p>
                                     <p class="indicitem" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'"
                                     <p class="indicitem" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'"
@@ -83,8 +83,25 @@
                                     <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
                                     <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
                                     <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
                                     <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
                                 </div>
                                 </div>
-                            </div>
-                            
+                            </div> -->
+                            <el-row>
+                                <el-col :span="8" v-if="scope.row.stage === '数据已生成'">
+                                    <p class="indicitem" @click="agetdeptresponsibility(scope.row)">启动</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.stage === '流程未启动' || scope.row.stage === '数据已生成'">
+                                    <p class="indicitem" @click="getMessageData(scope.row)">数据生成</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId && scope.row.stage !== '流程已结束'">
+                                    <p class="indicitem" @click="calculateScore(scope.row)">计算得分</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId">
+                                    <p class="indicitem" style="cursor: no-drop;color: #d9d9d9" v-if="isReportshow">生成报表</p>
+                                    <p class="indicitem" v-else @click="generateReport(scope.row)">生成报表</p>
+                                </el-col>
+                                <el-col :span="8" v-if="scope.row.instId">
+                                    <p class="indicitem" @click="handleReport(scope.row)">指标考核打分</p>
+                                </el-col>
+                            </el-row>
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                 </el-table>
                 </el-table>

+ 2 - 2
src/components/taskCenter/taskCenterPage.vue

@@ -155,8 +155,8 @@
                     taskId: obj.taskId
                     taskId: obj.taskId
                 }
                 }
                 apiPosteProGetTaskInfo(params).then(datas => {
                 apiPosteProGetTaskInfo(params).then(datas => {
-                    if (datas && datas.data) {
-                        that.taskProcess(datas.data.task)
+                    if (datas && datas.data && datas.data.data.task) {
+                        that.taskProcess(datas.data.data.task)
                     }
                     }
                 })
                 })
             },
             },