Browse Source

常规提交

SunZehao 1 year ago
parent
commit
4a5f4f024f

+ 3 - 2
src/components/assessment/evaluationAmendmentPage.vue

@@ -366,7 +366,8 @@ export default {
                 apiGetdoAction(par).then(datas =>{
                     if (datas && datas.data) {
                         if (datas.data.isOk) {
-                            that.getDeptresponsibility(row)
+                            that.getevaluAmendmentList()
+                            // that.getDeptresponsibility(row)
                         } else {
                             that.$message({
                                 message: datas.data.msg,
@@ -376,7 +377,7 @@ export default {
                     }
                 })
             } else {
-                that.getDeptresponsibility(row)
+                // that.getDeptresponsibility(row)
             }
         },
         // 生成目标责任书

+ 11 - 3
src/components/baseInfomation/moreBrandPage.vue

@@ -41,7 +41,11 @@
                             <el-table :data="props.row.children" border>
                                 <el-table-column label="单位名称" prop="organizationName" />
                                 <el-table-column label="业务属性" prop="binSectionName" />
-                                <el-table-column label="考评周期" prop="checkCycle" />
+                                <el-table-column label="考评周期" prop="checkCycle">
+                                    <template #default="scope">
+                                        <span>{{scope.row.checkCycle === 'YDKP'?'月度考评':scope.row.checkCycle === 'JDKP'?'季度考评':'年度考评'}}</span>
+                                    </template>
+                                </el-table-column>
                                 <el-table-column label="利润金额" prop="profit" />
                                 <el-table-column label="分数" prop="score" />
                                 <el-table-column label="年" prop="year" />
@@ -61,7 +65,11 @@
                     </el-table-column>
                     <el-table-column label="单位名称" prop="organizationName" />
                     <el-table-column label="业务属性" prop="binSectionName" />
-                    <el-table-column label="考评周期" prop="checkCycle" />
+                    <el-table-column label="考评周期" prop="checkCycle">
+                        <template #default="scope">
+                            <span>{{scope.row.checkCycle === 'YDKP'?'月度考评':scope.row.checkCycle === 'JDKP'?'季度考评':'年度考评'}}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="利润金额" prop="profit" />
                     <el-table-column label="分数" prop="score" />
                     <el-table-column label="年" prop="year" />
@@ -213,7 +221,7 @@ export default {
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
-                binSectionName: that.moduleStr,
+                binSection: that.moduleStr,
                 checkCycle: that.checkCycleStr
             }
             apiGetmultiplebrandtreeList(params).then(datas =>{