Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

# Conflicts:
#	src/views/combatduty/RateOfTen/index.vue
思想政治

src/api/materialManagement/materialRegistration.js

@@ -55,7 +55,7 @@ export function exportMaterialRegistration(query) {
 // 获取物品名称列表
 export function exportMaterialRegWuPingList(query) {
   return request({
-    url: '/materialManagement/materialRegistration/export',
+    url: '/materialManagement/materialRegistration/getlist',
     method: 'get',
     params: query
   })

src/assets/styles/global.css

@@ -707,6 +707,9 @@ color: #fff;
   padding-left: 0px !important;
 }
 
+ul.el-menu li div.nest-menu ul div.nest-menu li {
+  padding-left: 20px !important;
+}
 
 #app .has-logo .sidebar-logo-container {
   background: rgba(0, 0, 0, 0) !important;

src/components/look_word/bdgldiary.vue

@@ -24,7 +24,7 @@
       </div> -->
 
       <table
-      class="b1"
+        class="b1"
         border="none"
         style="
           border-collapse: collapse;
@@ -71,7 +71,7 @@
         </tr>
       </table>
       <table
-      class="b1"
+        class="b1"
         border="1"
         style="
           border-collapse: collapse;
@@ -131,7 +131,7 @@
           </td>
           <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
-             {{ message.orgcadre + message.orgsoldier}}
+            {{ message.orgcadre + message.orgsoldier }}
           </td>
           <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
@@ -143,7 +143,7 @@
           </td>
           <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
-            {{ message.nowcadre + message.nowsoldier}}
+            {{ message.nowcadre + message.nowsoldier }}
           </td>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
@@ -206,7 +206,19 @@
           "
         >
           <td class="JR_right" height="70">{{ items.dateline }}</td>
-          <td style="text-align: left" colspan="9" v-html="items.startTime + '-' + items.endTime + items.contents+'(组织人：' + items.organizer + ')'"></td>
+          <td
+            style="text-align: left"
+            colspan="9"
+            v-html="
+              items.startTime +
+              '-' +
+              items.endTime +
+              items.contents +
+              '(组织人：' +
+              items.organizer +
+              ')'
+            "
+          ></td>
           <td class="JR_right" height="70">{{ items.shouldArrive }}</td>
           <td class="JR_right" height="70">{{ items.realTo }}</td>
           <td class="JR_right" height="70">{{ items.percentage }}</td>
@@ -217,12 +229,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 4 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 4 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -234,12 +245,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 3 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 3 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -251,12 +261,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 2 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 2 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -268,12 +277,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 1 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 1 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -557,7 +565,7 @@
             <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.comeDate}}</p>
+            <p align="center">{{ item1.comeDate }}</p>
           </td>
           <td class="JR_right" height="30">
             <p align="center">{{ item1.leaveDate }}</p>
@@ -623,7 +631,7 @@
           height="30"
           style="font-family: 'songti'"
         >
-          <td rowspan="6" class="JR_left">
+          <td :rowspan="qingjia" class="JR_left">
             <p align="center" style="margin: 0 15px; font-family: 'songti'">
               请 <br />
               假 <br />
@@ -662,7 +670,49 @@
             时(天)数
           </td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-for="(item, i) in message.bdglLeaves"
+          :key="i"
+        >
+          <td class="JR_right">
+            <p align="center">{{ item.peopleName }}</p>
+          </td>
+          <td class="JR_right">
+            <p align="center">
+              <dict-tag :options="dict.type.post_Level" :value="item.postId" />
+            </p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.leaveReason }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ time[i] }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.peopleName1 }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.departureTime }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.returnTime }}</p>
+          </td>
+          <td class="JR_right" colspan="3">
+            <p align="center">{{ guiTime[i] }}</p>
+          </td>
+        </tr>
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 5
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -672,7 +722,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 4
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -682,7 +740,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 3
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -692,7 +758,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 2
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -702,7 +776,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 1
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -742,7 +824,7 @@
       </table>
 
       <table
-      class="b1"
+        class="b1"
         border="none"
         style="
           border-collapse: collapse;
@@ -804,6 +886,7 @@ import "@/utils/lodJs.js";
 export default {
   name: "bdgleven",
   props: ["message"],
+  dicts: ["post_Level"],
   data() {
     return {
       title: "连队要事日记",
@@ -814,6 +897,9 @@ export default {
       week: "",
       qinshu2: 3,
       number: 6,
+      time: [],
+      guiTime: [],
+      qingjia: 1,
     };
   },
   created() {
@@ -822,6 +908,7 @@ export default {
     this.week = this.getWeek(this.message.blogDate);
     this.qinshu2 = this.qinshus2();
     this.xunlian();
+    this.qingjias();
   },
   methods: {
     daochu() {
@@ -843,15 +930,26 @@ export default {
       }
       return 3;
     },
-    xunlian(){
-      
-        console.log(this.message)
-        if(this.message.weekworkRegisters!= null){
-           if (this.message.weekworkRegisters.length > 4){
-        this.number += (this.message.weekworkRegisters.length - 4)
+    xunlian() {
+      this.getTian();
+      this.getCao();
+      if (this.message.weekworkRegisters != null) {
+        if (this.message.weekworkRegisters.length > 4) {
+          this.number += this.message.weekworkRegisters.length - 4;
+        }
       }
+    },
+    qingjias() {
+      if (this.message.bdglLeaves != null) {
+        if (this.message.bdglLeaves.length > 5) {
+          this.qingjia += this.message.bdglLeaves.length;
+        } else {
+          this.qingjia +=
+            5 - this.message.bdglLeaves.length + this.message.bdglLeaves.length;
         }
-     
+      } else {
+        this.qingjia += 5;
+      }
     },
     /*
       获取当前星期几
@@ -865,7 +963,33 @@ export default {
       );
       return "星期" + "日一二三四五六".charAt(date.getDay());
     },
-
+    // 计算请假天数
+    getTian() {
+      if (this.message.bdglLeaves != null) {
+        this.message.bdglLeaves.forEach((element) => {
+          var dateBegin = new Date(element.startTime).getTime();
+          var dateBegins = new Date(element.endTime).getTime();
+          var num = dateBegins - dateBegin;
+          num = num / (1000 * 3600 * 24);
+          this.time.push(num);
+        });
+      }
+    },
+    // 计算超时天数
+    getCao() {
+      if (this.message.bdglLeaves != null) {
+        this.message.bdglLeaves.forEach((element) => {
+          var dateBegin = new Date(element.actualreturntime).getTime();
+          var dateBegins = new Date(element.returnTime).getTime();
+          var num = dateBegin - dateBegins;
+          num = num / (1000 * 3600 * 24);
+          if (num < 0) {
+            num = 0;
+          }
+          this.guiTime.push(num);
+        });
+      }
+    },
     /*
       标准时间转换格式
      */

src/views/bdglregular/regularcountinfo/index.vue

@@ -116,20 +116,25 @@ import {
   pendingacceptance,
   completeproportion,
   unitproportion,
-  getRegularinfo,
+  getRegularinfo
 } from "@/api/bdglregular/regularcountinfo";
 import * as echarts from "echarts";
+import Cookies from "js-cookie";
 export default {
   data() {
     return {
       peopleList: [],
       peopleList2: [],
-      peopleList3: [],
+      peopleList3: []
     };
   },
   created() {
     this.getlist();
     this.getlist2();
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
   },
   mounted() {
     this.getlist3();
@@ -137,21 +142,21 @@ export default {
   },
   methods: {
     getlist() {
-      unitrank().then((res) => {
+      unitrank().then(res => {
         if (res.code == 200) {
           this.peopleList = res.data;
         }
       });
     },
     getlist2() {
-      pendingacceptance().then((res) => {
+      pendingacceptance().then(res => {
         if (res.code == 200) {
           this.peopleList2 = res.data;
         }
       });
     },
     getlist3() {
-      completeproportion().then((res) => {
+      completeproportion().then(res => {
         if (res.code == 200) {
           var myChart = echarts.init(
             document.getElementById("foot-left-content")
@@ -160,11 +165,11 @@ export default {
             title: {
               text: "",
               subtext: "",
-              left: "",
+              left: ""
             },
             tooltip: {
               trigger: "item",
-              formatter: "{a} <br/>{b} : {c} ({d}%)",
+              formatter: "{a} <br/>{b} : {c} ({d}%)"
             },
             color: ["#5470c6", "#fac858", "#ee6666", "#91cc75"],
             legend: {
@@ -173,9 +178,9 @@ export default {
               top: "10%",
               itemGap: 20,
               textStyle: {
-                color: "#fff",
+                color: "#fff"
               },
-              data: ["待处理", "待验收", "未通过", "已通过"],
+              data: ["待处理", "待验收", "未通过", "已通过"]
             },
             series: [
               {
@@ -190,9 +195,9 @@ export default {
                     textStyle: {
                       fontWeight: 300,
                       fontSize: 16,
-                      color: "#fff",
-                    },
-                  },
+                      color: "#fff"
+                    }
+                  }
                 },
                 data: [
                   {
@@ -200,35 +205,35 @@ export default {
                       res.data[0].daiyanshou == 0
                         ? null
                         : res.data[0].daiyanshou,
-                    name: "待验收",
+                    name: "待验收"
                   },
                   {
                     value:
                       res.data[0].daichuli == 0 ? null : res.data[0].daichuli,
-                    name: "待处理",
+                    name: "待处理"
                   },
                   {
                     value:
                       res.data[0].weitongguo == 0
                         ? null
                         : res.data[0].weitongguo,
-                    name: "未通过",
+                    name: "未通过"
                   },
                   {
                     value:
                       res.data[0].yitongguo == 0 ? null : res.data[0].yitongguo,
-                    name: "已通过",
-                  },
+                    name: "已通过"
+                  }
                 ],
                 emphasis: {
                   itemStyle: {
                     shadowBlur: 10,
                     shadowOffsetX: 0,
-                    shadowColor: "rgba(0, 0, 0, 0.5)",
-                  },
-                },
-              },
-            ],
+                    shadowColor: "rgba(0, 0, 0, 0.5)"
+                  }
+                }
+              }
+            ]
           };
           myChart.setOption(option);
         }
@@ -236,7 +241,7 @@ export default {
     },
     getlist4() {},
     echarfun() {
-      unitproportion().then((res) => {
+      unitproportion().then(res => {
         if (res.code == 200) {
           this.peopleList3 = res.data;
           console.log(res.data);
@@ -255,13 +260,13 @@ export default {
                   color: "#ffff",
                   // fontSize: 12,
                   fontStyle: "normal",
-                  fontWeight: "normal",
-                },
+                  fontWeight: "normal"
+                }
               },
               color: ["#5470c6", "#fac858", "#ee6666", "#91cc75"],
               tooltip: {
                 trigger: "item",
-                formatter: "{a} <br/>{b} : {c} ({d}%)",
+                formatter: "{a} <br/>{b} : {c} ({d}%)"
               },
               // legend: {
               //   orient: "vertical",
@@ -287,9 +292,9 @@ export default {
                       textStyle: {
                         fontWeight: 300,
                         fontSize: 16,
-                        color: "#fff",
-                      },
-                    },
+                        color: "#fff"
+                      }
+                    }
                   },
                   data: [
                     {
@@ -298,7 +303,7 @@ export default {
                           ? null
                           : this.peopleList3[i].daiyanshou,
                       name: "待验收",
-                      id: this.peopleList3[i].deptId,
+                      id: this.peopleList3[i].deptId
                     },
                     {
                       value:
@@ -306,7 +311,7 @@ export default {
                           ? null
                           : this.peopleList3[i].daichuli,
                       name: "待处理",
-                      id: this.peopleList3[i].deptId,
+                      id: this.peopleList3[i].deptId
                     },
                     {
                       value:
@@ -314,7 +319,7 @@ export default {
                           ? null
                           : this.peopleList3[i].weitongguo,
                       name: "未通过",
-                      id: this.peopleList3[i].deptId,
+                      id: this.peopleList3[i].deptId
                     },
                     {
                       value:
@@ -322,18 +327,18 @@ export default {
                           ? null
                           : this.peopleList3[i].yitongguo,
                       name: "已通过",
-                      id: this.peopleList3[i].deptId,
-                    },
+                      id: this.peopleList3[i].deptId
+                    }
                   ],
                   emphasis: {
                     itemStyle: {
                       shadowBlur: 10,
                       shadowOffsetX: 0,
-                      shadowColor: "rgba(0, 0, 0, 0.5)",
-                    },
-                  },
-                },
-              ],
+                      shadowColor: "rgba(0, 0, 0, 0.5)"
+                    }
+                  }
+                }
+              ]
             };
             myChart.setOption(option);
 
@@ -347,7 +352,7 @@ export default {
       this.$router
         .push({
           path: "/bdglregular/regularinfo",
-          query: { id: row.inspectedUnitId },
+          query: { id: row.inspectedUnitId }
         })
         .catch(() => {});
     },
@@ -357,11 +362,11 @@ export default {
       this.$router
         .push({
           path: "/bdglregular/regularinfo",
-          query: { obj: param.data },
+          query: { obj: param.data }
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/doormanManage/bdglVisit/index.vue

@@ -41,9 +41,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -274,12 +272,13 @@ import {
   addBdglVisit,
   updateBdglVisit,
   exportBdglVisit,
-  deptUser,
+  deptUser
 } from "@/api/doormanManage/bdglVisit";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
 import { allUser } from "@/api/workingArrangements/workTask";
+import Cookies from "js-cookie";
 
 export default {
   name: "BdglVisit",
@@ -322,40 +321,44 @@ export default {
         updatetime: null,
         numberPlate: null,
         unitName: null,
-        peopleName: null,
+        peopleName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         unitId: [
-          { required: true, message: "到访单位不能为空", trigger: "blur" },
+          { required: true, message: "到访单位不能为空", trigger: "blur" }
         ],
         // peopleId: [{ required: true, message: "接待人不能为空", trigger: "blur" }],
         name: [
-          { required: true, message: "到访人员姓名不能为空", trigger: "blur" },
+          { required: true, message: "到访人员姓名不能为空", trigger: "blur" }
         ],
         arriveTime: [
-          { required: true, message: "到访时间不能为空", trigger: "blur" },
+          { required: true, message: "到访时间不能为空", trigger: "blur" }
         ],
         endTime: [
-          { required: true, message: "离队时间不能为空", trigger: "blur" },
+          { required: true, message: "离队时间不能为空", trigger: "blur" }
         ],
         numberPlate: [
-          { required: true, message: "到访车牌号不能为空", trigger: "blur" },
-        ],
+          { required: true, message: "到访车牌号不能为空", trigger: "blur" }
+        ]
       },
       // 执行单位列表
       users: [],
       // 接待人
       executor: [],
       // 人员列表
-      rylist: [],
+      rylist: []
     };
   },
   created() {
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
     this.getList();
-    allUser().then((res) => {
+    allUser().then(res => {
       this.rylist = res.rows;
     });
     this.selectPeo1();
@@ -370,7 +373,7 @@ export default {
         "d+": date.getDate().toString(), // 日
         "H+": date.getHours().toString(), // 时
         "M+": date.getMinutes().toString(), // 分
-        "S+": date.getSeconds().toString(), // 秒
+        "S+": date.getSeconds().toString() // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
       };
       for (let k in opt) {
@@ -400,7 +403,7 @@ export default {
     // 获取执行人
     getZhuChi(id) {
       // console.log(id)
-      deptUser(id).then((res) => {
+      deptUser(id).then(res => {
         this.executor = res.data;
         // console.log(this.executor)
         // this.form.unitName=this.executor
@@ -420,7 +423,7 @@ export default {
       //  this.getDept2()
       // this.handleAdd()
       // 获取执行单位列表
-      getDept2().then((res) => {
+      getDept2().then(res => {
         // console.log(res,2)
         this.users = res.data;
         console.log(this.users);
@@ -434,7 +437,7 @@ export default {
     /** 查询人员来访登记列表 */
     getList() {
       this.loading = true;
-      listBdglVisit(this.queryParams).then((response) => {
+      listBdglVisit(this.queryParams).then(response => {
         // console.log(response)
         this.bdglVisitList = response.rows;
         console.log(this.bdglVisitList);
@@ -462,7 +465,7 @@ export default {
         updatetime: null,
         numberPlate: null,
         unitName: null,
-        peopleName: null,
+        peopleName: null
       };
       this.resetForm("form");
     },
@@ -481,7 +484,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -491,7 +494,7 @@ export default {
       this.open = true;
       this.title = "添加人员来访登记";
       // 获取执行单位列表
-      getDept2().then((res) => {
+      getDept2().then(res => {
         // console.log(res,2)
         this.users = res.data;
         console.log(this.users);
@@ -500,7 +503,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      getDept2().then((res) => {
+      getDept2().then(res => {
         // console.log(res)
         // console.log(res,2)
         this.users = res.data;
@@ -508,7 +511,7 @@ export default {
       });
       const id = row.id || this.ids;
       // console.log(row)
-      getBdglVisit(id).then((response) => {
+      getBdglVisit(id).then(response => {
         console.log(response.data);
         this.form = response.data;
         this.open = true;
@@ -518,17 +521,17 @@ export default {
     /** 提交按钮 */
     submitForm() {
       console.log(this.form);
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             console.log(this.form);
-            updateBdglVisit(this.form).then((response) => {
+            updateBdglVisit(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addBdglVisit(this.form).then((response) => {
+            addBdglVisit(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -542,7 +545,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除人员来访登记的数据项？")
-        .then(function () {
+        .then(function() {
           return delBdglVisit(ids);
         })
         .then(() => {
@@ -560,13 +563,13 @@ export default {
           this.exportLoading = true;
           return exportBdglVisit(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>

src/views/materialManagement/materialRegistration/index.vue

@@ -602,7 +602,7 @@ export default {
     },
     // 获取物品名称
     getMingCheng() {
-      listArchives().then((response) => {
+      exportMaterialRegWuPingList().then((response) => {
         this.itemlist = response.rows;
       });
     },

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -93,11 +93,11 @@
         <template slot-scope="scope">
           <span
             v-if="scope.row.expiredstatus == '1'"
-            style="color: "
+            style="color: #ffba00"
             :title="scope.row.beizhu"
             >手动添加</span
           >
-          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+          <span v-if="scope.row.expiredstatus == '0'" style="color: #13ce66"
             >自动转入</span
           >
         </template>
@@ -314,7 +314,9 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        beizhu: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
       // 防疫品名称
       fangYi: [],
     };

src/views/medicalhealth/antiepidemicruin/index.vue

@@ -162,6 +162,12 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="防疫品名称"
+        align="center"
+        prop="durgArchivesId"
+        :formatter="fang"
+      />
       <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="库房" align="center" prop="manufacturer">
@@ -270,6 +276,7 @@ import {
   updateRuin,
   exportRuin,
 } from "@/api/medicalhealth/antiepidemicruin";
+import { listAntiepidemicarchives } from "@/api/medicalhealth/antiepidemicarchives";
 
 export default {
   name: "Ruin",
@@ -313,12 +320,32 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 防疫品列表
+      fangList: [],
     };
   },
   created() {
     this.getList();
+    this.getFang();
   },
   methods: {
+    // 防疫品翻译
+    fang(row) {
+      var fang = "";
+      this.fangList.map((item) => {
+        if (item.id == row.durgArchivesId) {
+          fang = item.durgName;
+        }
+      });
+      return fang;
+    },
+    // 获取防疫品列表
+    getFang() {
+      listAntiepidemicarchives().then((response) => {
+        console.log(response);
+        this.fangList = response.rows;
+      });
+    },
     /** 查询防疫用品销毁记录列表 */
     getList() {
       this.loading = true;

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -108,11 +108,11 @@
         <template slot-scope="scope">
           <span
             v-if="scope.row.expiredstatus == '1'"
-            style="color: "
+            style="color: #ffba00"
             :title="scope.row.beizhu"
             >手动添加</span
           >
-          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+          <span v-if="scope.row.expiredstatus == '0'" style="color: #13ce66"
             >自动转入</span
           >
         </template>
@@ -333,7 +333,9 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        beizhu: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
       // 药品列表
       yaoList: [],
     };

src/views/medicalhealth/bdgldurgruin/index.vue

@@ -157,6 +157,12 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="药品名称"
+        align="center"
+        prop="durgArchivesId"
+        :formatter="yao"
+      />
       <el-table-column label="厂家" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
@@ -261,6 +267,7 @@ import {
   updateBdgldurgruin,
   exportBdgldurgruin,
 } from "@/api/medicalhealth/bdgldurgruin";
+import { listBdgldurgarchives } from "@/api/medicalhealth/bdgldurgarchives";
 
 export default {
   name: "Bdgldurgruin",
@@ -318,12 +325,32 @@ export default {
           },
         ],
       },
+      // 获取药品名称
+      yaoList: [],
     };
   },
   created() {
     this.getList();
+    this.getYaoPingMingCheng();
   },
   methods: {
+    // 翻译药品名称
+    yao(row) {
+      var yao = "";
+      this.yaoList.map((item) => {
+        if (item.id == row.durgArchivesId) {
+          yao = item.durgName;
+        }
+      });
+      return yao;
+    },
+    // 获取药品名称
+    getYaoPingMingCheng() {
+      listBdgldurgarchives().then((response) => {
+        console.log(response);
+        this.yaoList = response.rows;
+      });
+    },
     /** 查询药品销毁记录列表 */
     getList() {
       this.loading = true;

src/views/medicalhealth/consumeguoqi/index.vue

@@ -114,11 +114,11 @@
         <template slot-scope="scope">
           <span
             v-if="scope.row.expiredstatus == '1'"
-            style="color: "
+            style="color: #ffba00"
             :title="scope.row.beizhu"
             >手动添加</span
           >
-          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+          <span v-if="scope.row.expiredstatus == '0'" style="color: #13ce66"
             >自动转入</span
           >
         </template>
@@ -292,7 +292,9 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        beizhu: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
       // 耗材列表
       Consumables: [],
     };

src/views/medicalhealth/consumeruin/index.vue

@@ -155,7 +155,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="耗材" align="center" prop="durgBrand" />
+      <el-table-column
+        label="耗材名称"
+        align="center"
+        prop="durgArchivesId"
+        :formatter="hao"
+      />
       <el-table-column label="销毁数量" align="center" prop="putIn" />
       <el-table-column label="厂家" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />
@@ -272,6 +277,7 @@ import {
   updateRuin,
   exportRuin,
 } from "@/api/medicalhealth/consumeruin";
+import { listArchives } from "@/api/medicalhealth/archives";
 
 export default {
   name: "Ruin",
@@ -318,12 +324,32 @@ export default {
           { required: true, message: "不能为空", trigger: "blur" },
         ],
       },
+      // 耗材名称列表
+      haoList: [],
     };
   },
   created() {
     this.getList();
+    this.getHaoList();
   },
   methods: {
+    // 防疫品翻译
+    hao(row) {
+      var hao = "";
+      this.haoList.map((item) => {
+        if (item.id == row.durgArchivesId) {
+          hao = item.durgName;
+        }
+      });
+      return hao;
+    },
+    // 获取耗材名称列表
+    getHaoList() {
+      listArchives().then((response) => {
+        console.log(response);
+        this.haoList = response.rows;
+      });
+    },
     /** 查询耗材销毁记录列表 */
     getList() {
       this.loading = true;

src/views/peopleChuRu/leaveOne/index.vue

@@ -319,9 +319,7 @@
         <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -516,7 +514,13 @@
     />
 
     <!-- 添加或修改人员请假对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="500px"
+      append-to-body
+    >
       <el-form
         ref="form"
         :model="form"
@@ -726,16 +730,17 @@ import {
 import {
   getUser,
   getDept,
-  getQuanBu,
+  getQuanBu
 } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Cookies from "js-cookie";
 
 export default {
   name: "LeaveOne",
   components: {
-    Treeselect,
+    Treeselect
   },
   dicts: ["people_state"],
   data() {
@@ -797,7 +802,7 @@ export default {
         peopleName4: null,
         reasons: null,
         specialApproval: null,
-        actualreturntime: null,
+        actualreturntime: null
       },
       // 表单参数
       form: {},
@@ -806,33 +811,37 @@ export default {
       // 树形结构列表
       deptOptions: [],
       renYuan: [],
-      unitlist:[]
+      unitlist: []
     };
   },
   created() {
     this.getList();
     // 获取单位树形
     this.getBuMeng();
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
   },
-  mounted(){
-     getDept2().then(res=>{
-         this.unitlist=res.data;
-     })
+  mounted() {
+    getDept2().then(res => {
+      this.unitlist = res.data;
+    });
   },
   methods: {
     unit3Format(row, column) {
       var deptName = "";
-        this.unitlist.map((item) => {
-          if (item.deptId == row.unitId) {
-            deptName = item.deptName;
-          }
-        });
-      
+      this.unitlist.map(item => {
+        if (item.deptId == row.unitId) {
+          deptName = item.deptName;
+        }
+      });
+
       return deptName;
     },
     // 获取部门列表
     getBuMeng() {
-      getDept().then((res) => {
+      getDept().then(res => {
         this.deptOptions = res.data;
       });
     },
@@ -853,13 +862,13 @@ export default {
     },
     // 获取用户列表
     getYong(id) {
-      getUser(id).then((res) => {
+      getUser(id).then(res => {
         this.yongHu = res.data;
       });
     },
     // 获取人员
     getRen(id, num) {
-      getQuanBu(id, num).then((response) => {
+      getQuanBu(id, num).then(response => {
         this.renYuan = response.data;
       });
     },
@@ -878,7 +887,7 @@ export default {
     /** 查询人员请假列表 */
     getList() {
       this.loading = true;
-      listLeaveOne(this.queryParams).then((response) => {
+      listLeaveOne(this.queryParams).then(response => {
         // 获取单位树形
         this.getBuMeng();
         this.leaveOneList = response.rows;
@@ -928,7 +937,7 @@ export default {
         peopleName4: null,
         reasons: null,
         specialApproval: null,
-        actualreturntime: null,
+        actualreturntime: null
       };
       this.resetForm("form");
     },
@@ -944,7 +953,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -960,7 +969,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getLeaveOne(id).then((response) => {
+      getLeaveOne(id).then(response => {
         this.form = response.data;
         // 获取单位树形
         this.getBuMeng();
@@ -971,16 +980,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateLeaveOne(this.form).then((response) => {
+            updateLeaveOne(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addLeaveOne(this.form).then((response) => {
+            addLeaveOne(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -994,7 +1003,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm('是否确认删除人员请假编号为"' + ids + '"的数据项？')
-        .then(function () {
+        .then(function() {
           return delLeaveOne(ids);
         })
         .then(() => {
@@ -1012,13 +1021,13 @@ export default {
           this.exportLoading = true;
           return exportLeaveOne(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>
@@ -1181,7 +1190,7 @@ export default {
 ::v-deep .el-table__fixed-right {
   height: 100% !important;
 }
-::v-deep .vue-treeselect__control{
+::v-deep .vue-treeselect__control {
   background-color: transparent !important;
 }
 </style>

src/views/peopleManage/people/index.vue

@@ -8,8 +8,8 @@
         </div>
         <div class="tree">
           <el-tree
-        class="userAgrees"
-         style = "height:700px;overflow:auto;"
+            class="userAgrees"
+            style="height:700px;overflow:auto;"
             :data="deptOptions"
             :props="defaultProps"
             @node-click="handleNodeClick"
@@ -1264,6 +1264,7 @@ import {
   listDept,
   treeselect
 } from "@/api/peopleManage/people";
+import Cookies from "js-cookie";
 
 export default {
   name: "People",
@@ -1441,9 +1442,7 @@ export default {
         authorizedStrength: [
           { required: true, message: "是否编制不能为空", trigger: "change" }
         ],
-        deptId: [
-          { required: true, message: "单位不能为空", trigger: "change" }
-        ],
+        deptId: [{ required: true, message: "单位不能为空", trigger: "change" }]
         // name: [{ required: true, message: "亲属姓名不能为空", trigger: "blur" }]
         // jtname:[{ validator: jtnameblur, trigger: "blur" }],
         // characterRelationship: [
@@ -1506,6 +1505,10 @@ export default {
     };
   },
   created() {
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
     this.getList();
     //性别
     this.getDicts("sys_user_sex").then(response => {

src/views/system/cookcategory/index.vue

@@ -222,6 +222,7 @@ import {
   updateCookcategory,
   exportCookcategory,
 } from "@/api/system/cookcategory";
+import Cookies from "js-cookie";
 
 export default {
   name: "Cookcategory",
@@ -281,7 +282,12 @@ export default {
     };
   },
   created() {
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
     this.getList();
+       
   },
   methods: {
     /** 查询食品分类列表 */

src/views/thought/weekjobFu/index.vue

@@ -1,586 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="星期" prop="week">
-        <el-input
-          v-model="queryParams.week"
-          placeholder="请输入星期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="时间" prop="time">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.time"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="时段" prop="dateline">
-        <el-input
-          v-model="queryParams.dateline"
-          placeholder="请输入时段"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unitId1">
-        <el-input
-          v-model="queryParams.unitId1"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参加人员" prop="peopleIds">
-        <el-input
-          v-model="queryParams.peopleIds"
-          placeholder="请输入参加人员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="地点" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入地点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="时间段1" prop="startTime">
-        <el-input
-          v-model="queryParams.startTime"
-          placeholder="请输入时间段1"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="时间段2" prop="endTime">
-        <el-input
-          v-model="queryParams.endTime"
-          placeholder="请输入时间段2"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="主表ID" prop="weekjobId">
-        <el-input
-          v-model="queryParams.weekjobId"
-          placeholder="请输入主表ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="应到" prop="shouldArrive">
-        <el-input
-          v-model="queryParams.shouldArrive"
-          placeholder="请输入应到"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="实到" prop="realTo">
-        <el-input
-          v-model="queryParams.realTo"
-          placeholder="请输入实到"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="到课率" prop="percentage">
-        <el-input
-          v-model="queryParams.percentage"
-          placeholder="请输入到课率"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="组织人" prop="organizer">
-        <el-input
-          v-model="queryParams.organizer"
-          placeholder="请输入组织人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> -->
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['thought:weekjobFu:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['thought:weekjobFu:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['thought:weekjobFu:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['thought:weekjobFu:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="weekjobFuList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-       <el-table-column label="序号" type="index" width="50" align="center" />
-      <el-table-column label="组织人" align="center" prop="id" />
-      <el-table-column label="星期" align="center" prop="week" />
-      <el-table-column label="时间" align="center" prop="time" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时段" align="center" prop="dateline" />
-      <el-table-column label="内容" align="center" prop="contents" >
-      <template slot-scope="scope">
-          <span>{{ onEditor(scope.row.contents) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitId1" />
-      <el-table-column label="参加人员" align="center" prop="peopleIds" />
-      <el-table-column label="地点" align="center" prop="address" />
-      <el-table-column label="时间段1" align="center" prop="startTime" />
-      <el-table-column label="时间段2" align="center" prop="endTime" />
-      <!-- <el-table-column label="主表ID" align="center" prop="weekjobId" /> -->
-      <el-table-column label="应到" align="center" prop="shouldArrive" />
-      <el-table-column label="实到" align="center" prop="realTo" />
-      <el-table-column label="到课率" align="center" prop="percentage" />
-      <el-table-column label="组织人" align="center" prop="organizer" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
-        <template slot-scope="scope">
-          <el-button
-            size="btu"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['thought:weekjobFu:edit']"
-          >修改</el-button>
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['thought:weekjobFu:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改周工作附对话框 -->
-    <el-dialog  :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-      :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
-        <el-form-item label="星期" prop="week">
-          <el-input v-model="form.week" placeholder="请输入星期" />
-        </el-form-item>
-        <el-form-item label="时间" prop="time">
-          <el-date-picker clearable size="small"
-            v-model="form.time"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="时段" prop="dateline" label-width="95px">
-          <el-input v-model="form.dateline" placeholder="请输入时段" />
-        </el-form-item>
-        
-        <el-form-item label="单位" prop="unitId1">
-          <el-input v-model="form.unitId1" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="参加人员" prop="peopleIds">
-          <el-input v-model="form.peopleIds" placeholder="请输入参加人员" />
-        </el-form-item>
-        <el-form-item label="地点" prop="address">
-          <el-input v-model="form.address" placeholder="请输入地点" />
-        </el-form-item>
-        <el-form-item label="时间段1" prop="startTime">
-          <el-input v-model="form.startTime" placeholder="请输入时间段1" />
-        </el-form-item>
-        <el-form-item label="时间段2" prop="endTime">
-          <el-input v-model="form.endTime" placeholder="请输入时间段2" />
-        </el-form-item>
-        <!-- <el-form-item label="主表ID" prop="weekjobId">
-          <el-input v-model="form.weekjobId" placeholder="请输入主表ID" />
-        </el-form-item> -->
-        <el-form-item label="应到" prop="shouldArrive">
-          <el-input v-model="form.shouldArrive" placeholder="请输入应到" />
-        </el-form-item>
-        <el-form-item label="实到" prop="realTo">
-          <el-input v-model="form.realTo" placeholder="请输入实到" />
-        </el-form-item>
-        <el-form-item label="到课率" prop="percentage">
-          <el-input v-model="form.percentage" placeholder="请输入到课率" />
-        </el-form-item>
-        <el-form-item label="组织人" prop="organizer">
-          <el-input v-model="form.organizer" placeholder="请输入组织人" />
-        </el-form-item>
-        <div class="jiben">内容</div>
-        <el-form-item >
-          <!-- <editor v-model="form.contents" :min-height="192"/> -->
-          <quill-editor
-              class="quill-editor"
-              ref="myTextEditor"
-              v-model="form.contents"
-              style="
-                height: 150px;
-                width: 950px;
-                margin-left: 0px;
-                color: white;
-                margin-bottom: 60px;
-              "
-            ></quill-editor>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listWeekjobFu, getWeekjobFu, delWeekjobFu, addWeekjobFu, updateWeekjobFu, exportWeekjobFu } from "@/api/thought/weekjobFu";
-
-export default {
-  name: "WeekjobFu",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 周工作附表格数据
-      weekjobFuList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        week: null,
-        time: null,
-        dateline: null,
-        contents: null,
-        unitId1: null,
-        peopleIds: null,
-        address: null,
-        startTime: null,
-        endTime: null,
-        weekjobId: null,
-        shouldArrive: null,
-        realTo: null,
-        percentage: null,
-        organizer: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 转义视图不加标签
-    onEditor(str) {
-      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
-      if (str) {
-        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
-        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
-        return str;
-      }
-    },
-    /** 查询周工作附列表 */
-    getList() {
-      this.loading = true;
-      listWeekjobFu(this.queryParams).then(response => {
-        this.weekjobFuList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        week: null,
-        time: null,
-        dateline: null,
-        contents: null,
-        unitId1: null,
-        peopleIds: null,
-        address: null,
-        startTime: null,
-        endTime: null,
-        weekjobId: null,
-        shouldArrive: null,
-        realTo: null,
-        percentage: null,
-        organizer: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加周工作附";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getWeekjobFu(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改周工作附";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateWeekjobFu(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addWeekjobFu(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除周工作附编号为"' + ids + '"的数据项？').then(function() {
-        return delWeekjobFu(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有周工作附数据项？').then(() => {
-        this.exportLoading = true;
-        return exportWeekjobFu(queryParams);
-      }).then(response => {
-        this.$download.name(response.msg);
-        this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
-};
-</script>
-<style scoped>
-::v-deep .el-dialog {
-  background-color: #004d86 !important;
-}
-/* 输入框 */
-::v-deep .el-dialog .el-input__inner {
-  background-color: #004d86 !important;
-  width: 216px;
-  color: white;
-  margin-right: 20px;
-  border: 1px solid white !important;
-}
-::v-deep .el-input__inner {
-  border: 1px solid white !important;
-}
-/* 表格样式 */
-::v-deep .el-table .el-table__header-wrapper th{
-  background-color: #004d86 !important;
-  color: white;
-}
-/* 标题弹框 */
-::v-deep .el-dialog__title {
-  color: white;
-  /* border-bottom: 1px solid white; */
-}
-/* 标题下划线 */
-::v-deep .el-dialog__header{
-  border-bottom: 1px solid white;
-}
-/* 日历样式 */
-::v-deep .el-date-editor .el-input__inner{
-  height: 36px !important;
-  line-height: 36px;
-}
-::v-deep .datesend .el-form-item__label{
-  width: 115px !important;
-}
-/* 会议文本域样式 */
-::v-deep .el-form-item__content .el-textarea{
- width: 1010px;
- /* height: 80px !important; */
-}
-::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
- /* width: 1000px; */
- height: 80px !important;
-}
-::v-deep .el-dialog__body {
-    padding-left: 22px !important;
-    padding-right: 0px !important;
-    padding-bottom: 0px !important;
-}
-/* 富文本内容 */
-/* ::v-deep .editor{
-  width: 1010px;
-  color: white;
-} */
-/* 富文本 */
-::v-deep .ql-snow .ql-fill,
-.ql-snow .ql-stroke.ql-fill {
-  fill: #fff !important;
-}
-::v-deep .ql-snow .ql-stroke {
-  stroke: #fff !important;
-}
-::v-deep .ql-snow .ql-picker {
-  color: #fff !important;
-}
-::v-deep .ql-editor ql-blank {
-  color: #fff !important;
-}
-/* 富文本删除功能 */
-::v-deep .ql-blockquote {
-  display: none !important;
-}
-::v-deep .ql-strike {
-  display: none !important;
-}
-::v-deep .ql-script {
-  display: none !important;
-}
-::v-deep .ql-code-block {
-  display: none !important;
-}
-::v-deep .ql-direction {
-  display: none !important;
-}
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-::v-deep .ql-toolbar{
-  display: flex;
-  justify-content: space-around;
-}
-::v-deep .el-input__inner {
-  height: 36px !important;
-  color: white;
-  background-color: #00365f !important;
-}
-/* 文字多余部分省略 */
-::v-deep .el-table__cell .cell {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-::v-deep .el-input__suffix{
-  right: 22px;
-}
-</style>