Browse Source

职能部门互评打分权限控制
生产部门评分权限控制
用户管理邮箱支持编辑

csg6 5 months ago
parent
commit
4e1dc93bad

+ 7 - 7
src/views/examineCompetition/assessment/index.vue

@@ -83,12 +83,12 @@
83 83
 
84 84
       <el-table-column label="操作" align="center">
85 85
         <template slot-scope="scope">
86
-          <el-button type="text" size="small" @click="look(scope.row)"
87
-            >查看</el-button
88
-          >
89
-          <el-button type="text" size="small" @click="edit(scope.row)"
90
-            >编辑</el-button
91
-          >
86
+          <!--
87
+          <el-button type="text" size="small" @click="look(scope.row)">查看</el-button>
88
+          <el-button type="text" size="small" @click="edit(scope.row)">互评打分</el-button>
89
+          -->
90
+          <el-button type="text" size="small" @click="look(scope.row)" v-hasPermi="['postCheck:postAssessmentRatingOther:znDaFen']">查看</el-button>
91
+          <el-button type="text" size="small" @click="edit(scope.row)" v-hasPermi="['postCheck:postAssessmentRatingOther:znDaFen']">互评打分</el-button>
92 92
         </template>
93 93
       </el-table-column>
94 94
     </el-table>
@@ -411,4 +411,4 @@ export default {
411 411
   box-sizing: border-box;
412 412
   border-bottom: 1px solid #dfe6ec;
413 413
 }
414
-</style>
414
+</style>

+ 7 - 6
src/views/examineCompetition/assessment/produce.vue

@@ -97,11 +97,12 @@
97 97
 
98 98
       <el-table-column label="操作" align="center">
99 99
         <template slot-scope="scope">
100
-          <el-button type="text" size="small" @click="look(scope.row)"
101
-            >查看</el-button
102
-          >
103
-          <el-button type="text" size="small" @click="edit(scope.row)"
104
-            >编辑</el-button
100
+          <!--
101
+          <el-button type="text" size="small" @click="look(scope.row)">查看</el-button>
102
+          <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button
103
+          -->
104
+          <el-button type="text" size="small" @click="look(scope.row)" v-hasPermi="['postCheck:postAssessmentRatingOther:scDaFen']">查看</el-button>
105
+          <el-button type="text" size="small" @click="edit(scope.row)" v-hasPermi="['postCheck:postAssessmentRatingOther:scDaFen']">日常评分</el-button
105 106
           >
106 107
         </template>
107 108
       </el-table-column>
@@ -420,4 +421,4 @@ export default {
420 421
   box-sizing: border-box;
421 422
   border-bottom: 1px solid #dfe6ec;
422 423
 }
423
-</style>
424
+</style>

+ 1 - 1
src/views/examineCompetition/ruleManagement/productionDepartment.vue

@@ -58,7 +58,7 @@
58 58
       </el-table-column>
59 59
       <el-table-column label="权重" align="center" prop="fullScore">
60 60
         <template slot-scope="{ row }">
61
-          <span>{{ row.fullScore || '--' }}</span>
61
+          <span>{{ row.fullScore || '--' }}%</span>
62 62
         </template>
63 63
       </el-table-column>
64 64
       <!-- <el-table-column label="状态" align="center" prop="status">

+ 10 - 2
src/views/system/user/index.vue

@@ -236,10 +236,17 @@
236 236
           </el-col>
237 237
 
238 238
           <el-col :span="12">
239
+            <el-form-item label="姓名" prop="nickName">
240
+              <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
241
+            </el-form-item>
242
+          </el-col>
243
+          <!--
244
+          <el-col :span="12">
239 245
             <el-form-item v-if="form.userId == undefined" label="域账号ID" prop="userName">
240 246
               <el-input v-model="form.userName" placeholder="请输入域账号ID" maxlength="30" />
241 247
             </el-form-item>
242 248
           </el-col>
249
+          -->
243 250
         </el-row>
244 251
         <!--
245 252
         <el-row>
@@ -259,10 +266,11 @@
259 266
         <el-row>
260 267
 
261 268
           <el-col :span="12">
262
-            <el-form-item label="姓名" prop="nickName">
263
-              <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
269
+            <el-form-item label="邮箱" prop="email">
270
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
264 271
             </el-form-item>
265 272
           </el-col>
273
+
266 274
           <el-col :span="12">
267 275
             <el-form-item label="状态">
268 276
               <el-radio-group v-model="form.status">