Browse Source

根据业务要求修改问题

SunZehao 1 year ago
parent
commit
6b82de7af1

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

@@ -258,12 +258,13 @@ export default {
             })
         },
         addTableDetail() {
+            this.pageLeft.currentPage = 1
             let obj = {
                 showInput: true,
                 businessPlanId: this.rowMsg.id,
                 employeeId: '',
                 employeeNo: '',
-                baseScore: 0,
+                suggestedValue: 1,
                 serialNumber: 0
             }
             this.quantifiedList.unshift(obj)
@@ -330,8 +331,8 @@ export default {
                 { header: '人员编号', key: 'employeeNo', width: 26 },
                 // { header: '员工ID', key: 'employeeId', width: 26 },
                 { header: '员工名称', key: 'employeeName', width: 26 },
-                { header: '序号', key: 'serialNumber', width: 26 },
                 { header: '建议值', key: 'suggestedValue', width: 26 },
+                { header: '排序', key: 'serialNumber', width: 26 },
             ]
             worksheet.columns = colums
             worksheet.getRow(1).font = {

+ 24 - 1
src/components/assessment/monthQuarterYearFrom.vue

@@ -86,7 +86,15 @@
                                 <el-table-column  v-for="(it, index) in monthQuarterYearHeader" :key="index" :label="it.name" align="center">
                                     <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key" align="center">
                                         <template #default="scope">
-                                            <el-input v-model="scope.row[iv.code]" v-if="!scope.row['IS_LH_'+iv.code]"></el-input>
+                                            <el-select v-model="scope.row[iv.code]" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
+                                                <el-option
+                                                v-for="item in statusData"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id">
+                                                </el-option>
+                                            </el-select>
+                                            <el-input v-model="scope.row[iv.code]" v-else-if="scope.row['IS_LH_'+iv.code] === '2'"></el-input>
                                             <el-input-number v-model="scope.row[iv.code]" v-else />
                                         </template>
                                     </el-table-column>
@@ -157,6 +165,7 @@ export default {
             moduleData: [],
             stageData: [],
             titleMsgArr: [],
+            statusData: [],
             binSectionStr: '',
             addIcon: addIcon,
             saveIcon: saveIcon,
@@ -167,6 +176,20 @@ export default {
         }
     },
     created() {
+        this.statusData = [
+            {
+                name: '已确认',
+                id: '1'
+            },
+            {
+                name: '待确认',
+                id: '0'
+            },
+            {
+                name: '不合格',
+                id: '-1'
+            }
+        ]
     },
     methods: {
         init(row, type) {

+ 25 - 2
src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -86,7 +86,15 @@
                                 <el-table-column  v-for="(it, index) in monthQuarterYearHeader" :key="index" :label="it.name" align="center">
                                     <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key" align="center">
                                         <template #default="scope">
-                                            <el-input v-model="scope.row[iv.code]" v-if="!scope.row['IS_LH_'+iv.code]"></el-input>
+                                            <el-select v-model="scope.row[iv.code]" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
+                                                <el-option
+                                                v-for="item in statusData"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id">
+                                                </el-option>
+                                            </el-select>
+                                            <el-input v-model="scope.row[iv.code]" v-else-if="scope.row['IS_LH_'+iv.code] === '2'"></el-input>
                                             <el-input-number v-model="scope.row[iv.code]" v-else />
                                         </template>
                                     </el-table-column>
@@ -177,10 +185,25 @@ export default {
             tastbizKey: '',
             userMes: {},
             instanceChild: {},
-            descMsg: ''
+            descMsg: '',
+            statusData: [],
         }
     },
     created() {
+        this.statusData = [
+            {
+                name: '已确认',
+                id: '1'
+            },
+            {
+                name: '待确认',
+                id: '0'
+            },
+            {
+                name: '不合格',
+                id: '-1'
+            }
+        ]
     },
     methods: {
         init(row) {

+ 5 - 1
src/views/Login.vue

@@ -170,7 +170,11 @@ export default {
                 if (datas && datas.data) {
                     // setToken('purview', JSON.stringify(datas.data.data))
                     window.localStorage.setItem('purview', JSON.stringify(datas.data.data))
-                    that.$router.push({ path: "/home"})
+                    if (that.isMobile === 'PC') {
+                        that.$router.push({ path: "/home"})
+                    } else {
+                        that.$router.push({ path: "/mobeil"})
+                    }
                 }
             })
         }