常规提交

src/api/api.js

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

src/components/assessment/evaluationMonthPage.vue

@@ -53,12 +53,7 @@
                     </el-table-column>
                     <el-table-column label="年度" prop="year" />
                     <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>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="业务简述" width="230">
+                    <el-table-column label="业务简述" width="330">
                         <template #default="scope">
                             <el-tooltip
                                 class="tooltipDes"
@@ -70,6 +65,11 @@
                             </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 label="操作" width="200">
                         <template #default="scope">
                             <div style="display:flex;justify-content: left;">

src/components/assessment/evaluationQuarterPage.vue

@@ -53,12 +53,7 @@
                     </el-table-column>
                     <el-table-column label="年度" prop="year" />
                     <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>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="业务简述" width="230">
+                    <el-table-column label="业务简述" width="330">
                         <template #default="scope">
                             <el-tooltip
                                 class="tooltipDes"
@@ -70,6 +65,11 @@
                             </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 label="操作" width="200">
                         <template #default="scope">
                             <div style="display:flex;justify-content: left;">

src/components/assessment/evaluationStartFrom.vue

@@ -241,7 +241,7 @@ export default {
                 code: '',
                 des: '',
                 stage: '',
-                creatName: '',
+                createName: '',
                 createDate: '',
                 type: '',
                 year: '',
@@ -287,7 +287,7 @@ export default {
                 code: row.responsibilityCode,
                 des: row.des,
                 stage: row.stage,
-                creator: row.createBy,
+                createName: row.createName,
                 createDate: row.createTime,
                 type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
                 year: row.year,

src/components/assessment/evaluationStartPage.vue

@@ -52,12 +52,7 @@
                     </el-table-column>
                     <el-table-column label="年度" prop="year" />
                     <!-- <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>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="业务简述" prop="des" width="230">
+                    <el-table-column label="业务简述" prop="des" width="330">
                         <template #default="scope">
                             <el-tooltip
                                 class="box-item"
@@ -69,7 +64,12 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <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="操作" width="100">
                         <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>

src/components/assessment/monthQuarterFrom.vue

@@ -251,7 +251,7 @@ export default {
                 code: '',
                 des: '',
                 stage: '',
-                creatName: '',
+                createName: '',
                 createDate: '',
                 type: '',
                 year: '',
@@ -291,7 +291,7 @@ export default {
                 code: row.organizationEvaluationCode,
                 des: row.des,
                 stage: row.stage,
-                creator: row.createBy,
+                createName: row.createName,
                 createDate: row.createTime,
                 type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
                 year: row.year,

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -69,17 +69,17 @@
                     </el-table-column>
                     <el-table-column label="生产经营权重" prop="scjyWeight">
                         <template #default="scope">
-                            <span>{{(scope.row.scjyWeight.toFixed(2))*100}}%</span>
+                            <span>{{Math.floor(scope.row.scjyWeight*100)}}%</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="前期权重" prop="qqWeight">
                         <template #default="scope">
-                            <span>{{(scope.row.qqWeight.toFixed(2))*100}}%</span>
+                            <span>{{Math.floor(scope.row.qqWeight*100)}}%</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="基建权重" prop="jjWeight">
                         <template #default="scope">
-                            <span>{{(scope.row.jjWeight.toFixed(2))*100}}%</span>
+                            <span>{{Math.floor(scope.row.jjWeight*100)}}%</span>
                         </template>
                     </el-table-column>
                     <!-- <el-table-column label="年" prop="year" />