食堂修改食堂负责人为食堂管理员

naqwzsjtj/naqwzsjtj/src/views/canteen/CanteenManage.vue

@@ -83,15 +83,22 @@
           <el-row>
             <el-col :span="22">
               <el-form-item class="input-star" label="负责人" prop="principal">
-                <el-input v-model="postManagement.principal" @click="selectUser" maxlength="32" placeholder="请输入食堂负责人">
-                </el-input>
+<!--                <el-input v-model="postManagement.principal" @click="selectUser" maxlength="32" placeholder="请输入食堂负责人">-->
+<!--                </el-input>-->
+
+                <el-autocomplete
+                  v-model="state"
+                  :fetch-suggestions="querySearchAsync"
+                  placeholder="请输入食堂负责人"
+                  @select="handleSelect"
+                ></el-autocomplete>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="22">
               <el-form-item class="input-star" label="投诉电话" prop="complaintPhone">
-                <el-input v-model="postManagement.complaintPhone" placeholder="请输入食堂投诉电话" maxlength="12">
+                <el-input v-model="postManagement.complaintPhone"  placeholder="请输入食堂投诉电话" maxlength="12">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -119,7 +126,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="saveWork">提交</el-button>
-        <el-button @click="workDialog = false">返回</el-button>
+        <el-button @click="back()">返回</el-button>
       </div>
     </el-dialog>
 <!--    <el-dialog :visible.sync="userDialog" width="50%"  class="detailDialog" :close-on-click-modal="false" top="40px">-->
@@ -141,6 +148,7 @@
 
   import CONFIG from "../../../vue.config"
   import CanteenPersion from "@/views/canteen/components/CanteenPersionDialog"
+  import Repair from "@/api/repair";
 
   export default {
     name: "CanteenManage",
@@ -203,6 +211,7 @@
           principal: "",
           complaint_phone: "",
           takeout_phone: "",
+          workerId:""
         },
         // 分页
         sorts: {
@@ -213,13 +222,52 @@
         uploadFiles: [],
         // 文件上传绑定的list
         fileList: [],
+        restaurants: [],
+        state: '',
+        timeout:  null
       };
     },
     methods: {
+      back(){
+        this.workDialog = false;
+        this.state='';
+      },
+      loadAll() {
+
+        Repair.listUser().then((r)=>{
+          if (r.status){
+            this.restaurants = r.data.map((t)=>{
+              console.log(t);
+              return{
+                value:t.userName,
+                phone:t.phone,
+                id:t.id
+              }
+            })
+          }
+        })
 
-      selectUser(){
-        this.userDialog = true;
+      },
+      querySearchAsync(queryString, cb) {
+        var restaurants = this.restaurants;
+        var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
+        cb(results)
+        // clearTimeout(this.timeout);
+        // this.timeout = setTimeout(() => {
+        //   cb(results);
+        // }, 3000 * Math.random());
+      },
+      createStateFilter(queryString) {
+        return (state) => {
+          return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
 
+      handleSelect(item) {
+        this.postManagement.complaintPhone = item.phone
+        this.postManagement.workerId = item.id
+        this.postManagement.principal = item.username
+        // console.log(item);
       },
       // 删除文件
       picRemove(file, fileList) {
@@ -395,6 +443,7 @@
                 this.postManagement.supplyTimeId =
                   this.postManagement.supplyTimeId.split(",");
               }
+              this.state = this.postManagement.principal;
               this.timeNodeChange();
               this.fileList = [];
               let params = {
@@ -531,6 +580,7 @@
         }
         params.append("principal", this.postManagement.principal);
         params.append("complaintPhone", this.postManagement.complaintPhone);
+        params.append("workerId",this.postManagement.workerId);
         if (this.postManagement.takeoutPhone) {
           params.append("takeoutPhone", this.postManagement.takeoutPhone);
         }
@@ -643,6 +693,9 @@
         this.getData();
       },
     },
+    mounted() {
+      this.loadAll();
+    }
   };
 </script>
 

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/CanteenDO.java

@@ -70,5 +70,10 @@ public class CanteenDO implements Serializable {
     * 是否删除0:未删除 1:删除
     */
     private Integer isdel;
+
+    /**
+     * workerId
+     */
+    private String workerId;
     
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/CanteenNeDO.java

@@ -56,5 +56,9 @@ public class CanteenNeDO implements Serializable {
      */
     private String takeoutPhone;
 
-    
+    /**
+     * workerId
+     */
+    private String workerId;
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/controller/SWorkerController.java

@@ -18,6 +18,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -117,5 +118,10 @@ public class SWorkerController {
         return ResponseEntity.ok(this.sWorkerService.deleteById(id));
     }
 
+    @GetMapping("list")
+    public ResponseEntity<List<Map<String,String>>> list() {
+        return ResponseEntity.ok(this.sWorkerService.list());
+    }
+
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/program/dao/SWorkerDao.java

@@ -2,10 +2,12 @@ package com.example.nngkxxdp.program.dao;
 
 
 import com.example.nngkxxdp.program.entity.SWorker;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * (SWorker)表数据库访问层
@@ -87,5 +89,7 @@ public interface SWorkerDao {
     Integer checkUserRepeats(String phoneNum, Integer role);
 
     Integer getUserType(String userId);
+
+    List<Map<String, String>> queryList();
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/Impl/SWorkerServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -131,5 +132,10 @@ public class SWorkerServiceImpl implements SWorkerService {
         return userType;
     }
 
+    @Override
+    public List<Map<String, String>> list() {
+        return sWorkerDao.queryList();
+    }
+
 
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/SWorkerService.java

@@ -9,6 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -67,4 +68,6 @@ public interface SWorkerService {
     boolean checkUserRepeats(String phoneNum, Integer role);
 
     Integer getUserType(String userId);
+
+    List<Map<String,String>> list();
 }

nngkxxdp/src/main/resources/mapper/CanteenDao.xml

@@ -26,6 +26,7 @@
                principal,
                complaint_phone,
                takeout_phone,
+               workerId,
                create_time,
                update_time,
                isdel
@@ -49,7 +50,7 @@
     <select id="pageList" resultType="java.util.Map">
         SELECT
         s_canteen.id, canteen_name, canteen_photo_path, supply_time_id, u.user_name founder, s_canteen.principal,
-        complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,
+        complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,workerId,
         s_canteen.isdel
         FROM s_canteen
         LEFT JOIN p_user u
@@ -76,9 +77,9 @@
     <!--新增所有列-->
     <insert id="addSCanteen">
         INSERT INTO s_canteen(id, canteen_name, canteen_photo_path, supply_time_id, founder, principal,
-                              complaint_phone, takeout_phone, create_time, update_time, isdel)
+                              complaint_phone, takeout_phone, create_time, update_time, isdel,workerId)
         VALUES (#{id}, #{canteenName}, #{canteenPhotoPath}, #{supplyTimeId}, #{founder}, #{principal},
-                #{complaintPhone}, #{takeoutPhone}, #{createTime}, #{updateTime}, #{isdel})
+                #{complaintPhone}, #{takeoutPhone}, #{createTime}, #{updateTime}, #{isdel},#{workerId})
     </insert>
 
     <!--通过主键修改数据-->
@@ -106,6 +107,9 @@
             <if test="updateTime != null">
                 update_time = #{updateTime},
             </if>
+            <if test="workerId !=null and workerId !=''">
+                workerId = #{workerId}
+            </if>
             <if test="isdel != null">
                 isdel = #{isdel},
             </if>
@@ -148,7 +152,8 @@
                principal,
                complaint_phone,
                takeout_phone,
-               canteen_photo_path
+               canteen_photo_path,
+               workerId
         FROM s_canteen
         WHERE isdel = 0
         <if test="userId != null and userId != ''">

nngkxxdp/src/main/resources/mapper/SWorkerDao.xml

@@ -130,5 +130,9 @@
         select role from s_worker where wx_user_id = #{userId} limit 1
     </select>
 
+    <select id="queryList" resultType="map">
+        select name as userName,phone_num as phone,id from s_worker where is_del = 0
+    </select>
+
 </mapper>
 

nngkxxdp/src/main/resources/static/natj/dataCenter/index.html

@@ -87,7 +87,7 @@
                     <select id="year">
                         <option value="2021">2021年</option>
                         <option value="2022">2022年</option>
-                        <option value="2023">2023年</option>
+                        <option value="2023">2023年一季度</option>
                     </select>
                     <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
                 </div>
@@ -165,7 +165,7 @@
                         <li><span>结案率</span><span>（%）</span></li>
                     </ul>
                     <ul class="number">
-                        <li style="width: 200px;">2023</li>
+                        <li style="width: 200px;">2023年一季度</li>
                         <li>1495</li>
                         <li>1495</li>
                         <li>1153</li>

nngkxxdp/src/main/resources/static/zdjc/sy.html

@@ -14,6 +14,8 @@
     <script src="./layui/layui.js" type="text/javascript" charset="utf-8"></script>
     <script src="./js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
     <style type="text/css">
+		body::-webkit-scrollbar {width: 0 !important}
+		body{overflow:-moz-scrollbars-none;}
         .quesTanchu {
             background-color: #FFF;
             width: 620px;
@@ -429,7 +431,7 @@
                             + '</p>'
                             + '<div class="data-contanier">'
                             + '<a href="javascript:void(0);" title="' + deptName + '">' + deptName + '</a>'
-                            + '<span style="display: none;">' + time + '</span>'
+                            + '<span style="display: block;">' + time + '</span>'
                             + '</div>'
                             + '</div>';
                         dataMap[data[i]['_source'].id] = datas.highlightArr[i];
@@ -504,8 +506,13 @@
 
     function openWindow(data) {
         //console.log(dataMap[data])
-        sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
+		if (dataMap[data].content) {
+			 sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
         window.location = 'xq.html';
+		} else {
+			window.open(dataMap[data].url, '_blank');
+		}
+       
     }
 
     function escape2Html(str) {
@@ -621,9 +628,14 @@
     // };
 
     function openWindow(data) {
-        console.log(dataMap[data])
-        sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
+       // console.log(dataMap[data])
+	   if (dataMap[data].content) {
+			 sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
         window.location = 'xq.html';
+		} else {
+			window.open(dataMap[data].url, '_blank');
+		}
+      
     }
 
     function openWindow2(data) {