考评目标启动，考评评价指标内容新增增加功能；问题修改；

src/api/api.js

@@ -85,6 +85,14 @@ export function apiGetdeptresponsibilitySave(params) {
 export function apiGetdoAction(params) {
     return httpRequest.post('workflow/doAction', params)
 }
+//  考评评价指标内容
+export function apiGetOrganizationRule(params) {
+    return httpRequest({
+        url: 'organization-evaluation-rule/getOrganizationRule',
+        method: 'get',
+        params: params
+    })
+}
 
 
 //------考评启动-生成
@@ -139,6 +147,22 @@ export function apiGetOrgEvaluationList(params) {
         params: params
     })
 }
+//------生成报表
+export function apiGetgenerateEvaluateReport(params) {
+    return httpRequest({
+        url: 'evaluate-report/generateEvaluateReport',
+        method: 'post',
+        params: params
+    })
+}
+//------计算得分
+export function apiGetcalculatorcron(params) {
+    return httpRequest({
+        url: 'calculator/cron',
+        method: 'get',
+        params: params
+    })
+}
 //单位月度考评记录-生成
 export function apiGetgenerateUnitMonthEvaluation(params) {
     return httpRequest({

src/assets/css/main.css

@@ -237,6 +237,10 @@ a {
 .el-popper{
     width: 300px;
 }
+.el-popper .el-select-dropdown {
+    min-width: 0 !important;
+    width: 100%;
+}
 .el-popper.is-customized {
 /* Set padding to ensure the height is 32px */
 padding: 6px 12px;

src/components/assessment/evaluationStartFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="考评启动详情" v-model="dialogVisible" width="80vw" :fullscreen="true" :close-on-click-modal="false">
+        <el-dialog title="考评启动详情" v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
                 <el-row class="danjuMsg">
@@ -46,10 +46,10 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <!-- <div class="tableBtn add">
+                    <div class="tableBtn add" @click="addTableDetail" v-if="activeName === 'second'">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div> -->
+                    </div>
                     <div class="tableBtn save" @click="saveDetail" v-if="$utils.havePurview('evalStart:twoLevel:save')">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
@@ -68,12 +68,11 @@
                         <el-table :data="quantifiedList" style="width: 100%" @select="rowClick" @select-all="rowClick">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务类别" prop="stageName" />
-                            <el-table-column label="所属板块" prop="sectionName" />
+                            <el-table-column label="业务阶段" prop="stageName" />
+                            <el-table-column label="业务属性" prop="sectionName" />
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门"  prop="deptName" width="260" />
                             <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
                             <el-table-column label="计划值">
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.quantifiedValue" :precision="2" :step="0.1" :min="1" />
@@ -82,15 +81,89 @@
                             <el-table-column label="单位" prop="unit" />
                         </el-table>
                     </el-tab-pane>
-                    <el-tab-pane label="考评评测性指标内容" name="second">
+                    <el-tab-pane label="考评评价指标内容" name="second">
                         <el-table :data="nonQuantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务类别" prop="stageName" />
-                            <el-table-column label="所属板块" prop="sectionName" />
-                            <el-table-column label="单位名称" prop="organizationName" width="300" />
-                            <el-table-column label="填报部门" prop="deptName" width="260" />                                
-                            <el-table-column label="指标分类" prop="typeName" />
-                            <!-- <el-table-column label="指标项" prop="optionName" /> -->
+                            <el-table-column label="单位名称" prop="organizationName" width="300">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.organizationName" placeholder="请选择单位名称"
+                                    :disabled="!scope.row.showInput"
+                                     @change="changeOrgZa">
+                                        <el-option
+                                        v-for="item in orgruleData"
+                                        :key="item.id"
+                                        :label="item.organizationName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标分类" prop="typeName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.typeName" :disabled="!scope.row.showInput" placeholder="请选择指标分类">
+                                        <el-option
+                                        v-for="item in indicatorTypeData"
+                                        :key="item.id"
+                                        :label="item.typeName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="业务阶段" prop="stageName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.stageName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="(val)=>changeIndic(val, scope.row)">
+                                        <el-option
+                                        v-for="item in stageData"
+                                        :key="item.id"
+                                        :label="item.stageName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="业务属性" prop="sectionName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.sectionName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="(val)=>changeIndic(val, scope.row)">
+                                        <el-option
+                                        v-for="item in sectionNameArr"
+                                        :key="item.id"
+                                        :label="item.secName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="指标名称" prop="childName">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.childName" placeholder="请选择业务阶段"
+                                    :disabled="!scope.row.showInput"
+                                     @change="changeDept">
+                                        <el-option
+                                        v-for="item in indicItemoptions"
+                                        :key="item.id"
+                                        :label="item.indicatorName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="填报部门" prop="deptName" width="260">
+                                <template #default="scope">
+                                    <el-select v-model="scope.row.deptName" placeholder="请选择业务阶段" :disabled="!scope.row.showInput">
+                                        <el-option
+                                        v-for="item in deptNameArr"
+                                        :key="item.id"
+                                        :label="item.deptName"
+                                        :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
                             <el-table-column label="计划值">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue" />
@@ -111,7 +184,8 @@
 </template>
 
 <script>
-import {apiGetdeptresponDetail,apiGetindicatorsaveBatchDto} from '../../api/api'
+import {apiGetdeptresponDetail,apiGetindicatorsaveBatchDto, apiGetOrganizationRule, 
+apiGetindicatorListAll, apiGetbinstageList, apiGetIndicatorTypeList} from '../../api/api'
 import addIcon from '../../assets/btnIcon/add.png'
 import saveIcon from '../../assets/btnIcon/save.png'
 import editIcon from '../../assets/btnIcon/edit.png'
@@ -138,7 +212,13 @@ export default {
             saveIcon: saveIcon,
             editIcon: editIcon,
             deleteIcon: deleteIcon,
-            rowMsg: {}
+            rowMsg: {},
+            orgruleData: [],
+            indicatorTypeData: [],
+            stageData: [],
+            indicItemoptions: [],
+            sectionNameArr: [],
+            deptNameArr: []
         }
     },
     created() {
@@ -158,8 +238,80 @@ export default {
                 recStage: '有效'
             }
             this.getDetails(row.id)
+            this.getOrgRule(row)
+            this.getindList()
             this.rowMsg = row
         },
+        // 考评评价指标内容
+        getOrgRule(row) {
+            let that = this
+            let params = {
+                id: row.id,
+                type: 'mb'
+            }
+            apiGetOrganizationRule(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.orgruleData = datas.data
+                }
+            })
+        },
+        getindList() {
+            let that = this
+            let params = {
+                type: 2
+            }
+            apiGetbinstageList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.stageData = datas.data
+                }
+            })
+            apiGetIndicatorTypeList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.indicatorTypeData = datas.data
+                }
+            })
+        },
+        getIndListAll(row) {
+            let that = this
+            let params = {
+                binSection: row.sectionName,
+                binStage: row.stageName
+            }
+            apiGetindicatorListAll(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.indicItemoptions = datas.data
+                }
+            })
+        },
+        changeIndic(val, row) {
+            if (row.stageName !== '' && row.sectionName !== '') {
+                this.getIndListAll(row)
+            }
+        },
+        changeOrgZa(val) {
+            this.sectionNameArr = []
+            this.orgruleData.forEach(item =>{
+                if (item.id === val) {
+                    let obj = {
+                        id: item.binSection,
+                        secName: item.binSectionName
+                    }
+                    this.sectionNameArr.push(obj)
+                }
+            })
+        },
+        changeDept(val) {
+            this.deptNameArr = []
+            this.indicItemoptions.forEach(item =>{
+                if (item.id === val) {
+                    let obj = {
+                        id: item.dept,
+                        deptName: item.deptName
+                    }
+                    this.deptNameArr.push(obj)
+                }
+            })
+        },
         handleClick() {
             this.changeDateSelect = []
         },
@@ -175,10 +327,30 @@ export default {
             apiGetdeptresponDetail(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data.quantifiedList
-                    that.nonQuantifiedList = datas.data.nonQuantifiedList
+                    // let nonarr = []
+                    if (datas.data.nonQuantifiedList.length>0) {
+                        datas.data.nonQuantifiedList.forEach(it =>{
+                            it.childName = it.organizationName //指标id
+                            // nonarr.push(obj)
+                        })
+                    }
+                    that.nonQuantifiedList = datas.data.nonQuantifiedList.length>0?datas.data.nonQuantifiedList:[]
                 }
             })
         },
+        addTableDetail() {
+            let obj = {
+                showInput: true,
+                stageName: '',
+                sectionName: '',
+                organizationName: '',
+                deptName: '',
+                typeName: '',
+                optionName: '',
+                nonQuantifiedValue: ''
+            }
+            this.nonQuantifiedList.push(obj)
+        },
         saveDetail() {
             let that = this
             let params = []
@@ -193,10 +365,31 @@ export default {
                 })
             } else {
                 that.nonQuantifiedList.forEach(item =>{
-                    let obj = {
-                        id: item.id,
-                        isQuantified: '否',
-                        nonQuantifiedValue: item.nonQuantifiedValue
+                    let obj = {}
+                    if (item.showInput) {
+                        obj = {
+                            deptResponsibilityId: that.rowMsg.id,
+                            isQuantified: '否',
+                            organizationEvaluationRuleId: item.organizationName, //单位id
+                            // typeName: item.typeName,
+                            // deptName: item.deptName,
+                            // stageName: item.stageName,
+                            // sectionName: item.sectionName,
+                            quantifiedValue: 0.0,
+                            indicatorId: item.childName, //指标id
+                            optionCode: 'ZRMB', // 指标项
+                            nonQuantifiedValue: item.nonQuantifiedValue
+                        }
+                    } else {
+                        obj = {
+                            deptResponsibilityId: item.id,
+                            isQuantified: '否',
+                            organizationEvaluationRuleId: item.organizationEvaluationRuleId,
+                            quantifiedValue: 0.0,
+                            indicatorId: item.indicatorId,
+                            optionCode: 'ZRMB', // 指标项
+                            nonQuantifiedValue: item.nonQuantifiedValue
+                        }
                     }
                     params.push(obj)
                 })
@@ -288,7 +481,7 @@ export default {
                             }
                         }
                         .add{
-                            cursor: no-drop;
+                            cursor: pointer;
                             span{
                                 color: #3B7AD1;
                             }

src/components/assessment/evaluationStartPage.vue

@@ -387,6 +387,17 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.title = '新建表单填报'
+            this.$nextTick(() =>{
+                this.$refs['ruleForm'].resetFields()
+                this.ruleForm = {
+                    organizationType: '',
+                    evaluationCycle: '',
+                    evaluateRule: '',
+                    year: '',
+                    month: 0,
+                    desc: ''
+                }
+            })
         },
         //删除
         handleDelete() {

src/components/assessment/evaluationYearFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="月/季度考评详情" v-model="dialogVisible" width="80vw" :fullscreen="true" :close-on-click-modal="false">
+        <el-dialog title="年度考评详情" v-model="dialogVisible" width="80vw" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
                 <el-row class="danjuMsg">
@@ -46,10 +46,10 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <!-- <div class="tableBtn add">
+                    <div class="tableBtn add" v-if="activeName === 'second'">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div> -->
+                    </div>
                     <div class="tableBtn save" @click="saveDetail" v-if="$utils.havePurview('evalYear:twoLevel:save')">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
@@ -68,8 +68,8 @@
                         <el-table :data="quantifiedList" style="width: 100%" @select="rowClick" @select-all="rowClick">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务类别" prop="stageName" />
-                            <el-table-column label="所属板块" prop="sectionName" />
+                            <el-table-column label="业务阶段" prop="stageName" />
+                            <el-table-column label="业务属性" prop="sectionName" />
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门"  prop="deptName" width="260" />
                             <el-table-column label="指标分类" prop="typeName" />
@@ -83,11 +83,11 @@
                             <el-table-column label="单位" prop="unit" />
                         </el-table>
                     </el-tab-pane>
-                    <el-tab-pane label="考评评测性指标内容" name="second">
+                    <el-tab-pane label="考评评价指标内容" name="second">
                         <el-table :data="nonQuantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务类别" prop="stageName" />
-                            <el-table-column label="所属板块" prop="sectionName" />
+                            <el-table-column label="业务阶段" prop="stageName" />
+                            <el-table-column label="业务属性" prop="sectionName" />
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门" prop="deptName" width="260" />                                
                             <el-table-column label="指标分类" prop="typeName" />

src/components/assessment/evaluationYearPage.vue

@@ -65,10 +65,17 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="200">
                         <template #default="scope">
-                            <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
-                            <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p>
+                            <div style="display:flex;justify-content: left;">
+                                <div>
+                                    <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
+                                    <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p>
+                                </div>
+                                <p class="indicitem" @click="calculateScore(scope.row)">计算得分</p>
+                                <p class="indicitem" @click="generateReport(scope.row)">生成报表</p>
+                            </div>
+                            
                         </template>
                     </el-table-column>
                 </el-table>
@@ -143,8 +150,8 @@
 <script>
 import startFromList from './evaluationYearFrom.vue'
 import btns from '../elbuttonS.vue'
-import {apiGetOrgEvaluationList, apiPostOrgEvaSave,apiPostOrgevaluationDelete,
-apiGetgenerateUnitYearEvaluation, apiGetdatadictionaryList} from '../../api/api'
+import {apiGetOrgEvaluationList, apiPostOrgEvaSave,apiPostOrgevaluationDelete,apiGetgenerateEvaluateReport,
+apiGetgenerateUnitYearEvaluation, apiGetdatadictionaryList, apiGetcalculatorcron} from '../../api/api'
 export default {
     components: {
         startFromList,
@@ -329,6 +336,50 @@ export default {
         getDetail(row) {
             this.$refs.startFromDetail.init(row)
         },
+        //计算得分
+        calculateScore(row) {
+            let that = this
+            let params = {
+                id: row.id
+            }
+            apiGetcalculatorcron(params).then(datas =>{
+                if (datas) {
+                    if (datas.success) {
+                        that.$message({
+                            message: datas.message,
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: datas.message,
+                            type: 'error'
+                        });
+                    }
+                } 
+            })
+        },
+        //生成报表
+        generateReport(row) {
+            let that = this
+            let params = {
+                organizationEvaluationId: row.id
+            }
+            apiGetgenerateEvaluateReport(params).then(datas =>{
+                if (datas && datas.data) {
+                    if (datas.success) {
+                        that.$message({
+                            message: datas.message,
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: datas.message,
+                            type: 'error'
+                        });
+                    }
+                } 
+            })
+        },
         getSeachData() {
             this.page.currentPage = 1
             this.getevaluStartList('seach')
@@ -353,6 +404,17 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.title = '新建表单填报'
+            this.$nextTick(() =>{
+                this.$refs['ruleForm'].resetFields()
+                this.ruleForm = {
+                    organizationType: '',
+                    evaluationCycle: '',
+                    evaluateRule: '',
+                    year: '',
+                    month: 0,
+                    desc: ''
+                }
+            })
         },
         //删除
         handleDelete() {

src/components/assessment/monthQuarterFrom.vue

@@ -46,10 +46,10 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <!-- <div class="tableBtn add">
+                    <div class="tableBtn add" v-if="activeName === 'second'">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div> -->
+                    </div>
                     <div class="tableBtn save" @click="saveDetail" v-if="$utils.havePurview('monthQuarter:twoLevel:save')">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
@@ -68,8 +68,8 @@
                         <el-table :data="quantifiedList" style="width: 100%" @select="rowClick" @select-all="rowClick">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务类别" prop="stageName" />
-                            <el-table-column label="所属板块" prop="sectionName" />
+                            <el-table-column label="业务阶段" prop="stageName" />
+                            <el-table-column label="业务属性" prop="sectionName" />
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门"  prop="deptName" width="260" />
                             <el-table-column label="指标分类" prop="typeName" />
@@ -83,11 +83,11 @@
                             <el-table-column label="单位" prop="unit" />
                         </el-table>
                     </el-tab-pane>
-                    <el-tab-pane label="考评评测性指标内容" name="second">
+                    <el-tab-pane label="考评评价指标内容" name="second">
                         <el-table :data="nonQuantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
-                            <el-table-column label="业务类别" prop="stageName" />
-                            <el-table-column label="所属板块" prop="sectionName" />
+                            <el-table-column label="业务阶段" prop="stageName" />
+                            <el-table-column label="业务属性" prop="sectionName" />
                             <el-table-column label="单位名称" prop="organizationName" width="300" />
                             <el-table-column label="填报部门" prop="deptName" width="260" />                                
                             <el-table-column label="指标分类" prop="typeName" />

src/components/assessment/monthQuarterPage.vue

@@ -65,10 +65,16 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="200">
                         <template #default="scope">
-                            <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
-                            <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p>
+                            <div style="display:flex;justify-content: left;">
+                                <div>
+                                    <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
+                                    <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p>
+                                </div>
+                                <p class="indicitem" @click="calculateScore(scope.row)">计算得分</p>
+                                <p class="indicitem" @click="generateReport(scope.row)">生成报表</p>
+                            </div>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -147,8 +153,8 @@
 import startFromList from './monthQuarterFrom.vue'
 import btns from '../elbuttonS.vue'
 import { getToken } from '../../api/auth'
-import {apiGetOrgEvaluationList, apiPostOrgEvaSave,apiPostOrgevaluationDelete,apiGetdoAction,
-apiGetgenerateUnitMonthEvaluation, apiGetdatadictionaryList} from '../../api/api'
+import {apiGetOrgEvaluationList, apiPostOrgEvaSave,apiPostOrgevaluationDelete,apiGetdoAction,apiGetgenerateEvaluateReport,
+apiGetgenerateUnitMonthEvaluation, apiGetdatadictionaryList, apiGetcalculatorcron} from '../../api/api'
 export default {
     components: {
         startFromList,
@@ -335,6 +341,50 @@ export default {
         getDetail(row) {
             this.$refs.startFromDetail.init(row)
         },
+        //计算得分
+        calculateScore(row) {
+            let that = this
+            let params = {
+                id: row.id
+            }
+            apiGetcalculatorcron(params).then(datas =>{
+                if (datas) {
+                    if (datas.success) {
+                        that.$message({
+                            message: datas.message,
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: datas.message,
+                            type: 'error'
+                        });
+                    }
+                } 
+            })
+        },
+        //生成报表
+        generateReport(row) {
+            let that = this
+            let params = {
+                organizationEvaluationId: row.id
+            }
+            apiGetgenerateEvaluateReport(params).then(datas =>{
+                if (datas) {
+                    if (datas.success) {
+                        that.$message({
+                            message: datas.message,
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: datas.message,
+                            type: 'error'
+                        });
+                    }
+                } 
+            })
+        },
         getSeachData() {
             this.page.currentPage = 1
             this.getevaluStartList('seach')
@@ -359,6 +409,17 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.title = '新建表单填报'
+            this.$nextTick(() =>{
+                this.$refs['ruleForm'].resetFields()
+                this.ruleForm = {
+                    organizationType: '',
+                    evaluationCycle: '',
+                    evaluateRule: '',
+                    year: '',
+                    month: 0,
+                    desc: ''
+                }
+            })
         },
         //删除
         handleDelete() {

src/components/evaluationSystem/achievementKDetail.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="业绩考核系数详情" v-model="dialogVisible" width="95vw" :close-on-click-modal="false">
+        <el-dialog title="业绩考核系数详情" v-model="dialogVisible" width="95vw" :fullscreen="true" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">基础信息：</p>
                 <el-row class="danjuMsg">
@@ -132,7 +132,7 @@ export default {
 .startFrom{
     .el-overlay{
         .el-dialog{
-            margin-top: 7vh;
+            // margin-top: 7vh;
             .el-dialog__body{
                 padding: 0 20px !important;
                 .startDetail{
@@ -202,7 +202,7 @@ export default {
                         
                         .el-table{
                             .el-table__body-wrapper{
-                                height: 40vh;
+                                height: 53vh;
                             }
                             .el-table__row{
                                 .cell{
@@ -220,7 +220,12 @@ export default {
             }
             .el-dialog__footer{
                 .dialog-footer{
-                    text-align: center;
+                    display: flex;
+                    justify-content: center;
+                    .el-button{
+                        width: 180px !important;
+                        height: 40px !important;
+                    }
                 }
             }
         }

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -41,9 +41,21 @@
                             <span>{{scope.row.isCheck?'是':'否'}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="生产经营权重" prop="scjyWeight" />
-                    <el-table-column label="前期权重" prop="qqWeight" />
-                    <el-table-column label="基建权重" prop="jjWeight" />
+                    <el-table-column label="生产经营权重" prop="scjyWeight">
+                        <template #default="scope">
+                            <span>{{scope.row.scjyWeight*100}}%</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="前期权重" prop="qqWeight">
+                        <template #default="scope">
+                            <span>{{scope.row.qqWeight*100}}%</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="基建权重" prop="jjWeight">
+                        <template #default="scope">
+                            <span>{{scope.row.jjWeight*100}}%</span>
+                        </template>
+                    </el-table-column>
                     <!-- <el-table-column label="年" prop="year" />
                     <el-table-column label="月" prop="month" /> -->
                 </el-table>

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -396,13 +396,15 @@ export default {
         },
         changeRadio(val) {
             if (val === '否') {
-                if (this.ruleForm.indicatorName !== '' && this.ruleForm.indicatorCode !== '') {
-                    let childitemForm = {
-                        childName: this.ruleForm.indicatorName,
-                        childCode: this.ruleForm.indicatorCode,
-                        list: []
+                if (this.indicatoroptions.length === 0) {
+                    if (this.ruleForm.indicatorName !== '' && this.ruleForm.indicatorCode !== '') {
+                        let childitemForm = {
+                            childName: this.ruleForm.indicatorName,
+                            childCode: this.ruleForm.indicatorCode,
+                            list: []
+                        }
+                        this.indicatoroptions.push(childitemForm)
                     }
-                    this.indicatoroptions.push(childitemForm)
                 }
             } else {
                 this.indicatoroptions = []
@@ -410,13 +412,15 @@ export default {
         },
         blurInput(val) {
             if (this.ruleForm.isChild === '否') {
-                if (this.ruleForm.indicatorName !== '' && this.ruleForm.indicatorCode !== '') {
-                    let childitemForm = {
-                        childName: this.ruleForm.indicatorName,
-                        childCode: this.ruleForm.indicatorCode,
-                        list: []
+                if (this.indicatoroptions.length === 0) {
+                    if (this.ruleForm.indicatorName !== '' && this.ruleForm.indicatorCode !== '') {
+                        let childitemForm = {
+                            childName: this.ruleForm.indicatorName,
+                            childCode: this.ruleForm.indicatorCode,
+                            list: []
+                        }
+                        this.indicatoroptions.push(childitemForm)
                     }
-                    this.indicatoroptions.push(childitemForm)
                 }
             }
         },

src/components/gatewayPage.vue

@@ -21,7 +21,7 @@
             <el-col :span="6">
                 <div class="gateway_bot_left">
                     <div class="bot_leftTit">
-                        <p>年度考评排行榜</p>
+                        <p>年度A级企业排行</p>
                         <el-select v-model="value" class="m-2" placeholder="请选择分类" size="large">
                             <el-option
                             v-for="item in options"

src/components/taskCenter/taskCenterEvlFrom.vue

@@ -63,7 +63,7 @@
                         <span>删除</span>
                     </div> -->
                 </div>
-                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                <el-tabs v-model="activeName" class="tasktabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
                         <el-table :data="quantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
@@ -82,7 +82,7 @@
                             <el-table-column label="单位" prop="unit" />
                         </el-table>
                     </el-tab-pane>
-                    <el-tab-pane label="考评评测性指标内容" name="second">
+                    <el-tab-pane label="考评评价指标内容" name="second">
                         <el-table :data="nonQuantifiedList" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
                             <el-table-column label="业务类别" prop="stageName" />
@@ -156,6 +156,7 @@ export default {
             this.dialogVisible = true
             this.activeName = 'first'
             this.instanceChild = {}
+            this.descMsg = ''
             this.getTaskId(row)
             this.rowMsg = row
         },
@@ -244,10 +245,24 @@ export default {
         },
         examineAndApprove(type) {
             let that = this
+            let actionCS = ''
+            if (type === 'agree') {
+                if (that.rowMsg.taskType === 'SIGN') {
+                    actionCS = 'signAgree'
+                } else if (that.rowMsg.taskType === 'NORMAL') {
+                    actionCS = 'agree'
+                }
+            } else {
+                if (that.rowMsg.taskType === 'SIGN') {
+                    actionCS = 'signReject'
+                } else if (that.rowMsg.taskType === 'NORMAL') {
+                    actionCS = 'reject'
+                }
+            }
             let params = {
-                taskId: that.rowMsg.taskId, //任务ID
+                taskId: that.rowMsg.id, //任务ID
                 nodeId: that.rowMsg.nodeId, //节点ID
-                action: type, //固定值
+                action: actionCS, //固定值
                 instanceId: that.rowMsg.instId, //流程实例ID
                 opinion: that.descMsg, //审批意见
                 iamCode: getToken('code'), //认证后code值
@@ -372,7 +387,7 @@ export default {
                             }
                         }
                     }
-                    .el-tabs{
+                    .tasktabs{
                         .el-tabs__header{
                             .el-tabs__nav{
                                 .el-tabs__item{

src/utils/baseUrl.js

@@ -9,9 +9,9 @@ const baseUrl = {
 switch (process.env.NODE_ENV) { 
     case 'development': 
         baseUrl.ROOT = "/api"  //开发环境url
-        // baseUrl.URL = "http://10.65.59.67:28800"
+        baseUrl.URL = "http://10.65.59.67:28800"
         // baseUrl.URL = "http://123.60.219.66:28800"
-        baseUrl.URL = "http://10.65.78.23:28800"
+        // baseUrl.URL = "http://10.65.78.23:28800"
         break
  
     case 'production': 

src/views/Login.vue

@@ -206,7 +206,7 @@ export default {
                     background: transparent;
                     box-shadow: none;
                     .el-input__inner, .el-input__inner:focus{
-                        background: none;
+                        background-color: transparent;
                         border: none !important;
                         color: #fff;
                         height: 30px;

src/views/homePage.vue

@@ -17,7 +17,7 @@
             </div>
             <div class="homeMain" :style="mainHeight">
                 <div class="homeMain_tag">
-                    <div style="width: 95%;overflow: hidden;">
+                    <div style="width: 90%;overflow: hidden;">
                         <el-tag
                             v-for="tag in routeTags"
                             :key="tag.name"
@@ -32,8 +32,8 @@
                             <span>{{ tag.name }}</span>
                         </el-tag>
                     </div>
-                    <div style="width: 5%;padding-top:20px;cursor:pointer">
-                        <!-- <el-icon @click="closeSys" :size="20" color="#F65177"><SwitchButton /></el-icon> -->
+                    <div class="settingMsg">
+                        <span>{{userName}}</span>
                         <img :src="closeBtn" @click="closeSys" >
                     </div>
                 </div>
@@ -69,7 +69,8 @@ export default {
                 children: 'children',
                 label: 'label',
             },
-            closeBtn: closeBtn
+            closeBtn: closeBtn,
+            userName: ''
         }
     },
     created(){
@@ -227,6 +228,10 @@ export default {
             this.$router.push({ path: this.routeTags[0].index})
             window.sessionStorage.setItem('routeTags', JSON.stringify(this.routeTags))
         }
+        if (window.sessionStorage.getItem('user')) {
+            let obj = JSON.parse(window.sessionStorage.getItem('user'))
+            this.userName = obj.name
+        }
     },
     mounted() {
         
@@ -490,6 +495,25 @@ export default {
                         color: #9DA5BE;
                     }
                 }
+                .settingMsg{
+                    width: 10%;
+                    padding-top:20px;
+                    span{
+                        // width: 80%;
+                        // display: inline-block;
+                        position: relative;
+                        top: -5px;
+                        font-size: 18px;
+                        font-family: '微软雅黑';
+                        font-weight: bold;
+                        color: #171e28;
+                    }
+                    img{
+                        position: relative;
+                        left: 10px;
+                        cursor:pointer
+                    }
+                }
             }
             .mainMessage{
                 width: 100%;