配合后端修改bug

src/api/api.js

@@ -23,8 +23,8 @@ export function apiGetModel(url, params) {
 //获取菜单数据
 export function apiGetMenuData() {
     return httpRequest({
-        url: 'menu/menuList?parentId=10105', // 测试
-        // url: 'menu/menuList?parentId=6802', // 生产
+        // url: 'menu/menuList?parentId=10105', // 测试
+        url: 'menu/menuList?parentId=6802', // 生产
         method: 'post'
     })
 }

src/components/assessment/evaluationMonthPage.vue

@@ -313,34 +313,42 @@ export default {
                 opinion: "月度单位考评",
                 iamCode: window.localStorage.getItem('code')
             }
-            apiGetdoAction(par).then(datas =>{
-                if (datas && datas.data) {
-                    if (datas.data.isOk) {
-                        let params = {
-                            evaluationIds: row.id
+            if (row.instId !== null || row.instId !== '') {
+                apiGetdoAction(par).then(datas =>{
+                    if (datas && datas.data) {
+                        if (datas.data.isOk) {
+                            that.getGenerateUnitMonth(row)
+                        } else {
+                            that.$message({
+                                message: datas.data.msg,
+                                type: 'error'
+                            });
                         }
-                        apiGetgenerateUnitMonthEvaluation(params).then(datas =>{
-                            if (datas && datas.data) {
-                                if (!datas.success) {
-                                    that.$message({
-                                        message: datas.message,
-                                        type: 'error'
-                                    });
-                                } else {
-                                    that.$message({
-                                        message: '月度单位考评已启动',
-                                        type: 'success'
-                                    });
-                                    that.getevaluStartList()
-                                }
-                            }
-                        })
-                    } else {
+                    }
+                })
+            } else {
+                that.getGenerateUnitMonth(row)
+            }
+        },
+        getGenerateUnitMonth(row) {
+            let that = this
+            let params = {
+                evaluationIds: row.id
+            }
+            apiGetgenerateUnitMonthEvaluation(params).then(datas =>{
+                if (datas && datas.data) {
+                    if (!datas.success) {
                         that.$message({
-                            message: datas.data.msg,
+                            message: datas.message,
                             type: 'error'
                         });
+                    } else {
+                        that.$message({
+                            message: '月度单位考评已启动',
+                            type: 'success'
+                        });
                     }
+                    that.getevaluStartList()
                 }
             })
         },

src/components/assessment/evaluationQuarterPage.vue

@@ -314,34 +314,42 @@ export default {
                 opinion: "季度单位考评",
                 iamCode: window.localStorage.getItem('code')
             }
-            apiGetdoAction(par).then(datas =>{
-                if (datas && datas.data) {
-                    if (datas.data.isOk) {
-                        let params = {
-                            evaluationIds: row.id
+            if (row.instId !== null || row.instId !== '') {
+                apiGetdoAction(par).then(datas =>{
+                    if (datas && datas.data) {
+                        if (datas.data.isOk) {
+                            that.getGenerateUnitQuarter(row)
+                        } else {
+                            that.$message({
+                                message: datas.data.msg,
+                                type: 'error'
+                            });
                         }
-                        apiGetgenerateUnitMonthEvaluation(params).then(datas =>{
-                            if (datas && datas.data) {
-                                if (!datas.success) {
-                                    that.$message({
-                                        message: datas.message,
-                                        type: 'error'
-                                    });
-                                } else {
-                                    that.$message({
-                                        message: '月度单位考评已启动',
-                                        type: 'success'
-                                    });
-                                    that.getevaluStartList()
-                                }
-                            }
-                        })
-                    } else {
+                    }
+                })
+            } else {
+                that.getGenerateUnitQuarter(row)
+            }
+        },
+        getGenerateUnitQuarter(row) {
+            let that = this
+            let params = {
+                evaluationIds: row.id
+            }
+            apiGetgenerateUnitMonthEvaluation(params).then(datas =>{
+                if (datas && datas.data) {
+                    if (!datas.success) {
                         that.$message({
-                            message: datas.data.msg,
+                            message: datas.message,
                             type: 'error'
                         });
+                    } else {
+                        that.$message({
+                            message: '季度单位考评已启动',
+                            type: 'success'
+                        });
                     }
+                    that.getevaluStartList()
                 }
             })
         },

src/components/assessment/evaluationStartPage.vue

@@ -37,10 +37,10 @@
                             <el-tooltip
                                 class="box-item"
                                 effect="customized"
-                                :content="scope.row.organizationName"
+                                :content="scope.row.createOrgName"
                                 placement="top"
                             >
-                                <span class="tooltipCC">{{scope.row.organizationName}}</span>
+                                <span class="tooltipCC">{{scope.row.createOrgName}}</span>
                             </el-tooltip>
                         </template>
                     </el-table-column>
@@ -359,34 +359,43 @@ export default {
                 opinion: "考评目标启动",
                 iamCode: window.localStorage.getItem('code')
             }
-            apiGetdoAction(par).then(datas =>{
-                if (datas && datas.data) {
-                    if (datas.data.isOk) {
-                        let params = {
-                            responsibilityIds: row.id
+            if (row.instId !== null || row.instId !== '') {
+                apiGetdoAction(par).then(datas =>{
+                    if (datas && datas.data) {
+                        if (datas.data.isOk) {
+                            that.getDeptresponsibility(row)
+                        } else {
+                            that.$message({
+                                message: datas.data.msg,
+                                type: 'error'
+                            });
                         }
-                        apiGetdeptresponsibilitygenerate(params).then(datas =>{
-                            if (datas && datas.data) {
-                                if (!datas.success) {
-                                    that.$message({
-                                        message: datas.message,
-                                        type: 'error'
-                                    });
-                                } else {
-                                    that.$message({
-                                        message: '考评目标已启动',
-                                        type: 'success'
-                                    });
-                                    that.getevaluStartList()
-                                }
-                            }
-                        })
-                    } else {
+                    }
+                })
+            } else {
+                that.getDeptresponsibility(row)
+            }
+        },
+        // 生成目标责任书
+        getDeptresponsibility(row) {
+            let that = this
+            let params = {
+                responsibilityIds: row.id
+            }
+            apiGetdeptresponsibilitygenerate(params).then(datas =>{
+                if (datas && datas.data) {
+                    if (!datas.success) {
                         that.$message({
-                            message: datas.data.msg,
+                            message: datas.message,
                             type: 'error'
                         });
+                    } else {
+                        that.$message({
+                            message: '考评目标已启动',
+                            type: 'success'
+                        });
                     }
+                    that.getevaluStartList()
                 }
             })
         },

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -21,11 +21,12 @@
                 <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
             </div>
             <div class="PeriodBtn">
+                <!-- $utils.havePurview('evalIndex:oneLevel:save') -->
                 <btns
                 :showImport="false"
                 :showExport="false"
                 :showAdd="$utils.havePurview('evalIndex:oneLevel:add')"
-                :showSave="$utils.havePurview('evalIndex:oneLevel:save')"
+                :showSave="true"
                 :showDelete="$utils.havePurview('evalIndex:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"

src/components/evaluationSystem/partyBuildingKPage.vue

@@ -38,12 +38,12 @@
                 <el-table :data="partyBuildingData" style="width: 100%" @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="序号" type="index" />
-                    <el-table-column label="单位名称" prop="organizationName" width="300" />
+                    <el-table-column label="单位名称" prop="createOrgName" width="300" />
                     <el-table-column label="业务属性" prop="sectionName" />
                     <el-table-column label="年度" prop="year" />
                     <el-table-column label="党建系数" prop="multiplier">
                         <template #default="scope">
-                            <span>{{scope.row.multiplier*100}}%</span>
+                            <span>{{scope.row.multiplier}}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="备注" prop="remarks" width="350" />
@@ -341,7 +341,7 @@ export default {
             this.$refs.importPage.upload.url = '/party-building-multiplier/import'
         },
         handleExport() {
-            this.$utils.downloadPer('party-building-multiplier/export', '党建考核系数信息数据.xlsx')
+            this.$utils.downloadPer('party-building-multiplier/export1', '党建考核系数信息数据.xlsx')
         },
     }
 }

src/utils/baseUrl.js

@@ -17,8 +17,8 @@ switch (process.env.NODE_ENV) {
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/" 
-        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }