修改问题

src/components/assessment/evaluationMonthPage.vue

@@ -44,15 +44,21 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="业务类别">
+                    <el-table-column label="考评年度" prop="year" />
+                    <el-table-column label="考评月份" prop="month" />
+                    <el-table-column label="创建人" prop="createName" />
+                    <el-table-column label="流程状态" prop="stage">
+                        <template #default="scope">
+                            <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>
+                        </template>
+                    </el-table-column>
+                    <!-- <el-table-column label="业务类别">
                         <template #default="scope">
                             <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
                             <span v-else-if="scope.row.checkCycle === 'JDKP'" style="font-size: 12px;">季度考评</span>
                             <span v-else style="font-size: 12px;">年度考评</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="年度" prop="year" />
-                    <el-table-column label="月度/季度" prop="month" />
                     <el-table-column label="业务简述" width="330">
                         <template #default="scope">
                             <el-tooltip
@@ -64,12 +70,7 @@
                                 <span class="tooltipCCDes">{{scope.row.des}}</span>
                             </el-tooltip>
                         </template>
-                    </el-table-column>
-                    <el-table-column label="流程状态" prop="stage">
-                        <template #default="scope">
-                            <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>
-                        </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="操作" width="200">
                         <template #default="scope">
                             <div style="display:flex;justify-content: left;">
@@ -96,7 +97,7 @@
                 <div class="periodFrom">
                     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
                         <el-form-item label="考评类别" prop="organizationType">
-                            <el-select v-model="ruleForm.organizationType" placeholder="请选择考评类别">
+                            <el-select v-model="ruleForm.organizationType" placeholder="请选择考评类别" disabled>
                                 <el-option
                                 v-for="item in organizationType"
                                 :key="item.code"
@@ -106,7 +107,7 @@
                             </el-select>
                         </el-form-item>                            
                         <el-form-item label="考评周期" prop="evaluationCycle">
-                            <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择考评周期">
+                            <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择考评周期" disabled>
                                 <el-option
                                 v-for="item in periodData"
                                 :key="item.keyValue"
@@ -439,14 +440,16 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.title = '新建表单填报'
+            let year = new Date().getFullYear()
+            let month = new Date().getMonth()
             this.$nextTick(() =>{
                 this.$refs['ruleForm'].resetFields()
                 this.ruleForm = {
-                    organizationType: '',
-                    evaluationCycle: '',
-                    evaluateRule: '',
-                    year: '',
-                    month: 0,
+                    organizationType: 'DWKP',
+                    evaluationCycle: 'YDKP',
+                    // evaluateRule: '',
+                    year: year.toString(),
+                    month: month,
                     desc: ''
                 }
             })

src/components/assessment/evaluationQuarterPage.vue

@@ -14,11 +14,12 @@
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
             <div class="PeriodBtn">
+                <!-- $utils.havePurview('evaluationQuarter:oneLevel:add') -->
                 <btns
                 :showImport="false"
                 :showExport="false"
                 :showSave="false"
-                :showAdd="$utils.havePurview('evaluationQuarter:oneLevel:add')"
+                :showAdd="true"
                 :showDelete="$utils.havePurview('evaluationQuarter:oneLevel:delete')"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"
@@ -44,15 +45,21 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="业务类别">
+                    <el-table-column label="考评年度" prop="year" />
+                    <el-table-column label="考评季度" prop="month" />
+                    <el-table-column label="创建人" prop="createName" />
+                    <el-table-column label="流程状态" prop="stage">
+                        <template #default="scope">
+                            <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>
+                        </template>
+                    </el-table-column>
+                    <!-- <el-table-column label="业务类别">
                         <template #default="scope">
                             <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
                             <span v-else-if="scope.row.checkCycle === 'JDKP'" style="font-size: 12px;">季度考评</span>
                             <span v-else style="font-size: 12px;">年度考评</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="年度" prop="year" />
-                    <el-table-column label="月度/季度" prop="month" />
                     <el-table-column label="业务简述" width="330">
                         <template #default="scope">
                             <el-tooltip
@@ -64,12 +71,7 @@
                                 <span class="tooltipCCDes">{{scope.row.des}}</span>
                             </el-tooltip>
                         </template>
-                    </el-table-column>
-                    <el-table-column label="流程状态" prop="stage">
-                        <template #default="scope">
-                            <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>
-                        </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="操作" width="200">
                         <template #default="scope">
                             <div style="display:flex;justify-content: left;">
@@ -96,7 +98,7 @@
                 <div class="periodFrom">
                     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
                         <el-form-item label="考评类别" prop="organizationType">
-                            <el-select v-model="ruleForm.organizationType" placeholder="请选择考评类别">
+                            <el-select v-model="ruleForm.organizationType" placeholder="请选择考评类别" disabled>
                                 <el-option
                                 v-for="item in organizationType"
                                 :key="item.code"
@@ -106,7 +108,7 @@
                             </el-select>
                         </el-form-item>                            
                         <el-form-item label="考评周期" prop="evaluationCycle">
-                            <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择考评周期">
+                            <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择考评周期" disabled>
                                 <el-option
                                 v-for="item in periodData"
                                 :key="item.keyValue"
@@ -439,14 +441,26 @@ export default {
         handleAdd() {
             this.dialogVisible = true
             this.title = '新建表单填报'
+            let year = new Date().getFullYear()
+            let month = new Date().getMonth() + 1
+            let quaet = 1
+            if (month < 4) {
+                quaet = 1
+            } else if(month>3 && month<7) {
+                quaet = 2
+            } else if(month>6 && month<10) {
+                quaet = 3
+            } else if(month>9 && month<13) {
+                quaet = 4
+            }
             this.$nextTick(() =>{
                 this.$refs['ruleForm'].resetFields()
                 this.ruleForm = {
-                    organizationType: '',
-                    evaluationCycle: '',
-                    evaluateRule: '',
-                    year: '',
-                    month: 0,
+                    organizationType: 'DWKP',
+                    evaluationCycle: 'JDKP',
+                    // evaluateRule: '',
+                    year: year.toString(),
+                    month: quaet,
                     desc: ''
                 }
             })

src/components/assessment/evaluationStartPage.vue

@@ -28,10 +28,11 @@
                 ></btns>
             </div>
             <div class="evaluationStartTableData">
-                <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
+                <el-table :data="evaluationStartData" style="width: 100%" @select="rowClick"
+                 @select-all="rowClick" @row-dblclick="getDetail" @cell-click="clickDes">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
-                    <el-table-column label="业务编号" prop="responsibilityCode" width="300" />
-                    <el-table-column label="考评单位" width="330">
+                    <el-table-column label="业务编号" prop="responsibilityCode" />
+                    <el-table-column label="考评单位" width="400">
                         <template #default="scope">
                             <el-tooltip
                                 class="box-item"
@@ -43,28 +44,33 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="业务类别">
+                    <el-table-column label="考评年度" prop="year" width="120" />
+                    <el-table-column label="业务简述" prop="des" width="400">
                         <template #default="scope">
-                            <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
-                            <span v-else-if="scope.row.checkCycle === 'JDKP'" style="font-size: 12px;">季度考评</span>
-                            <span v-else style="font-size: 12px;">年度考评</span>
+                            <div v-if="!scope.row.chngeDes">
+                                <el-tooltip
+                                    class="box-item"
+                                    effect="customized"
+                                    :content="scope.row.des"
+                                    placement="top"
+                                >
+                                    <span class="tooltipCC">{{scope.row.des}}</span>
+                                </el-tooltip>
+                            </div>
+                            <div v-else>
+                                <el-input v-model="scope.row.des" :rows="1" 
+                                type="textarea" placeholder="请输入描述" @blur="modifyDesFn(scope.row)"></el-input>
+                            </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="年度" prop="year" />
-                    <!-- <el-table-column label="月度/季度" prop="month" /> -->
-                    <el-table-column label="业务简述" prop="des" width="330">
+                    <!-- <el-table-column label="业务类别">
                         <template #default="scope">
-                            <el-tooltip
-                                class="box-item"
-                                effect="customized"
-                                :content="scope.row.des"
-                                placement="top"
-                            >
-                                <span class="tooltipCC">{{scope.row.des}}</span>
-                            </el-tooltip>
+                            <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
+                            <span v-else-if="scope.row.checkCycle === 'JDKP'" style="font-size: 12px;">季度考评</span>
+                            <span v-else style="font-size: 12px;">年度考评</span>
                         </template>
-                    </el-table-column>
-                    <el-table-column label="流程状态" prop="stage">
+                    </el-table-column> -->
+                    <el-table-column label="流程状态" prop="stage" width="200">
                         <template #default="scope">
                             <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>
                         </template>
@@ -99,7 +105,7 @@
                             </el-select>
                         </el-form-item>                            
                         <el-form-item label="考评周期" prop="evaluationCycle">
-                            <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择考评周期" @change="(val)=>chooseRule(val,'周期')">
+                            <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择考评周期" disabled @change="(val)=>chooseRule(val,'周期')">
                                 <el-option
                                 v-for="item in periodData"
                                 :key="item.keyValue"
@@ -274,6 +280,23 @@ export default {
                 }
             }
         },
+        modifyDesFn(row) {
+            let that = this
+            apiGetdeptresponsibilitySave(row).then(datas =>{
+                if (!datas.success) {
+                    that.$message({
+                        message: datas.message,
+                        type: 'error'
+                    });
+                } else {
+                    that.$message({
+                        message: '考评目标修改成功',
+                        type: 'success'
+                    });
+                    that.getevaluStartList()
+                }
+            })
+        },
         saveevaluaStart(formName) {
             let that = this
             that.$refs[formName].validate((valid) => {
@@ -310,12 +333,12 @@ export default {
                 } else {
                     if (!that.isSave) {
                         that.$message({
-                            message: '考评规则新增成功',
+                            message: '考评目标新增成功',
                             type: 'success'
                         });
                     } else {
                         that.$message({
-                            message: '考评规则修改成功',
+                            message: '考评目标修改成功',
                             type: 'success'
                         });
                     }
@@ -365,6 +388,16 @@ export default {
                 }
             })
         },
+        clickDes(row, column, cell, event) {
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            if (userMes.id === row.createBy && row.stage === '流程未启动') {
+                if (column.label === '业务简述') {
+                    row.chngeDes = true
+                } else {
+                    row.chngeDes = false
+                }
+            }
+        },
         //明细
         getDetail(row) {
             this.$refs.startFromDetail.init(row)
@@ -426,8 +459,8 @@ export default {
                 this.$refs['ruleForm'].resetFields()
                 this.ruleForm = {
                     organizationType: '',
-                    evaluationCycle: '',
-                    evaluateRule: '',
+                    evaluationCycle: 'NDKP',
+                    // evaluateRule: '',
                     year: '',
                     month: 0,
                     desc: ''

src/components/evaluationSystem/achievementKPage.vue

@@ -32,12 +32,12 @@
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="序号" type="index" />
                     <el-table-column label="业务编码" prop="coefficientCode" />
-                    <el-table-column label="单位名称" prop="createOrgName" width="300" />
-                    <el-table-column label="业务简述" prop="des" />
+                    <el-table-column label="单位名称" prop="createOrgName" width="400" />
+                    <el-table-column label="业务简述" prop="des" width="400"/>
                     <el-table-column label="年度" prop="year" />
-                    <el-table-column label="单据状态" prop="state" />
-                    <el-table-column label="修改人员" prop="updateBy" />
-                    <el-table-column label="修改时间" prop="updateTime" />
+                    <!-- <el-table-column label="单据状态" prop="state" /> -->
+                    <el-table-column label="创建人" prop="createName" />
+                    <el-table-column label="修改时间" prop="updateTime" width="200" />
                     <el-table-column label="操作">
                         <template #default="scope">
                             <p class="indicitem" @click="detailWatch(scope.row)">详情</p>
@@ -427,6 +427,7 @@ export default {
         //新增/修改指标数据
         saveAndEditIndicatorData() {
             let that = this
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let orgName = ''
             this.departmentDataAll.forEach(item =>{
                 if (item.id === that.achObj.organizationName) {
@@ -438,7 +439,11 @@ export default {
                 createOrgName: orgName,                
                 year: that.achObj.year,
                 des: that.achObj.desc,
-                coefficientList: that.weightAllocation
+                coefficientList: that.weightAllocation,
+                createOrgId: userMes.unitId,
+                createOrgName: userMes.unitName,
+                createBy: userMes.id,
+                createName: userMes.name
             }
             if (that.isSave) {
                 params.id = this.evalradio.id

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -42,21 +42,21 @@
                 <el-table :data="evaluationIndexData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="editEvaluaIndex">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="指标编码" prop="indicatorCode" width="200" />
-                    <el-table-column label="指标名称" prop="indicatorName" width="300" />
+                    <el-table-column label="业务属性" prop="binSectionName" />
+                    <el-table-column label="业务阶段" prop="binStageName" />
                     <el-table-column label="指标类型" prop="indicatorTypeName" width="200" />
+                    <el-table-column label="指标名称" prop="indicatorName" width="300" />
                     <el-table-column label="指标单位" prop="unit" />
-                    <el-table-column label="业务阶段" prop="binStageName" />
-                    <el-table-column label="业务属性" prop="binSectionName" />
                     <!-- <el-table-column label="公司" prop="company" /> -->
-                    <el-table-column label="部门" prop="deptName" width="150" />
+                    <!-- <el-table-column label="部门" prop="deptName" width="150" /> -->
                     <el-table-column label="是否专项" prop="isAdditional" />
-                    <el-table-column label="是否量化" prop="isQuantified" />
-                    <el-table-column label="是否子指标">
+                    <!-- <el-table-column label="是否量化" prop="isQuantified" /> -->
+                    <!-- <el-table-column label="是否子指标">
                         <template #default="scope">
                             <span>{{scope.row.isChild === true?'是':'否'}}</span>
                         </template>
-                    </el-table-column>
-                    <el-table-column label="描述">
+                    </el-table-column> -->
+                    <el-table-column label="描述" width="250">
                         <template #default="scope">
                             <span>{{scope.row.des}}</span>
                         </template>
@@ -422,6 +422,7 @@ export default {
             }
         },
         blurInput(val) {
+            if (this.isDetail) return
             if (this.ruleForm.isChild === '否') {
                 if (this.indicatoroptions.length === 0) {
                     if (this.ruleForm.indicatorName !== '' && this.ruleForm.indicatorCode !== '') {

src/components/evaluationSystem/evaluationRulesPage.vue

@@ -39,14 +39,14 @@
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="规则名称" prop="ruleName" />
                     <el-table-column label="业务阶段" prop="binStageName" />
-                    <el-table-column label="业务属性" prop="binSectionName" />
-                    <el-table-column label="创建者" prop="createName" width="120" />
-                    <el-table-column label="创建时间" prop="createTime" />
-                    <el-table-column label="描述">
+                    <el-table-column label="业务属性" prop="binSectionName" width="200"/>
+                    <el-table-column label="描述" width="500">
                         <template #default="scope">
                             <span>{{scope.row.des}}</span>
                         </template>
                     </el-table-column>
+                    <el-table-column label="创建人" prop="createName" width="120" />
+                    <el-table-column label="创建时间" prop="createTime"  width="200"/>
                     <el-table-column label="操作" width="80">
                         <template #default="scope">
                             <p class="indicitem" @click="editRuleDetail(scope.row)">详情</p>

src/components/evaluationSystem/partyBuildingKPage.vue

@@ -46,7 +46,7 @@
                             <span>{{scope.row.multiplier*100}}%</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="备注" prop="remarks" />
+                    <el-table-column label="备注" prop="remarks" width="350" />
                 </el-table>
                 <el-pagination
                     @size-change="handleSizeChange"
@@ -240,6 +240,7 @@ export default {
         },
         saveAndEditpartBuildData() {
             let that = this
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let comName = ''
             that.companyDatas.forEach(item =>{
                 if (item.id === that.ruleForm.organizationName) {
@@ -252,7 +253,11 @@ export default {
                 sectionId: that.ruleForm.sectionName,
                 year: that.ruleForm.year,
                 multiplier: that.ruleForm.multiplier,
-                remarks: that.ruleForm.remarks
+                remarks: that.ruleForm.remarks,
+                createOrgId: userMes.unitId,
+                createOrgName: userMes.unitName,
+                createBy: userMes.id,
+                createName: userMes.name
             }
             if (that.isSave) {
                 params.id = that.evalradio.id

src/views/Login.vue

@@ -123,6 +123,10 @@ export default {
                 if (datas && datas.data) {
                     // setToken('user', JSON.stringify(datas.data))
                     let obj = {
+                        unitId: datas.data.unitId,
+                        unitName: datas.data.unitName,
+                        deptId: datas.data.deptId,
+                        deptName: datas.data.deptName,
                         name: datas.data.name,
                         id: datas.data.id
                     }