Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/views/kaohe/pingce/index.vue

@@ -498,12 +498,13 @@
           <treeselect v-model="scpfzh.form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属部门" />
         </el-form-item>
         <el-form-item label="评分考核项" prop="items">
-          <el-select v-model="scpfzh.form.items" multiple placeholder="请选择评分考核项" clearable style="width: 100%">
+          <el-select v-model="scpfzh.form.items" multiple value-key="id"
+                     placeholder="请选择评分考核项" clearable style="width: 100%">
             <el-option
               v-for="dict in scpfzh.itemsOtions"
               :key="dict.id"
               :label="dict.itemName"
-              :value="dict.id"
+              :value="dict"
             />
           </el-select>
         </el-form-item>
@@ -1246,7 +1247,9 @@ export default {
     scpfzhSubmit(){
       this.$refs["scpfzhForm"].validate(valid => {
         if (valid) {
-          this.scpfzh.form.itemIds = this.scpfzh.form.items.join(",")
+          this.scpfzh.form.itemIds = this.scpfzh.form.items.map(item => item.id).join(",");
+          this.scpfzh.form.itemNames = this.scpfzh.form.items.map(item => item.itemName).join(",");
+          console.log(this.scpfzh.form);
           addsUser(this.scpfzh.form).then(response => {
             this.scpfzh.open = false;
             this.$modal.msgSuccess("生成成功")

ruoyi-ui/src/views/system/user/index.vue

@@ -62,13 +62,14 @@
               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-              <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+              <el-table-column label="考核项" align="center" key="itemNames" prop="itemNames" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[5].visible" width="120" />
+              <el-table-column label="状态" align="center" key="status" v-if="columns[6].visible">
                 <template slot-scope="scope">
                   <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
               </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[7].visible" width="160">
                 <template slot-scope="scope">
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
@@ -282,9 +283,10 @@ export default {
         { key: 1, label: `用户名称`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 4, label: `考核项`, visible: true },
+        { key: 5, label: `手机号码`, visible: true },
+        { key: 6, label: `状态`, visible: true },
+        { key: 7, label: `创建时间`, visible: true }
       ],
       // 表单校验
       rules: {