Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-ui/src/views/smartSchool/personWork/repairRecord/index.vue

@@ -27,11 +27,15 @@
             <el-table-column label="投产日期" align="center" prop="dateOfProduction" />
             <el-table-column label="投产日期" align="center" prop="dateOfProduction" />
             <el-table-column label="地点" align="center" prop="place" />
             <el-table-column label="地点" align="center" prop="place" />
             <el-table-column label="报修时间" prop="reportRepairTime" align="center" width="180px" />
             <el-table-column label="报修时间" prop="reportRepairTime" align="center" width="180px" />
-            <el-table-column label="报修人" align="center" prop="reportrepair" />
+            <el-table-column label="报修人" align="center" prop="reportRepair" />
             <el-table-column label="问题" align="center" prop="problem" />
             <el-table-column label="问题" align="center" prop="problem" />
             <el-table-column label="修理人" align="center" prop="repairName" />
             <el-table-column label="修理人" align="center" prop="repairName" />
             <el-table-column label="修理时间" align="center" prop="repairTime" width="180px" />
             <el-table-column label="修理时间" align="center" prop="repairTime" width="180px" />
-            <el-table-column label="修理状态" align="center" prop="repairState" />
+            <el-table-column label="修理状态" align="center" prop="repairState">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.repair_state" :value="scope.row.repairState"></dict-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="评价" align="center" prop="evaluate" width="220px">
             <el-table-column label="评价" align="center" prop="evaluate" width="220px">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     <el-rate :value="Number(scope.row.evaluate)" :max="5" :disabled="!scope.row.editable"></el-rate>
                     <el-rate :value="Number(scope.row.evaluate)" :max="5" :disabled="!scope.row.editable"></el-rate>
@@ -118,7 +122,11 @@
                 <el-row>
                 <el-row>
                     <el-col :span="12">
                     <el-col :span="12">
                         <el-form-item label="修理状态" prop="repairState">
                         <el-form-item label="修理状态" prop="repairState">
-                            <el-input v-model="postForm.repairState" />
+                            <el-select v-model="postForm.repairState" placeholder="请选择" style="width: 100%;">
+                                <el-option v-for="dict in dict.type.repair_state" :key="dict.value" :label="dict.label"
+                                    :value="dict.value">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="12">
                     <el-col :span="12">

ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/school/index.vue

@@ -66,7 +66,7 @@
         show-overflow-tooltip />
         show-overflow-tooltip />
       <el-table-column label="创建人" align="center" v-if="columns[2].visible" prop="createBy" width="200"
       <el-table-column label="创建人" align="center" v-if="columns[2].visible" prop="createBy" width="200"
         show-overflow-tooltip />
         show-overflow-tooltip />
-      <el-table-column label="接收人" align="center" v-if="columns[3].visible" prop="groupId" width="200"
+      <el-table-column label="接收人" align="center" v-if="columns[3].visible" prop="groupName" width="200"
         show-overflow-tooltip>
         show-overflow-tooltip>
         <!-- <template slot-scope="scope">
         <!-- <template slot-scope="scope">
           <span>{{ resolveRole(scope.row.receivePacket) }}</span>
           <span>{{ resolveRole(scope.row.receivePacket) }}</span>

ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/personnelGrouping/authUser.vue

@@ -172,6 +172,7 @@ export default {
     },
     },
     //添加用户 
     //添加用户 
     openSelectUser() {
     openSelectUser() {
+      this.userIds = []; // 清空数组内容
       this.visible = true;
       this.visible = true;
     },
     },
     // 查询可分组表数据
     // 查询可分组表数据