Browse Source

单位年度考评展示及问题修改;

SunZehao 1 year ago
parent
commit
f538042ada

+ 5 - 5
src/components/assessment/evaluationYearPage.vue

@@ -34,12 +34,12 @@
                     <el-table-column label="考评单位" width="330">                        
                         <template #default="scope">
                             <el-tooltip
-                                class="box-item"
+                                class="tooltipName"
                                 effect="customized"
-                                :content="scope.row.organizationName"
+                                :content="scope.row.createOrgName"
                                 placement="right"
                             >
-                                <span class="tooltipCC">{{scope.row.organizationName}}</span>
+                                <span class="tooltipCC">{{scope.row.createOrgName}}</span>
                             </el-tooltip>
                         </template>
                     </el-table-column>
@@ -51,7 +51,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="年度" prop="year" />
-                    <el-table-column label="月度/季度" prop="month" />
+                    <!-- <el-table-column label="月度/季度" prop="month" /> -->
                     <el-table-column label="流程状态" prop="stage">
                         <template #default="scope">
                             <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>
@@ -173,7 +173,7 @@ import startFromList from './monthQuarterYearFrom.vue'
 import monthQuarterYearReport from './monthQuarterYearReport.vue'
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
-import {apiGetOrgEvaluationList, apiPostOrgEvaSave,apiPostOrgevaluationDelete,apiGetgenerateEvaluateReport,
+import {apiGetOrgEvaluationList, apiPostOrgEvaSave,apiPostOrgevaluationDelete,apiGetgenerateEvaluateReport,apiGetdoAction,
 apiGetgenerateUnitYearEvaluation, apiGetdatadictionaryList, apiGetcalculatorcron, apiGetworkflowgetOpinion} from '../../api/api'
 export default {
     components: {

+ 9 - 9
src/components/evaluationSystem/ruleDetailPage.vue

@@ -83,13 +83,13 @@
                                         </el-select>
                                     </el-form-item>
                                     <el-form-item label="最低分" prop="minScore">
-                                        <el-input-number v-model="itemForm.minScore" :precision="2" :step="0.1" :min="1" />
+                                        <el-input-number v-model="itemForm.minScore" :precision="2" :step="0.1" :min="0" />
                                     </el-form-item>
                                     <el-form-item label="最高分" prop="maxScore">
-                                        <el-input-number v-model="itemForm.maxScore" :precision="2" :step="0.1" :min="1" />
+                                        <el-input-number v-model="itemForm.maxScore" :precision="2" :step="0.1" :min="0" />
                                     </el-form-item>
                                     <el-form-item label="基准分" prop="standardScore">
-                                        <el-input-number v-model="itemForm.standardScore" :precision="2" :step="0.1" :min="1" />
+                                        <el-input-number v-model="itemForm.standardScore" :precision="2" :step="0.1" :min="0" />
                                     </el-form-item>
                                     <el-form-item label="指标顺序" prop="orderNum">
                                         <el-input-number v-model="itemForm.orderNum" :min="1" />
@@ -137,9 +137,9 @@ export default {
             evaluationIndexData:[],
             itemForm: {
                 indicator: '',
-                minScore: 1,
-                maxScore: 1,
-                standardScore: 1,
+                minScore: 0,
+                maxScore: 0,
+                standardScore: 0,
                 orderNum: 1,
                 desc: ''
             },
@@ -202,9 +202,9 @@ export default {
             this.$nextTick(() =>{
                 this.itemForm = {
                     indicator: '',
-                    minScore: 1,
-                    maxScore: 1,
-                    standardScore: 1,
+                    minScore: 0,
+                    maxScore: 0,
+                    standardScore: 0,
                     orderNum: 1,
                     desc: ''
                 }