sunyanqiang 3 роки тому
батько
коміт
affc810284

+ 2 - 1
public/index.html

@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 
 <head>
   <meta charset="utf-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

+ 368 - 0
src/components/look_word/a.text

@@ -0,0 +1,368 @@
+<template>
+  <div>
+    <el-button class="box1" @click="daochu">导出</el-button>
+
+    <div class="word" id="contents">
+      <p
+        style="
+          font-size: 16pt;
+          font-weight: 600;
+
+          color: black;
+          font-family: 'heiti';
+        "
+      >
+        《训练器材、教材登记簿》
+      </p>
+      <!-- <div class="fTitle">顶级分类训练器材、教材登记簿</div> -->
+      <p
+        align="left"
+        style="
+          font-size: 15pt;
+          font-weight: 500;
+          color: black;
+
+          margin-bottom: 5px;
+          font-family: 'heiti';
+        "
+      >
+        审核:
+      </p>
+      <table
+        class="b1"
+        border="1"
+        style="
+          border-collapse: collapse;
+          border: none;
+          mso-border-left-alt: 0.5pt solid windowtext;
+          mso-border-top-alt: 0.5pt solid windowtext;
+          mso-border-right-alt: 0.5pt solid windowtext;
+          mso-border-bottom-alt: 0.5pt solid windowtext;
+          mso-border-insideh: 0.5pt solid windowtext;
+          mso-border-insidev: 0.5pt solid windowtext;
+          mso-padding-alt: 0pt 0pt 0pt 0pt;
+        "
+        width="930"
+        bordercolor="black"
+      >
+        <!--<p align="center" style="font-size: 14pt;font-weight: bold;">顶级分类-训练器材、教材登记簿</p>-->
+
+        <tbody style="font-size: 16px; font-weight: 500">
+          <tr class="JR_tr">
+            <td width="37" valign="center" rowspan="2" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">序<br />号</p>
+            </td>
+            <td width="66" valign="center" rowspan="2" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">类别</p>
+            </td>
+            <td width="85" valign="center" rowspan="2" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">名称</p>
+            </td>
+            <td width="274" valign="center" colspan="5" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">库存情况</p>
+            </td>
+            <td width="179" valign="center" colspan="3" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">入库情况</p>
+            </td>
+            <td width="179" valign="center" colspan="3" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">出库情况</p>
+            </td>
+            <td width="56" valign="center" rowspan="2" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">质量<br />状况</p>
+            </td>
+            <td width="56" valign="center" rowspan="2" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">备注</p>
+            </td>
+          </tr>
+          <tr class="JR_tr">
+            <td width="66" valign="center" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">
+                配发 <br />
+                单位
+              </p>
+            </td>
+            <td width="56" valign="center" class="JR_left">
+              <p align="center" style="font-family: 'heiti'">
+                配发 <br />
+                时间
+              </p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" style="font-family: 'heiti'" class="JR_left">
+                配发<br />
+                数量
+              </p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" style="font-family: 'heiti'" class="JR_left">
+                自筹<br />
+                数量
+              </p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" style="font-family: 'heiti'" class="JR_left">
+                库存<br />
+                数量
+              </p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                时间
+              </p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                数量
+              </p>
+            </td>
+            <td width="75" valign="center">
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                经手人
+              </p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                时间
+              </p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                数量
+              </p>
+            </td>
+            <td width="75" valign="center">
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                经手人
+              </p>
+            </td>
+          </tr>
+
+          <tr
+            class="JR_tr"
+            style="font-family: 'fangsong'"
+            v-for="(item, i) in num"
+            :key="i"
+          >
+            {{
+              i
+            }}
+            <td v-for="(item, index) in arr[2]" :key="index">
+              {{ item }}
+
+              <!-- <td width="37" valign="center">
+              <p align="center">{{ item.id }}</p>
+            </td>
+            <td width="66" valign="center" rowspan="1" class="JR_right">
+              <p align="center">{{ item.type }}</p>
+            </td>
+            <td width="85" valign="center">
+              <p align="center" class="JR_right">{{ item.title }}</p>
+            </td>
+            <td width="66" valign="center">
+              <p align="center" class="JR_right">{{ item.unitName }}</p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_right">{{ item.granttime }}</p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" class="JR_right">{{ item.grantnum }}</p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" class="JR_right">{{ item.ownnum }}</p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_right">{{ item.stocknum }}</p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_right">{{ item.intime }}</p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" class="JR_right">{{ item.innum }}</p>
+            </td>
+            <td width="75" valign="center">
+              <p align="center" class="JR_right">{{ item.peopleName }}</p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_right">{{ item.outtime }}</p>
+            </td>
+            <td width="47" valign="center">
+              <p align="center" class="JR_right">{{ item.outnum }}</p>
+            </td>
+            <td width="75" valign="center">
+              <p align="center" class="JR_right">{{ item.people1Name }}</p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_right">{{ item.quality }}</p>
+            </td>
+            <td width="56" valign="center">
+              <p align="center" class="JR_right">{{ item.info }}</p>
+            </td> -->
+            </td>
+          </tr>
+
+          <tr>
+            <td width="37" valign="center" style="font-family: 'heiti'">
+              <p align="center">
+                填<br />
+                写<br />
+                说<br />
+                明 <br />
+              </p>
+            </td>
+            <td
+              width="897"
+              valign="center"
+              colspan="15"
+              v-html="message.info"
+              style="font-family: 'fangsong'"
+            >
+              <p></p>
+            </td>
+          </tr>
+        </tbody>
+        <tr
+          class="JR_tr"
+          style="
+            border: none;
+            color: black;
+            font-size: 12pt;
+            font-weight: 700;
+            line-height: 30px;
+          "
+        >
+          <td
+            class="JR_right"
+            colspan="6"
+            align="left"
+            style="border: none; line-height: 45px; font-family: 'heiti'"
+          >
+            军事主官:
+          </td>
+          <td
+            class="JR_right"
+            colspan="7"
+            align="left"
+            style="border: none; line-height: 45px; font-family: 'heiti'"
+          >
+            政治主官:
+          </td>
+          <td
+            class="JR_right"
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px; font-family: 'heiti'"
+          >
+            时间:
+          </td>
+        </tr>
+      </table>
+      <!-- <div
+        class="a1"
+        style="
+          width: 100%;
+          height: 50px;
+          font-size: 16px;
+          font-weight: 600;
+          color: black;
+          display: flex;
+          justify-content: space-between;
+        "
+      >
+        <p style="">军事主官:</p>
+        <p class="aa">政治主官:</p>
+        <p style="">时间:</p>
+      </div> -->
+    </div>
+  </div>
+</template>
+<script>
+import { lookWord } from "@/utils/look_word.js";
+
+import "@/utils/lodJs.js";
+export default {
+  name: "bdgleven",
+  props: ["message"],
+  data() {
+    return {
+      title: "训练器材、教材登记簿",
+      num: [],
+      num1: [],
+      num2: [],
+      arr: [],
+      style:
+        ".b1{width:860px !important};.JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.151em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};",
+    };
+  },
+  created() {
+    this.message.forEach((item, i) => {
+      if (this.num.length <= 0) {
+        this.num.push(item.type);
+        this.arr[i] = {};
+        this.arr[i][item.type] = [];
+        this.arr[i][item.type].push(item);
+      } else {
+        
+        if(this.num.indexOf(item.type) == -1){
+          this.num.push(item.type);
+          const len = this.arr.length +1
+          this.arr[len] = {}
+          this.arr[len][item.type] = []
+          this.arr[len][item.type].push(item)
+        } else {
+          for (let j = 0; j < this.arr.length; j++) {
+          if (item.type == Object.keys(this.arr[j])) {
+            // this.arr[j].push(item)
+            this.arr[j][item.type].push(item);
+          }
+        }
+        }
+      }
+
+      // if(this.num.indexOf(item.type) == -1){
+      //   console.log(i);
+      //   this.arr[i] = {}
+      //   this.arr[i][item.type] = []
+      //   this.arr[i][item.type].push(item)
+      // }
+
+      // else {
+      //   console.log(i);
+      //   this.arr[i] = {}
+      //   this.arr[i][item.type] = []
+      //   this.arr[i][item.type].push(item)
+      // }
+      // else {
+      //   for (let i = 0; i < this.arr.length; i++) {
+      //     if (item.type == Object.keys(this.arr[i])) {
+      //       this.arr[i][item.type].push(item)
+      //     }
+      //     // console.log(this.arr);
+      //   }
+      // }
+      // console.log(this.arr);
+    });
+    // console.log(this.arr);
+  },
+  methods: {
+    daochu() {
+      lookWord(this.title, "#contents", this.style, true);
+    },
+  },
+};
+</script>
+<style scoped>
+tbody {
+  color: #fff;
+  text-align: center;
+}
+tr:last-child {
+  border-bottom: 1px solid;
+}
+.box1 {
+  position: absolute;
+  right: 30px;
+  top: 80px;
+  border: 1px solid rgb(129, 130, 131);
+  border-radius: 5px;
+}
+</style>

+ 20 - 7
src/views/PrintsLog/printlog/index.vue

@@ -58,7 +58,7 @@
           >新增</el-button
         >
       </el-col>-->
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="primary"
           @click="handleUpdate"
@@ -66,7 +66,7 @@
           v-hasPermi="['PrintsLog:printlog:add']"
           >归还</el-button
         >
-      </el-col> -->
+      </el-col> 
       <!-- <el-col :span="1.5">
         <el-button
           type="danger"
@@ -363,7 +363,7 @@
             v-model="queryParams.endt"
             type="date"
             placeholder="选择结束时间"
-             value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -435,8 +435,8 @@ export default {
         printCode: null,
         primaryPath: null,
         presentPath: null,
-        startt:null,
-        endt:null
+        startt: null,
+        endt: null,
       },
       // 表单参数
       form: {},
@@ -512,7 +512,7 @@ export default {
       this.flg = null;
     },
     cancels() {
-      this.queryParams.levelM = null;
+      this.queryParams.levelM ='';
       this.queryParams.unitId = null;
       this.queryParams.startt = null;
       this.queryParams.endt = null;
@@ -656,10 +656,23 @@ export default {
     handleExport() {
       this.open1 = true;
     },
+    // 获取默认时间
+    daty() {
+      var tiem = new Date();
+      let y = tiem.getFullYear();
+      let m = tiem.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      let d = tiem.getDate();
+      d = d < 10 ? "0" + d : d;
+      this.queryParams.endt = y + "-" + m + "-" + d;
+      return;
+    },
     // 导出操作
     submitForms() {
       const queryParams = this.queryParams;
-      console.log(queryParams);
+      if (queryParams.startt) {
+        this.daty();
+      }
       this.$modal
         .confirm("是否确认导出集中文印记录数据项?")
         .then(() => {

+ 7 - 7
src/views/bdglSecret/secret/index.vue

@@ -55,11 +55,11 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['grassrootsregistration:bdglsecrecy:add']"
+          v-hasPermi="['bdglSecret:secret:add']"
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -67,7 +67,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['grassrootsregistration:bdglsecrecy:edit']"
+          v-hasPermi="['bdglSecret:secret:edit']"
           >修改</el-button
         >
       </el-col>
@@ -79,11 +79,11 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['grassrootsregistration:bdglsecrecy:remove']"
+          v-hasPermi="['bdglSecret:secret:remove']"
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+     <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -229,14 +229,14 @@
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglsecrecy:edit']"
+            v-hasPermi="['bdglSecret:secret:edit']"
             ><span class="edit">修改</span></el-button
           >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglsecrecy:remove']"
+            v-hasPermi="['bdglSecret:secret:remove']"
             ><span class="delete">删除</span></el-button
           >
         </template>

+ 2 - 2
src/views/pt.vue

@@ -1047,7 +1047,7 @@ export default {
       printTriggerClear().then((res) => {
         if (res.code == 200) {
           this.open3 = false;
-          window.open(`/workingArrangements/workTask`, "_self");
+          window.open(`/#/workingArrangements/workTask`, "_self");
         }
       });
     },
@@ -1055,7 +1055,7 @@ export default {
       printTriggerClear().then((res) => {
         if (res.code == 200) {
           this.open4 = false;
-          window.open(`/workingArrangements/workTask`, "_self");
+          window.open(`/#/workingArrangements/planTask`, "_self");
         }
       });
     },

+ 21 - 3
src/views/taishi/index.vue

@@ -925,7 +925,7 @@
                   <img src=".././../assets/images/打印icon.png" alt />
                 </div>
                 <div class="right3-r-main-item-r">
-                  <div class="s1">打印数量</div>
+                  <div class="s1">本周打印数量</div>
                   <div class="s2">
                     <b style="color: #30fdff">{{ this.wylist.mouthprints }}</b
                     >份
@@ -2676,13 +2676,22 @@ export default {
   list-style: none;
 }
 .right2-main-title p span {
-  width: 33.3%;
   display: inline-block;
   text-align: center;
   line-height: 30px;
   font-size: 14px;
   color: #fff;
 }
+.right2-main-title p span:nth-child(1){
+  width: 25%;
+}
+
+.right2-main-title p span:nth-child(2){
+  width: 50%;
+}
+.right2-main-title p span:nth-child(3){
+  width: 25%;
+}
 .right2 {
   width: 100%;
   height: 29vh;
@@ -2871,13 +2880,22 @@ export default {
   height: 30px;
 }
 .seamless-warp .right2-main-box span {
-  width: 33.3%;
   display: inline-block;
   text-align: center;
   line-height: 30px;
   color: #fff;
   font-size: 12px;
 }
+
+.right2-main-box span:nth-child(1){
+  width: 25%;
+}
+.right2-main-box span:nth-child(2){
+  width: 50%;
+}
+.right2-main-box span:nth-child(3){
+  width: 25%;
+}
 .center1-t {
   width: 100%;
   height: 25%;

+ 67 - 6
src/views/workingArrangements/planTask/index.vue

@@ -266,7 +266,7 @@
             disabled
           />
         </el-form-item>
-        <el-form-item label="执行单位" prop="unitId">
+        <!-- <el-form-item label="执行单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
             :options="users"
@@ -274,7 +274,7 @@
             class="threeselects"
             @select="selectPeo1"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="计划类型" prop="type" class="change_plan_type">
           <el-select
             v-model="form.type"
@@ -301,6 +301,29 @@
           >
           </el-input>
         </el-form-item>
+        <div>
+          <el-form-item label="执行单位" prop="unitId" label-width="100px">
+            <div>
+              <el-select
+                multiple
+                filterable
+                v-model="form.unitId"
+                id="execute"
+                ref="peoplenames"
+                placeholder="请选择执行单位"
+                @remove-tag="selent"
+              >
+                <el-option
+                  v-for="(item, i) in danWeisList"
+                  :label="item.deptName"
+                  :value="item.deptId"
+                  id="execute"
+                  @click.native="danFn()"
+                />
+              </el-select>
+            </div>
+          </el-form-item>
+        </div>
         <div>
           <el-form-item label="执行人" prop="peopleName" label-width="100px">
             <div>
@@ -313,7 +336,6 @@
               >
                 <el-option
                   v-for="item in executor"
-                  :key="item.deptId"
                   :label="item.nickName"
                   :value="item.userId"
                   id="execute"
@@ -817,12 +839,15 @@ import {
   allUser,
   getDept,
   getDeptList,
+  getUnitUsers,
 } from "@/api/workingArrangements/workTask";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
 import Cookies from "js-cookie";
 
+import { listDept } from "@/api/system/dept";
+
 export default {
   name: "PlanTask",
   dicts: ["plan_type"],
@@ -989,6 +1014,8 @@ export default {
         createtime: null,
         yue: null,
       },
+      //获取单位所有不是树形结构
+      danWeisList: [],
     };
   },
   created() {
@@ -1012,6 +1039,32 @@ export default {
     });
   },
   methods: {
+        //删除所有单位的某一个触发
+    selent() {
+      this.renyuanEs();
+      this.form.peopleName=[]
+    },
+    //点击多选单位
+    danFn() {
+      this.renyuanEs();
+    },
+    //获取多选单位下的人员
+    renyuanEs() {
+      if (this.form.unitId.length > 0) {
+        var ids = this.form.unitId.join(",");
+        getUnitUsers(ids).then((res) => {
+          this.executor = res.data;
+        });
+      }else{
+        this.executor=[]
+      }
+    },
+    //获取所有单位
+    danWeis() {
+      listDept().then((res) => {
+        this.danWeisList = res.data;
+      });
+    },
     // 导出重置
     resets() {
       this.queryParamsTime = {
@@ -1169,6 +1222,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加工作计划";
+      this.danWeis();
       this.form.adminId = Cookies.get("deptId");
       this.form.username = Cookies.get("nickName");
       this.form.userId = Cookies.get("userId");
@@ -1232,8 +1286,7 @@ export default {
           .map(Number);
         this.singleTable.file =
           process.env.VUE_APP_BASE_API + this.singleTable.file;
-        this.getZhuChi(res.data.unitId);
-        // this.singleTable.jindu=singleTable.planProgress.schedule
+        // this.getZhuChi(res.data.unitId);
       });
     },
     // 多人进度查看
@@ -1267,7 +1320,9 @@ export default {
       getPlanTask(id).then((response) => {
         this.form = response.data;
         this.form.type = parseInt(this.form.type);
-        this.getZhuChi(this.form.unitId);
+        this.form.unitId = this.form.unitId.split(",").map(Number);
+        this.danWeis();
+        this.renyuanEs();
         // this.form.type=this.form.type+""
         this.form.peopleName = this.form.peopleName.split(",").map(Number);
         this.open = true;
@@ -1353,12 +1408,18 @@ export default {
             this.form.peopleId = this.form.peopleName;
 
             if (this.form.id != null) {
+              if (this.form.unitId.length > 0) {
+                this.form.unitId = this.form.unitId.join(",");
+              }
               updatePlanTask(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               });
             } else {
+              if (this.form.unitId.length > 0) {
+                this.form.unitId = this.form.unitId.join(",");
+              }
               addPlanTask(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;

+ 67 - 66
src/views/workingArrangements/workTask/index.vue

@@ -339,35 +339,35 @@
           ></el-input>
         </el-form-item>
         <div>
-        <el-form-item label="执行单位" prop="unitId" label-width="100px">
-                    <div>
-                      <el-select
-                        multiple
-                         filterable
-                        v-model="form.unitId"
-                        id="execute"
-                        ref="peoplenames"
-                        placeholder="请选择执行单位"
-                        @remove-tag="selent"
-                      >
-                        <el-option
-                          v-for="(item,i) in danWeisList"
-                          :label="item.deptName"
-                          :value="item.deptId"
-                          id="execute"
-                          @click.native="danFn()"
-                        />
-                      </el-select>
-                    </div>
-                  </el-form-item>
-                </div>
+          <el-form-item label="执行单位" prop="unitId" label-width="100px">
+            <div>
+              <el-select
+                multiple
+                filterable
+                v-model="form.unitId"
+                id="execute"
+                ref="peoplenames"
+                placeholder="请选择执行单位"
+                @remove-tag="selent"
+              >
+                <el-option
+                  v-for="(item, i) in danWeisList"
+                  :label="item.deptName"
+                  :value="item.deptId"
+                  id="execute"
+                  @click.native="danFn()"
+                />
+              </el-select>
+            </div>
+          </el-form-item>
+        </div>
 
         <div>
           <el-form-item label="执行人" prop="peopleName" label-width="100px">
             <div>
               <el-select
                 multiple
-                 filterable
+                filterable
                 v-model="form.peopleName"
                 id="execute"
                 ref="peoplenames"
@@ -990,7 +990,7 @@ import {
   singProgress,
   moreProgress,
   uploadProgress,
-  getUnitUsers
+  getUnitUsers,
 } from "@/api/workingArrangements/workTask";
 import {
   deptUser,
@@ -1166,7 +1166,7 @@ export default {
       // 导出文件的路径
       daoChu: "",
       //获取单位所有不是树形结构
-      danWeisList:[]
+      danWeisList: [],
     };
   },
   created() {
@@ -1185,30 +1185,32 @@ export default {
     });
   },
   methods: {
-  //点击多选单位
-  danFn(){
-  this.renyuanEs();
-  },
-  //获取多选单位下的人员
-  renyuanEs(){
-  if(this.form.unitId.length>0){
-    var ids=this.form.unitId.join(',');
-getUnitUsers(ids).then(res=>{
-this.executor=res.data
-})
-  }
-  },
-  //删除所有单位的某一个触发
-  selent(){
-   this.renyuanEs();
-
-  },
-  //获取所有单位
-  danWeis(){
-  listDept().then(res=>{
-  this.danWeisList=res.data
-  })
-  },
+    //点击多选单位
+    danFn() {
+      this.renyuanEs();
+    },
+    //获取多选单位下的人员
+    renyuanEs() {
+      if (this.form.unitId.length > 0) {
+        var ids = this.form.unitId.join(",");
+        getUnitUsers(ids).then((res) => {
+          this.executor = res.data;
+        });
+      }else{
+        this.executor=[]
+      }
+    },
+    //删除所有单位的某一个触发
+    selent() {
+      this.renyuanEs();
+      this.form.peopleName=[]
+    },
+    //获取所有单位
+    danWeis() {
+      listDept().then((res) => {
+        this.danWeisList = res.data;
+      });
+    },
     // 导出重置
     resets() {
       this.queryParamsTime = {
@@ -1283,6 +1285,7 @@ this.executor=res.data
       // 获取当前行的id
 
       singProgress(row.id).then((res) => {
+        console.log(res);
         this.singleTable = res.data;
         this.singleTable.planProgresses =
           this.singleTable.workProgress.schedule;
@@ -1296,9 +1299,7 @@ this.executor=res.data
 
           .split(",")
           .map(Number);
-        this.getZhuChi(res.data.unitId);
-
-        // this.singleTable.jindu=singleTable.planProgress.schedule
+        // this.getZhuChi(res.data.unitId);
       });
     },
     // 多人进度查看
@@ -1380,7 +1381,7 @@ this.executor=res.data
       this.queryParams.adminId = val.id;
       this.getList();
       // this.queryParams.unitId = val.id;
-       //this.getZhuChi(this.queryParams.unitId);
+      //this.getZhuChi(this.queryParams.unitId);
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1478,9 +1479,9 @@ this.executor=res.data
         // this.getDept2()
         //this.getZhuChi(this.form.unitId);
         this.form.peopleName = this.form.peopleName.split(",").map(Number);
-        this.form.unitId =this.form.unitId.split(",").map(Number);
+        this.form.unitId = this.form.unitId.split(",").map(Number);
         this.danWeis();
-        this.renyuanEs()
+        this.renyuanEs();
         this.open = true;
         this.title = "修改工作计划";
       });
@@ -1557,9 +1558,9 @@ this.executor=res.data
             this.form.peopleId = this.form.peopleName;
 
             if (this.form.id != null) {
-             if(this.form.unitId.length>0){
-                        this.form.unitId =this.form.unitId.join(',')
-                        }
+              if (this.form.unitId.length > 0) {
+                this.form.unitId = this.form.unitId.join(",");
+              }
               updateWorkTask(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
                 this.queryParams.type = "";
@@ -1567,14 +1568,14 @@ this.executor=res.data
                 this.getList();
               });
             } else {
-            if(this.form.unitId.length>0){
-            this.form.unitId =this.form.unitId.join(',')
-            }
-             addWorkTask(this.form).then((response) => {
-                            this.$modal.msgSuccess("新增成功");
-                            this.open = false;
-                            this.getList();
-                          });
+              if (this.form.unitId.length > 0) {
+                this.form.unitId = this.form.unitId.join(",");
+              }
+              addWorkTask(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
             }
           }
         }