更改基层登时间，更改首页的代办事项

src/api/grassrootsregistration/bdgldiary.js

@@ -85,4 +85,14 @@ export function exportDaily(query) {
     method: 'get',
     params:query
   })
-}
+}
+
+
+// 查询基层截止日期
+export function jieZhiList(query) {
+  return request({
+    url: 'system/time/list',
+    method: 'get',
+    params:query
+  })
+}

src/api/peopleManage/seconded.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function recallList(query) {
+    return request({
+        url: 'peopleManage/recall/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 新增
+export function recall(data) {
+    return request({
+        url: 'peopleManage/recall',
+        method: 'post',
+        data: data
+    })
+}
+
+
+
+// 政审
+export function getAuthorization(data) {
+    return request({
+        url: 'peopleManage/recall/edit',
+        method: 'post',
+        data: data
+    })
+}
+
+// 审核按钮
+export function getAuthorizations(query) {
+    return request({
+        url: 'peopleManage/recall/getAuthorization/',
+        method: 'get',
+        params: query
+    })
+}
+
+// 删除
+export function recallDell(ids) {
+    return request({
+        url: 'peopleManage/recall/' + ids,
+        method: 'delete'
+    })
+}
+
+
+
+

src/api/pt.js

@@ -79,4 +79,14 @@ export function remindPrint(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+
+// 代办事项
+export function syTaskView(query) {
+  return request({
+    url: 'jobTaskRecord/jobTask/syTaskView',
+    method: 'get',
+    params: query
+  })
+}

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -215,6 +215,7 @@
             :editable="false"
             value-format="yyyy-MM-dd"
             placeholder="请选择登记日期"
+            @change="timeDay"
           >
           </el-date-picker>
         </el-form-item>
@@ -353,6 +354,7 @@ import { getDept } from "@/api/grassrootsregistration/bdgleven";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "Bdglarmament",
@@ -429,14 +431,112 @@ export default {
       renYuan: [],
       roleOptions: [],
       form1: {},
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
     this.getList();
     this.getdept();
     this.getYear();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.recordDate = null;
+            })
+            .catch(() => {
+              this.form.recordDate = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.recordDate = null;
+            })
+            .catch(() => {
+              this.form.recordDate = null;
+            });
+        }
+      });
+    },
     getYear() {
       var myDate = new Date();
       var tYear = myDate.getFullYear();

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -8,7 +8,11 @@
       label-width="68px"
     >
       <el-form-item prop="unitName">
-      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.unitName"
+          @input="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="" prop="createtime">
         <el-date-picker
@@ -214,6 +218,7 @@
               :editable="false"
               value-format="yyyy-MM-dd"
               placeholder="请选择开始时间"
+              @change="timeDay"
             >
             </el-date-picker>
           </el-form-item>
@@ -231,7 +236,11 @@
           </el-form-item>
           <el-form-item label="司务长" prop="messOfficer">
             <!-- <el-input v-model="form.messOfficer" placeholder="请输入司务长" /> -->
-            <el-select v-model="form.messOfficer" placeholder="请选择单位"   clearable>
+            <el-select
+              v-model="form.messOfficer"
+              placeholder="请选择单位"
+              clearable
+            >
               <el-option
                 v-for="item in renYuan"
                 :key="item.id"
@@ -245,7 +254,11 @@
           </el-form-item>
           <el-form-item label="班长" prop="peopleId">
             <!-- <el-input v-model="form.peopleId" placeholder="请输入班长" /> -->
-            <el-select v-model="form.peopleId" placeholder="请选择单位"   clearable>
+            <el-select
+              v-model="form.peopleId"
+              placeholder="请选择单位"
+              clearable
+            >
               <el-option
                 v-for="item in renYuan"
                 :key="item.id"
@@ -1789,6 +1802,7 @@ import {
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDept } from "@/api/grassrootsregistration/bdglmeeting";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "Bdglcookbook",
@@ -1844,6 +1858,9 @@ export default {
         unitId: [
           { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
+        ],
       },
       options: [],
       value: "",
@@ -2006,15 +2023,112 @@ export default {
       zhongFu7: {},
       wanZhu7: {},
       wanFu7: {},
-
       arr: [],
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
     this.getList();
     this.getdept();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.startTime = null;
+            })
+            .catch(() => {
+              this.form.startTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.startTime = null;
+            })
+            .catch(() => {
+              this.form.startTime = null;
+            });
+        }
+      });
+    },
     // //获取部门列表
     getdept() {
       getShouBu().then((res) => {

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -88,7 +88,12 @@
         align="center"
         prop="trainingCategory"
       />
-      <el-table-column label="训练地点" align="center" prop="address" show-overflow-tooltip/>
+      <el-table-column
+        label="训练地点"
+        align="center"
+        prop="address"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="训练时间"
         align="center"
@@ -228,6 +233,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择训练开始时间"
+            @change="timeDay"
           >
           </el-date-picker>
         </el-form-item>
@@ -516,6 +522,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择训练开始时间"
+            @change="timeDay"
           >
           </el-date-picker>
         </el-form-item>
@@ -797,6 +804,7 @@ import {
   getZhuChiRen,
   getDept2,
 } from "@/api/grassrootsregistration/bdglmeeting";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 export default {
   name: "Bdgldrill",
   components: { Treeselect, bdgldrill },
@@ -892,20 +900,118 @@ export default {
       arr1: [],
       falg: null,
       form1: {},
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
     this.getList();
-    this.getYear()
+    this.getYear();
     treeselect().then((res) => {
       this.treeselects = res.rows;
     });
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.drillTime = null;
+            })
+            .catch(() => {
+              this.form.drillTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.drillTime = null;
+            })
+            .catch(() => {
+              this.form.drillTime = null;
+            });
+        }
+      });
+    },
     getYear() {
       var myDate = new Date();
       var tYear = myDate.getFullYear();
-      this.form1.year=tYear
+      this.form1.year = tYear;
     },
     // 添加人员确定
     submitForm3() {
@@ -1038,7 +1144,7 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      this.form1.unitId= row.unitId;
+      this.form1.unitId = row.unitId;
       // 是否隐藏按钮
       this.reset();
       getInfoByUnitId(this.form1).then((response) => {
@@ -1198,10 +1304,10 @@ export default {
           return this.arr1;
         });
       } else if (this.falg == false) {
-        // this.arr1=this.drillFus 
-        this.drillFus.forEach((item=>{
-       this.arr1.push(item.peopleId)
-        }))
+        // this.arr1=this.drillFus
+        this.drillFus.forEach((item) => {
+          this.arr1.push(item.peopleId);
+        });
       }
     },
     submitForm2() {
@@ -1405,7 +1511,7 @@ export default {
 ::v-deep .el-transfer-panel .el-transfer-panel__empty {
   color: #fff;
 }
-::v-deep .boxs .el-dialog__body{
+::v-deep .boxs .el-dialog__body {
   margin-left: 59px;
 }
 </style>

src/views/grassrootsregistration/bdglequip/index.vue

@@ -253,6 +253,7 @@
             :editable="false"
             value-format="yyyy-MM-dd"
             placeholder="请选择入库时间"
+            @change="timeDay"
           >
           </el-date-picker>
         </el-form-item>
@@ -377,6 +378,7 @@ import { getDept, getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "Bdglequip",
@@ -488,6 +490,12 @@ export default {
       // 时间默认
       times: null,
       form1: {},
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
@@ -495,8 +503,101 @@ export default {
     this.getBumen();
     this.getTiem();
     this.getYear();
+    this.getYear();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.intime = null;
+            })
+            .catch(() => {
+              this.form.intime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.intime = null;
+            })
+            .catch(() => {
+              this.form.intime = null;
+            });
+        }
+      });
+    },
     getYear() {
       var myDate = new Date();
       var tYear = myDate.getFullYear();

src/views/grassrootsregistration/bdgleven/index.vue

@@ -201,6 +201,7 @@
               :editable="false"
               value-format="yyyy-MM-dd"
               placeholder="请选择召开时间"
+              @change="timeDay"
             >
             </el-date-picker>
           </el-form-item>
@@ -330,8 +331,15 @@
         id="chakan"
         :close-on-click-modal="false"
       >
-        <div style="margin-bottom: 20px; margin-left: 28%;font-size:16px;  font-weight: 700;">
-          会议时间：<span >{{ tiemse }}</span>
+        <div
+          style="
+            margin-bottom: 20px;
+            margin-left: 28%;
+            font-size: 16px;
+            font-weight: 700;
+          "
+        >
+          会议时间：<span>{{ tiemse }}</span>
         </div>
         <div v-for="item in arr" :key="item" class="divbox">
           <img :src="baseUrl + item" alt="" />
@@ -355,6 +363,7 @@ import {
   exportBdgleven,
   getDept,
 } from "@/api/grassrootsregistration/bdgleven";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 import {
   getZhuChiRen,
   getShouBu,
@@ -475,19 +484,117 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime:null
     };
   },
   created() {
     this.getList();
     this.getBuMen();
     this.getSuo();
-    // this.onEditor();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
     //会议形式
     this.getDicts("sys_huiyi").then((response) => {
       this.huiYiList = response.data;
     });
+    jieZhiList().then(res=>{
+      console.log(res);
+      this.dayTime=res.rows[0].time
+    })
   },
   methods: {
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200&&this.dayTime==1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+        if (date1<1672501850&&this.dayTime==1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+      });
+    },
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {

src/views/grassrootsregistration/bdglfood/index.vue

@@ -216,6 +216,7 @@
               :editable="false"
               value-format="yyyy-MM-dd"
               placeholder="请选择登记日期"
+              @change="timeDay"
             >
             </el-date-picker>
           </el-form-item>
@@ -1132,6 +1133,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 // 字典
 import { getDicts } from "@/api/system/dict/data";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "Bdglfood",
@@ -1360,14 +1362,112 @@ export default {
           id: 3,
         },
       ],
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
     this.getList();
     this.getdept();
     this.getSuo();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.recordDate = null;
+            })
+            .catch(() => {
+              this.form.recordDate = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.recordDate = null;
+            })
+            .catch(() => {
+              this.form.recordDate = null;
+            });
+        }
+      });
+    },
     // 搜索人员触发
     Renyuan() {
       this.getList();
@@ -1547,93 +1647,93 @@ export default {
         ranliao: null,
         tiaoliao: null,
       };
-        // 中
-        this.zhongCan = {
-          stapleFood: null,
-          menu: null,
-          type1: 2,
-          jiucanCount: null,
-          lianduiCount: null,
-          wailaiCount: null,
-          mianfen: null,
-          dami: null,
-          rolei: null,
-          yulei: null,
-          youlei: null,
-          huangdo: null,
-          suchai: null,
-          shuiguo: null,
-          tang: null,
-          ranliao: null,
-          tiaoliao: null,
-        };
-        // 晚
-        this.wanCan = {
-          stapleFood: null,
-          menu: null,
-          type1: 3,
-          jiucanCount: null,
-          lianduiCount: null,
-          wailaiCount: null,
-          mianfen: null,
-          dami: null,
-          rolei: null,
-          yulei: null,
-          youlei: null,
-          huangdo: null,
-          suchai: null,
-          shuiguo: null,
-          tang: null,
-          ranliao: null,
-          tiaoliao: null,
-        };
-        this.acceptance = [
-          {
-            distinctions: null,
-            name: null,
-            weight: null,
-            money: null,
-            types: null,
-            time: null,
-          },
-        ];
-        // 交退伙食费
-        this.expenses = [
-          {
-            peopleId: null,
-            type: null,
-            sky: null,
-            standard: null,
-            money: null,
-          },
-        ];
-        // 在食堂购物
-        this.canteen = [
-          {
-            peopleId: null,
-            zName: null,
-            zWeight: null,
-            zMoney: null,
-            total: null,
-            fName: null,
-            fWeight: null,
-            fMoney: null,
-            qName: null,
-            qWeight: null,
-            qMoney: null,
-          },
-        ];
-        this.caiGou = [
-          {
-            distinction: null,
-            time: null,
-            name: null,
-            amount: null,
-            price: null,
-            consumption: null,
-          },
-        ];
-        this.resetForm("form");
+      // 中
+      this.zhongCan = {
+        stapleFood: null,
+        menu: null,
+        type1: 2,
+        jiucanCount: null,
+        lianduiCount: null,
+        wailaiCount: null,
+        mianfen: null,
+        dami: null,
+        rolei: null,
+        yulei: null,
+        youlei: null,
+        huangdo: null,
+        suchai: null,
+        shuiguo: null,
+        tang: null,
+        ranliao: null,
+        tiaoliao: null,
+      };
+      // 晚
+      this.wanCan = {
+        stapleFood: null,
+        menu: null,
+        type1: 3,
+        jiucanCount: null,
+        lianduiCount: null,
+        wailaiCount: null,
+        mianfen: null,
+        dami: null,
+        rolei: null,
+        yulei: null,
+        youlei: null,
+        huangdo: null,
+        suchai: null,
+        shuiguo: null,
+        tang: null,
+        ranliao: null,
+        tiaoliao: null,
+      };
+      this.acceptance = [
+        {
+          distinctions: null,
+          name: null,
+          weight: null,
+          money: null,
+          types: null,
+          time: null,
+        },
+      ];
+      // 交退伙食费
+      this.expenses = [
+        {
+          peopleId: null,
+          type: null,
+          sky: null,
+          standard: null,
+          money: null,
+        },
+      ];
+      // 在食堂购物
+      this.canteen = [
+        {
+          peopleId: null,
+          zName: null,
+          zWeight: null,
+          zMoney: null,
+          total: null,
+          fName: null,
+          fWeight: null,
+          fMoney: null,
+          qName: null,
+          qWeight: null,
+          qMoney: null,
+        },
+      ];
+      this.caiGou = [
+        {
+          distinction: null,
+          time: null,
+          name: null,
+          amount: null,
+          price: null,
+          consumption: null,
+        },
+      ];
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1699,7 +1799,7 @@ export default {
         // 采购食材
         this.caiGou = response.data.bdglFoodProcurements;
         // 交/退伙食费
-        if (response.data.bdglFoodBoardWagess.length>0) {
+        if (response.data.bdglFoodBoardWagess.length > 0) {
           this.expenses = response.data.bdglFoodBoardWagess;
         } else {
           this.expenses = [
@@ -1717,15 +1817,15 @@ export default {
         this.canteen = response.data.bdglFoodShoppings;
         // 后厨
         if (response.data.peopleIds !== null) {
-          if(response.data.peopleIds !== ""){
+          if (response.data.peopleIds !== "") {
             this.form.peopleIds = response.data.peopleIds.split(",");
-          this.arr = this.form.peopleIds;
-          this.form.peopleIds = this.arr.map((i) => parseInt(i, 0));
-          }else{
-            this.form.peopleIds=null
+            this.arr = this.form.peopleIds;
+            this.form.peopleIds = this.arr.map((i) => parseInt(i, 0));
+          } else {
+            this.form.peopleIds = null;
           }
-        }else{  
-          this.form.peopleIds=null
+        } else {
+          this.form.peopleIds = null;
         }
         this.open = true;
         this.title = "修改伙食管理登记薄";
@@ -1750,8 +1850,8 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             // 转换字符串
-            if(this.form.peopleIds){
-                 this.form.peopleIds = this.form.peopleIds.join(",");
+            if (this.form.peopleIds) {
+              this.form.peopleIds = this.form.peopleIds.join(",");
             }
             // 追加元素
             this.Arr.push(this.meal);

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -14,7 +14,7 @@
           @input="handleQuery"
         />
       </el-form-item>
-<!-- 
+      <!-- 
       <el-form-item label="" prop="compereId">
         <el-select
           v-model="queryParams.compereId"
@@ -231,6 +231,7 @@
               value-format="yyyy-MM-dd"
               placeholder="选择召开时间"
               :editable="false"
+              @change="timeDay"
             >
             </el-date-picker>
           </el-form-item>
@@ -442,6 +443,7 @@ import { quillEditor } from "vue-quill-editor";
 // 树形
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "Bdglmeeting",
@@ -563,6 +565,12 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
@@ -570,12 +578,108 @@ export default {
     this.getBuMen();
     this.getSuo();
     this.onEditor();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
     //会议形式
     this.getDicts("sys_tuan").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+      });
+    },
     // 翻译
     meetingFormFn(row) {
       var name = null;

src/views/grassrootsregistration/bdglparty/index.vue

@@ -14,24 +14,6 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="" prop="compereId">
-        <el-select
-          v-model="queryParams.compereId"
-          placeholder="请选择主持人"
-          @change="compere"
-          filterable
-          class="input_xiala"
-        >
-          <el-option
-            v-for="item in personnel"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
       <el-form-item>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -208,6 +190,7 @@
               :editable="false"
               value-format="yyyy-MM-dd"
               placeholder="请选择召开时间"
+              @change="timeDay"
             >
             </el-date-picker>
           </el-form-item>
@@ -403,6 +386,7 @@
 import bdglparty from "@/components/look_word/bdglparty.vue";
 // 自建API
 import { getDeptId } from "@/api/getApi/getApi";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 import {
   listBdglparty,
@@ -539,6 +523,12 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
@@ -546,21 +536,113 @@ export default {
     this.getBuMen();
     this.getSuo();
     this.onEditor();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
     //会议形式
     this.getDicts("sys_huiyi").then((response) => {
       this.huiYiList = response.data;
     });
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+      });
+    },
     // 翻译
     meetingFormFn(row) {
-      var  name=null
+      var name = null;
       this.huiYiList.map((item) => {
         if (item.dictValue == row.meetingForm) {
           name = item.dictLabel;
         }
       });
-      return name
+      return name;
     },
     //change方法
     changeSelect() {
@@ -602,7 +684,6 @@ export default {
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
-        console.log(res);
         this.personnel = res.data;
       });
     },

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -234,11 +234,16 @@
             :editable="false"
             value-format="yyyy-MM-dd"
             placeholder="请选择装备时间"
+            @change="timeDay"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="保管人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择保管人"   clearable>
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择保管人"
+            clearable
+          >
             <el-option
               v-for="item in roleOptions"
               :key="item.id"
@@ -316,6 +321,7 @@ import {
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDept } from "@/api/grassrootsregistration/bdgleven";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "Bdglpublicproperty",
@@ -388,16 +394,114 @@ export default {
       // 获取单位列表
       deptOptionss: [],
       form1: {},
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
     this.getList();
     this.getdept();
     this.getYear();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
-     // 获取当前年
-     getYear() {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.equipTime = null;
+            })
+            .catch(() => {
+              this.form.equipTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.equipTime = null;
+            })
+            .catch(() => {
+              this.form.equipTime = null;
+            });
+        }
+      });
+    },
+    // 获取当前年
+    getYear() {
       var myDate = new Date();
       var tYear = myDate.getFullYear();
       this.form1.year = tYear;
@@ -529,7 +633,7 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      this.form1.unitid=row.unitId
+      this.form1.unitid = row.unitId;
       // 是否隐藏按钮
       this.opens = false;
       publiccpropertyunits(this.form1).then((response) => {

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -291,6 +291,7 @@
             :editable="false"
             value-format="yyyy-MM-dd"
             placeholder="请选择起用时间"
+            @change="timeDay"
           >
           </el-date-picker>
         </el-form-item>
@@ -361,6 +362,7 @@ import {
   getZhuChiRen,
   getDept,
 } from "@/api/grassrootsregistration/bdglmeeting";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 export default {
   name: "Bdglsecrecy",
   components: { Treeselect, bdglsecrecy },
@@ -451,19 +453,117 @@ export default {
         label: "label",
       },
       form1: {},
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
     this.getList();
     this.getdict();
-    this.getYear()
+    this.getYear();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.startTime = null;
+            })
+            .catch(() => {
+              this.form.startTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.startTime = null;
+            })
+            .catch(() => {
+              this.form.startTime = null;
+            });
+        }
+      });
+    },
     // 获取当前年
     getYear() {
       var myDate = new Date();
       var tYear = myDate.getFullYear();
-      this.form1.year=tYear
+      this.form1.year = tYear;
     },
     // 种类选择触发
     // zhongLei() {
@@ -631,7 +731,7 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      this.form1.unitid=row.unitId;
+      this.form1.unitid = row.unitId;
       // 是否隐藏按钮
       this.opens = false;
       const id = row.id || this.ids;

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -213,6 +213,7 @@
               :editable="false"
               value-format="yyyy-MM-dd"
               placeholder="请选择召开时间"
+              @change="timeDay"
             >
             </el-date-picker>
           </el-form-item>
@@ -403,6 +404,7 @@ import { getDept } from "@/api/grassrootsregistration/bdglparty";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "Bdglsoldier",
@@ -518,6 +520,12 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
@@ -525,12 +533,104 @@ export default {
     this.getBuMen();
     this.getSuo();
     this.onEditor();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
     //会议形式
     this.getDicts("sys_wei").then((response) => {
       this.huiYiList = response.data;
     });
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
+    timeDay(val) {
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.convokeTime = null;
+            })
+            .catch(() => {
+              this.form.convokeTime = null;
+            });
+        }
+      });
+    },
     // 翻译
     meetingFormFn(row) {
       var name = null;

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -463,6 +463,8 @@ import {
   getDept,
   getShouBu,
 } from "@/api/grassrootsregistration/bdglmeeting";
+
+import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
 export default {
   name: "Bdglweekwork",
   components: { Treeselect, bdglweekwork },
@@ -609,14 +611,78 @@ export default {
       },
       // 工作安排时间
       gongZuoTiem: null,
+      // 当月日期
+      current_month: [],
+      // 下月日期
+      current_month1: [],
+      // 日期开关状态
+      dayTime: null,
     };
   },
   created() {
     this.getList();
     // 获取部门
     this.getDept();
+    // 获取当月
+    this.getDay();
+    // 获取下月
+    this.getDayX();
+    jieZhiList().then((res) => {
+      this.dayTime = res.rows[0].time;
+    });
   },
   methods: {
+    // 获取当月日期
+    getDay() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 1;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      // console.log(now);
+      let current_month_num = day;
+      this.current_month = [];
+      for (let i = 1; i <= current_month_num; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+        // console.log(this.current_month);
+      }
+    },
+    // 获取下个月日期
+    getDayX() {
+      // 获取标准时间
+      let now = new Date();
+      // 年
+      var year = new Date().getFullYear();
+      // 月
+      var month = new Date().getMonth() + 2;
+      // 日
+      var day = new Date(year, month, 0).getDate();
+      let current_month_num1 = day;
+      for (let i = 1; i <= current_month_num1; i++) {
+        let day = now.setDate(i);
+        let date = new Date(day); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        let Y = date.getFullYear() + "-";
+        let M =
+          (date.getMonth() + 2 < 10
+            ? "0" + (date.getMonth() + 2)
+            : date.getMonth() + 2) + "-";
+        let D =
+          (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + "";
+        this.current_month.push(Y + M + D);
+      }
+    },
     //增加工作登记表单
     tianJia() {
       this.tomList.push({
@@ -716,7 +782,7 @@ export default {
       }
     },
     // 开始时间触发
-    startTimes() {
+    startTimes(val) {
       if (
         this.form.unitId != null &&
         this.form.startTime != null &&
@@ -730,6 +796,38 @@ export default {
           }
         });
       }
+      var date1 = Math.round(new Date(val) / 1000);
+      // 当月时间
+      this.current_month.forEach((element) => {
+        // 十号之前是1675987200
+        var date2 = Math.round(new Date(element) / 1000);
+        if (date1 > 1675987200 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.startTime = null;
+            })
+            .catch(() => {
+              this.form.startTime = null;
+            });
+        }
+        if (date1 < 1672501850 && this.dayTime == 1) {
+          this.$confirm("请在规定时间内填写", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.form.startTime = null;
+            })
+            .catch(() => {
+              this.form.startTime = null;
+            });
+        }
+      });
     },
     // 结束时间触发
     endTimes() {

src/views/jobTaskRecord/jobTask/index.vue

@@ -370,6 +370,7 @@
         :rules="rules"
         label-width="100px"
         :inline="true"
+        class="jinduchakans"
       >
         <div class="jiben">完成进度</div>
         <el-progress
@@ -817,4 +818,7 @@ export default {
 ::v-deep .threeselects {
   width: 217px;
 }
+::v-deep .el-dialog{
+  background-color: #004d86 !important;
+}
 </style>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -169,6 +169,12 @@
         prop="unitPeopleName"
         width="120"
       />
+      <el-table-column
+        label="所在单位审批时间"
+        align="center"
+        prop="battaliontime"
+        width="150"
+      />
       <el-table-column label="所在单位审批状态" align="center" width="130">
         <template slot-scope="scope">
           <el-col v-if="scope.row.unitPeopleState == 1" style="color: #ffba00"
@@ -1228,6 +1234,27 @@ export default {
   },
   mounted() {},
   methods: {
+    // 获取当前时间
+    getDays() {
+      let date = new Date(); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      let Y = date.getFullYear() + "-";
+      let M =
+        (date.getMonth() + 1 < 10
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1) + "-";
+      let D =
+        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+      console.log(Y + M + D);
+      let H =
+        (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":"; //获取当前小时数(0-23)
+      let F =
+        (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) +
+        ":"; //获取当前分钟数(0-59)
+      let S =
+        (date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds()) +
+        ""; //获取当前秒数(0-59)
+      this.form.battaliontime = Y + M + D + H + F + S;
+    },
     // 带车人触发手机号
     peopelName(phone) {
       this.form.contact = phone.phone;
@@ -1376,6 +1403,7 @@ export default {
     // 审批通过
     submitFormShenPi() {
       if (this.form.shenpijiedian == "1") {
+        this.getDays();
         this.form.isTongguo = "0";
         if (this.form.id != null) {
           exportThebusYin(this.form).then((response) => {
@@ -1476,7 +1504,6 @@ export default {
       this.dislable = true;
       getThebusApply(id).then((response) => {
         this.form = response.data;
-        // this.getRen(this.form.unitId);
         this.getSuo();
         this.opens = true;
         this.title = "审批用车申请";

src/views/peopleManage/seconded/index.vue

@@ -43,44 +43,21 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="调动人员姓名" align="center" prop="cName" />
-      <el-table-column label="调动类型" align="center" prop="transferId">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_transferId"
-            :value="scope.row.transferId"
-          />
-        </template>
+      <el-table-column label="人员姓名" align="center" prop="cName" />
+      <el-table-column label="部职别" align="center" prop="filed2">
+      </el-table-column>
+      <el-table-column label="入伍时间" align="center" prop="filed1">
       </el-table-column>
       <el-table-column
-        label="调动日期"
+        label="调出日期"
         align="center"
-        prop="transferDate"
+        prop="createtime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.transferDate, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调动后军衔" align="center" prop="militaryRank2">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_user_rank"
-            :value="scope.row.militaryRank2"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="调动后职务" align="center" prop="post2">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.post_Level" :value="scope.row.post2" />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="调动后单位"
-        align="center"
-        prop="unit2"
-        :formatter="unit2Format"
-      />
       <el-table-column
         label="操作"
         align="center"
@@ -88,15 +65,15 @@
       >
         <template slot-scope="scope">
           <el-button
-            size="btu"
+            size="btk"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['peopleManage:transfer:edit']"
-            >修改</el-button
+            v-hasPermi="['peopleManage:recall:edit']"
+            >审核</el-button
           >
           <el-button
             size="btd"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['peopleManage:transfer:remove']"
+            v-hasPermi="['peopleManage:recall:remove']"
             >删除</el-button
           >
         </template>
@@ -119,6 +96,7 @@
       append-to-body
       :close-on-click-modal="false"
       custom-class="box1"
+      @close="cancel"
     >
       <el-form
         ref="form"
@@ -148,19 +126,21 @@
             <tr align="center" class="tr">
               <td width="220" height="40">调出人员</td>
               <td width="220" height="56">
-                <el-form-item prop="messOfficer">
+                <el-form-item prop="cName">
                   <el-select
-                    v-model="form.messOfficer"
+                    v-model="form.cName"
                     placeholder="请选择人员"
                     clearable
                     filterable
+                    :disabled="que"
                   >
                     <el-option
                       v-for="item in renYuan"
                       :key="item.id"
                       :label="item.name"
-                      :value="item.id"
+                      :value="item.name"
                       class="input_xiala"
+                      @click.native="ren(item)"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -174,7 +154,18 @@
             >
               <td width="220" height="40">{{ item.name }}</td>
               <td width="220" height="40">
-                <el-button type="bde" style="margin: 9px 0"
+                <el-button
+                  type="bde"
+                  style="margin: 9px 0"
+                  :disabled="true"
+                  v-if="item.num == 1"
+                  >已同意</el-button
+                >
+                <el-button
+                  type="bde"
+                  style="margin: 9px 0"
+                  @click="shenHe(item.type)"
+                  v-else
                   >审 核</el-button
                 >
               </td>
@@ -207,7 +198,18 @@
             >
               <td width="220" height="40">{{ item.name }}</td>
               <td width="220" height="40">
-                <el-button type="bde" style="margin: 9px 0"
+                <el-button
+                  type="bde"
+                  style="margin: 9px 0"
+                  :disabled="true"
+                  v-if="item.num == 1"
+                  >已同意</el-button
+                >
+                <el-button
+                  type="bde"
+                  style="margin: 9px 0"
+                  @click="shenHe1(item.type)"
+                  v-else
                   >审 核</el-button
                 >
               </td>
@@ -216,45 +218,26 @@
         </table>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="que1"
+          >确 定</el-button
+        >
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
-  
   <script>
 import {
-  listTransfer,
-  getTransfer,
-  delTransfer,
-  addTransfer,
-  updateTransfer,
-  exportTransfer,
-  listPeople,
-  getPeople,
-  getDept,
-} from "@/api/peopleManage/transfer";
+  recallList,
+  recall,
+  recallDell,
+  getAuthorization,
+  getAuthorizations,
+} from "@/api/peopleManage/seconded";
 import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "Transfer",
-  dicts: [
-    "sys_user_sex",
-    "post_Level",
-    "sys_user_rank",
-    "personnel_type",
-    "Degree_level",
-    "degree",
-    "Caucus",
-    "marryList",
-    "sys_yw",
-    "healthy",
-    "bloodType",
-    "sys_yes_no",
-    "sys_yes_no",
-    "sys_transferId",
-  ],
   data() {
     return {
       // 遮罩层
@@ -424,74 +407,96 @@ export default {
           type: "zw",
         },
       ],
+      form1: {},
+      //   审核确定按钮的显示与隐藏
+      que: false,
+      que1: true,
     };
   },
   created() {
     this.getList();
-    //调动人员对象
-    listPeople().then((res) => {
-      if (res.code == 200) {
-        this.peopleIds = res.rows;
-      }
-    });
-    //调动类型
-    this.getDicts("sys_transferId").then((response) => {
-      this.transferIds = response.data;
-    });
-    //职务层级
-    this.getDicts("post_Level").then((response) => {
-      this.postIds = response.data;
-    });
-    //军衔
-    this.getDicts("sys_user_rank").then((response) => {
-      this.rankIds = response.data;
-    });
-    //部门数据
-    getDept().then((res) => {
-      if (res.code == 200) {
-        this.unitId = res.data;
-      }
-    });
     this.getQuanR();
   },
   methods: {
+    //审核左面
+    shenHe(value) {
+      this.form.type = value;
+      this.$confirm("是否通过审核", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          console.log(this.form);
+          getAuthorization(this.form).then((res) => {
+            this.$message({
+              type: "success",
+              message: "审核成功!",
+            });
+            this.open = false;
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消审核",
+          });
+        });
+    },
+    // 审核右面
+    shenHe1(value) {
+      this.form.type = value;
+      this.$confirm("是否通过审核", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          getAuthorization(this.form).then((res) => {
+            this.$message({
+              type: "success",
+              message: "审核成功!",
+            });
+            this.open = false;
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消审核",
+          });
+        });
+    },
     // 获取全部人员
     getQuanR() {
       getAll().then((res) => {
         this.renYuan = res.data;
       });
     },
-    // 获取部门列表
-    getBuMen() {
-      //部门数据
-      getDept().then((res) => {
-        if (res.code == 200) {
-          this.unitId = res.data;
-        }
-      });
+    // 获取人员信息
+    ren(value) {
+      this.form.filed1 = value.enlistDate;
+      this.form.filed2 = value.duty;
+      this.form.peopleId = value.id;
     },
     /** 查询调动管理列表 */
     getList() {
       this.loading = true;
-      listTransfer(this.queryParams).then((response) => {
+      recallList(this.queryParams).then((response) => {
         this.transferList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    //单位翻译
-    unit2Format(row, column) {
-      var deptName = "";
-      this.unitId.map((item) => {
-        if (item.deptId == row.unit2) {
-          deptName = item.deptName;
-        }
-      });
-      return deptName;
-    },
     // 取消按钮
     cancel() {
       this.open = false;
+      this.shenList.forEach((item) => {
+        item.num = 0;
+      });
+      this.shenListRight.forEach((item) => {
+        item.num = 0;
+      });
       this.reset();
     },
     // 表单重置
@@ -499,23 +504,9 @@ export default {
       this.form = {
         id: null,
         peopleId: null,
-        transferId: null,
-        transferDate: null,
-        transferTake: null,
-        militaryRank1: null,
-        militaryRank2: null,
-        post1: null,
-        post2: null,
-        unit1: null,
-        unit2: null,
-        aduty: null,
-        commandNumber: null,
-        reason: null,
-        remark: null,
-        field1: null,
-        createtime: null,
-        updatetime: null,
+        filed1: null,
         cName: null,
+        filed1: null,
       };
       this.resetForm("form");
     },
@@ -540,17 +531,42 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.que = false;
+      this.que1 = true;
+      this.shenList.forEach((item) => {
+        item.num = 0;
+      });
+      this.shenListRight.forEach((item) => {
+        item.num = 0;
+      });
       this.title = "添加调动管理";
     },
-    /** 修改按钮操作 */
+    /** 审核按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      this.getBuMen();
-      const id = row.id || this.ids;
-      getTransfer(id).then((response) => {
-        this.form = response.data;
+      // 赋值名字
+      this.form = row;
+      this.form1.id = row.id;
+      this.form1.peopleId = row.peopleId;
+      getAuthorizations(this.form1).then((res) => {
+        // 循环左面的列表
+        res.rows.forEach((element) => {
+          this.shenList.forEach((item) => {
+            if (element.bdglPeopleRecallAuditlog.type == item.type) {
+              item.num = 1;
+            }
+          });
+        });
+        res.rows.forEach((element) => {
+          this.shenListRight.forEach((item) => {
+            if (element.bdglPeopleRecallAuditlog.type == item.type) {
+              item.num = 1;
+            }
+          });
+        });
         this.open = true;
-        this.title = "修改调动管理";
+        this.title = "审批";
+        this.que = true;
+        this.que1 = false;
       });
     },
     /** 提交按钮 */
@@ -558,16 +574,9 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            this.form.cName = this.$refs["peopleId"].selectedLabel;
-            updateTransfer(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
           } else {
-            this.form.cName = this.$refs["peopleId"].selectedLabel;
-            addTransfer(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+            recall(this.form).then((res) => {
+              this.$modal.msgSuccess("调出成功");
               this.open = false;
               this.getList();
             });
@@ -577,11 +586,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      console.log(row);
       const ids = row.id || this.ids;
       this.$modal
-        .confirm("是否确认删除调动管理的数据项？")
+        .confirm("是否确认删除？")
         .then(function () {
-          return delTransfer(ids);
+          return recallDell(ids);
         })
         .then(() => {
           this.getList();
@@ -589,32 +599,6 @@ export default {
         })
         .catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal
-        .confirm("是否确认导出所有调动管理数据项？")
-        .then(() => {
-          this.exportLoading = true;
-          return exportTransfer(queryParams);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-        })
-        .catch(() => {});
-    },
-    //获取人员基本信息
-    //获取人员基本信息
-    peopleIdfun() {
-      getPeople(this.form.peopleId).then((res) => {
-        if (res.code == 200) {
-          this.form.militaryRank1 = res.data.nowMilitaryRank;
-          this.form.post1 = res.data.postId + "";
-          this.form.unit1 = res.data.deptId;
-        }
-      });
-    },
   },
 };
 </script>
@@ -698,11 +682,24 @@ export default {
 ::v-deep .box1 .el-form-item {
   margin-bottom: 0px;
 }
-::v-deep .box1 .el-input__inner{
-    border: transparent !important;
-    width: 200px;
-    height: 30px;
-    text-align: center;
+::v-deep .box1 .el-input__inner {
+  border: transparent !important;
+  width: 200px;
+  height: 30px;
+  text-align: center;
+}
+::v-deep .el-dialog__body {
+  padding: 30px 74px;
+}
+
+::v-deep .el-button.is-disabled,
+.el-button.is-disabled:hover,
+.el-button.is-disabled:focus {
+  color: #fff;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #13ce66;
+  border-color: #13ce66;
 }
 </style>
   

src/views/pt.vue

@@ -434,8 +434,8 @@
             </div>
             <ul class="num1-ul">
               <div class="num2-ul-title">
-                <div class="num2-ul-title-l">代办事项</div>
-                <div class="num2-ul-title-c">分类</div>
+                <div class="num2-ul-title-l">任务名称</div>
+                <div class="num2-ul-title-c">优先级</div>
                 <div class="num2-ul-title-r">执行人</div>
               </div>
               <li
@@ -444,9 +444,14 @@
                 :key="item.id"
                 @click="dbsxfun"
               >
-                <div class="num2-ul-li-l">{{ item.taskName }}</div>
-                <div class="num2-ul-li-c">工作</div>
-                <div class="num2-ul-li-r">{{ item.peopleName }}</div>
+                <div class="num2-ul-li-l">{{ item.workName }}</div>
+                <div class="num2-ul-li-c" v-if="item.workPriority == 0">
+                  紧急
+                </div>
+                <div class="num2-ul-li-c" v-if="item.workPriority == 1">高</div>
+                <div class="num2-ul-li-c" v-if="item.workPriority == 2">中</div>
+                <div class="num2-ul-li-c" v-if="item.workPriority == 3">低</div>
+                <div class="num2-ul-li-r">{{ item.executorPeople }}</div>
               </li>
             </ul>
           </div>
@@ -623,7 +628,8 @@
         <el-row>
           <el-col :span="12">
             <p
-              style=" width: 100%;
+              style="
+                width: 100%;
                 height: 30px;
                 line-height: 30px;
                 color: #fff;
@@ -753,6 +759,7 @@ import {
   getNone,
   noReminder,
   remindPrint,
+  syTaskView,
 } from "@/api/pt";
 import { getUserProfile } from "@/api/system/user";
 import Cookies from "js-cookie";
@@ -842,7 +849,7 @@ export default {
         if (res.num == 0) {
           this.open6 = false;
         } else {
-          var ti = Cookies.get("tixing")||false;
+          var ti = Cookies.get("tixing") || false;
           if (ti) {
             this.open6 = false;
           } else {
@@ -898,9 +905,10 @@ export default {
         });
       });
     },
+    // 获取代办事项
     getworklist() {
-      getWorkTask().then((res) => {
-        this.worklist = res.data;
+      syTaskView().then((res) => {
+        this.worklist = res.rows;
       });
     },
     // 表单重置
@@ -1215,7 +1223,7 @@ export default {
     },
     dbsxfun() {
       this.$router
-        .push({ path: "/workingArrangements/workTask" })
+        .push({ path: "/workingArrangements/jobTask" })
         .catch(() => {});
     },
   },
@@ -1447,6 +1455,17 @@ hr {
   width: 100%;
   height: 86%;
   margin-top: 2%;
+  overflow: auto;
+}
+.num1-ul::-webkit-scrollbar {
+  width: 14px;
+  /* height: 2px !important; */
+  background:  #002745;
+}
+
+/*定义滑块，内阴影及圆角*/
+.num1-ul::-webkit-scrollbar-thumb {
+  background: rgba(0, 39, 69, 1);
 }
 .num1-ul-li {
   width: 100%;

src/views/thought/talk/index.vue

@@ -1,35 +1,5 @@
 <template>
   <div class="app-container">
-    <!-- <div class="box-lfet"> -->
-    <!-- <div class="data">
-        <p>单位</p>
-        <div class="a1"></div>
-        <el-date-picker
-          v-model="tiem"
-          type="date"
-          :editable="false"
-          placeholder="选择日期"
-          value-format="yyyy-MM-dd"
-          @change="shiJian"
-        >
-        </el-date-picker>
-      </div> -->
-    <!-- <div class="dadui">
-        <img src="../../../images/星星.png" alt="" />
-        大队
-      </div>
-      <div class="tree">
-        <el-tree
-          class="userAgrees"
-          style="height: 700px; overflow: auto"
-          :data="deptOptions"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-          default-expand-all
-          highlight-current
-          :expand-on-click-node="false"
-        ></el-tree>
-      </div> -->
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
         <div class="dadui">
@@ -49,6 +19,27 @@
           ></el-tree>
         </div>
       </el-col>
+      <el-col :span="1.5" class="mb8">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item prop="talkPeople">
+            <el-input
+              placeholder="请输入谈心人名称"
+              v-model="queryParams.talkPeople"
+              @input="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="btr" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-col>
+
       <el-col :span="1.5" class="mb8">
         <el-button
           type="primary"
@@ -72,7 +63,7 @@
           >修改</el-button
         >
       </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -83,19 +74,7 @@
           v-hasPermi="['thought:talk: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:talk:export']"
-            >导出</el-button
-          > -->
-      </el-col>
+      </el-col> -->
       <!-- </el-row> -->
       <el-col :span="20" :xs="24">
         <el-table
@@ -110,18 +89,10 @@
             width="50"
             align="center"
           />
+          <el-table-column label="谈心人" align="center" prop="talkPeople" />
+          <el-table-column label="被谈心人" align="center" prop="talkObject" />
           <el-table-column
-            label="谈心人名称"
-            align="center"
-            prop="talkPeople"
-          />
-          <el-table-column
-            label="谈心对象名称"
-            align="center"
-            prop="talkObject"
-          />
-          <el-table-column
-            label="谈心单位名称"
+            label="被谈心单位"
             align="center"
             prop="unitName"
             show-overflow-tooltip
@@ -135,7 +106,7 @@
           prop="talkObjectId"
         /> -->
           <el-table-column
-            label="开始时间"
+            label="谈心时间"
             align="center"
             prop="startTime"
             width="180"
@@ -145,25 +116,14 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="结束时间"
+            label="谈心分类"
             align="center"
-            prop="endTime"
+            prop="talktype"
             width="180"
+            :formatter="talkT"
           >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
-            </template>
           </el-table-column>
-          <!-- <el-table-column label="创建人姓名" align="center" prop="createName" /> -->
-          <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
-          <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
           <!-- <el-table-column
-          label="文件名称"
-          align="center"
-          prop="fileName"
-          show-overflow-tooltip
-        /> -->
-          <el-table-column
             label="谈话内容"
             align="center"
             prop="talkContent"
@@ -172,20 +132,7 @@
             <template slot-scope="scope">
               <span>{{ onEditor(scope.row.talkContent) }}</span>
             </template>
-          </el-table-column>
-          <!-- <el-table-column
-          label="谈话时间"
-          align="center"
-          prop="talkTime"
-          width="180"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.talkTime, "{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column> -->
-          <!-- <el-table-column label="谈话地点" align="center" prop="talkAddress" />
-        <el-table-column label="记录人" align="center" prop="recorder" />
-        <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
+          </el-table-column> -->
           <el-table-column
             label="操作"
             align="center"
@@ -250,6 +197,7 @@
             v-model="form.talkPeople"
             ref="createName"
             placeholder="请选择谈心人员"
+            clearable
           >
             <el-option
               v-for="item in executors"
@@ -260,7 +208,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="谈心对象单位" prop="unitId">
+        <el-form-item label="单位" prop="unitId">
           <!-- <el-input v-model="form.unitName" placeholder="请输入单位名称" /> -->
           <treeselect
             v-model="form.unitId"
@@ -270,11 +218,21 @@
             @select="selectPeo"
           />
         </el-form-item>
-        <el-form-item label="谈心对象" prop="talkObject">
+        <el-form-item label="谈心时间" prop="startTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择谈心时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="被谈心人" prop="talkObject">
           <el-select
             filterable
             v-model="form.talkObject"
-            placeholder="请选择谈心对象"
+            placeholder="请选择被谈心人"
             ref="peoplenames"
           >
             <el-option
@@ -286,17 +244,29 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="谈心开始时间" prop="startTime">
-          <el-date-picker
+        <!-- <el-form-item label="谈心地点" prop="talkAddress" label-width="125px">
+          <el-input
+            placeholder="请输入谈心地点"
+            v-model="form.talkAddress"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="谈心分类" prop="talktype" label-width="115px">
+          <el-select
+            filterable
+            v-model="form.talktype"
+            ref="createName"
+            placeholder="请选择谈心分类"
             clearable
-            size="small"
-            v-model="form.startTime"
-            type="datetime"
-            placeholder="选择开始时间"
           >
-          </el-date-picker>
+            <el-option
+              v-for="item in tanList"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="谈心结束时间" prop="endTime" label-width="125px">
+        <!-- <el-form-item label="谈心结束时间" prop="endTime" label-width="125px">
           <el-date-picker
             clearable
             size="small"
@@ -305,7 +275,7 @@
             placeholder="选择结束时间"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <div class="jiben">谈话内容</div>
         <el-form-item>
           <quill-editor
@@ -346,14 +316,14 @@
         label-width="110px"
         :inline="true"
       >
-        <el-form-item label="谈心人员" prop="talkPeople">
+        <el-form-item label="谈心人" prop="talkPeople">
           <!-- <el-input v-model="form.talkPeople" placeholder="请输入谈心人员" /> -->
           <el-select
             filterable
             disabled
             v-model="form1.talkPeople"
             ref="createName"
-            placeholder="请选择谈心人员"
+            placeholder="请选择谈心人"
           >
             <el-option
               v-for="item in executors"
@@ -364,7 +334,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="谈心对象单位" prop="unitId">
+        <el-form-item label="单位" prop="unitId">
           <!-- <el-input v-model="form.unitName" placeholder="请输入单位名称" /> -->
           <treeselect
             disabled
@@ -375,12 +345,24 @@
             @select="selectPeo"
           />
         </el-form-item>
-        <el-form-item label="谈心对象" prop="talkObject">
+        <el-form-item label="谈心时间" prop="startTime">
+          <el-date-picker
+            disabled
+            clearable
+            size="small"
+            v-model="form1.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="被谈心人" prop="talkObject">
           <el-select
             disabled
             filterable
             v-model="form1.talkObject"
-            placeholder="请选择谈心对象"
+            placeholder="请选择被谈心人"
             ref="peoplenames"
           >
             <el-option
@@ -392,19 +374,32 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="谈心开始时间" prop="startTime">
-          <el-date-picker
+      
+        <!-- <el-form-item label="谈心地点" prop="talkAddress" label-width="125px">
+          <el-input
+            placeholder="请输入谈心地点"
+            v-model="form1.talkAddress"
             disabled
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="谈心分类" prop="talktype" label-width="115px">
+          <el-select
+            filterable
+            v-model="form1.talktype"
+            ref="createName"
+            placeholder="请选择谈心分类"
             clearable
-            size="small"
-            v-model="form1.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始时间"
+            disabled
           >
-          </el-date-picker>
+            <el-option
+              v-for="item in tanList"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="谈心结束时间" prop="endTime" label-width="125px">
+        <!-- <el-form-item label="谈心结束时间" prop="endTime" label-width="125px">
           <el-date-picker
             disabled
             clearable
@@ -415,7 +410,7 @@
             placeholder="选择结束时间"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <div class="jiben">谈话内容</div>
         <el-form-item>
           <quill-editor
@@ -472,6 +467,8 @@ import {
 } from "@/api/grassrootsregistration/bdglmeeting";
 import { deptUser } from "@/api/doormanManage/bdglVisit";
 import { getDeptList } from "@/api/workingArrangements/workTask";
+// 字典
+import { getDicts } from "@/api/system/dict/data";
 export default {
   name: "Talk",
   components: { Treeselect },
@@ -528,9 +525,9 @@ export default {
         startTime: [
           { required: true, message: "开始时间不能为空", trigger: "blur" },
         ],
-        endTime: [
-          { required: true, message: "结束时间不能为空", trigger: "blur" },
-        ],
+        // endTime: [
+        //   { required: true, message: "结束时间不能为空", trigger: "blur" },
+        // ],
         unitName: [
           { required: true, message: "谈心对象单位不能为空", trigger: "blur" },
         ],
@@ -566,6 +563,8 @@ export default {
       form1: {},
       open1: false,
       title1: "",
+      // 谈心分类
+      tanList: [],
     };
   },
   created() {
@@ -580,8 +579,22 @@ export default {
     getDeptList().then((res) => {
       this.getdeptList = res.data;
     });
+    getDicts("sys_classify").then((res) => {
+      console.log(res);
+      this.tanList = res.data;
+    });
   },
   methods: {
+    // 分类翻译
+    talkT(row) {
+      var name = "";
+      this.tanList.map((res) => {
+        if (res.dictValue == row.talktype) {
+          name = res.dictLabel;
+        }
+      });
+      return name;
+    },
     unit2Format(row) {
       var deptName = "";
       this.getdeptList.map((item) => {
@@ -625,7 +638,8 @@ export default {
     // 获取所有人员
     getSuoYou() {
       getAll().then((response) => {
-        this.executors = response.rows;
+        console.log(response);
+        this.executors = response.data;
         // 添加的人员
         // this.executor = response.rows;
         // 记录人
@@ -727,7 +741,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加谈心记录卡";
+      this.title = "谈心录入";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -735,8 +749,9 @@ export default {
       const id = row.id || this.ids;
       getTalk(id).then((response) => {
         this.form = response.data;
+        this.form.talktype = response.data.talktype + "";
         this.open = true;
-        this.title = "修改谈心记录卡";
+        this.title = "修改谈心录入";
       });
     },
     // 查看按钮操作
@@ -745,10 +760,11 @@ export default {
       const id = row.id || this.ids;
       getTalk(id).then((response) => {
         this.form1 = response.data;
+        this.form1.talktype = response.data.talktype + "";
         this.form1.filePath =
           process.env.VUE_APP_BASE_API + this.form1.filePath;
         this.open1 = true;
-        this.title1 = "查看谈心记录卡";
+        this.title1 = "查看谈心录入";
       });
     },
     /** 提交按钮 */

src/views/workingArrangements/planTask/index.vue

@@ -614,6 +614,7 @@
         :rules="rules"
         label-width="100px"
         :inline="true"
+        class="jinduchakans"
       >
         <div class="jiben">完成进度</div>
         <el-progress
@@ -1745,7 +1746,7 @@ export default {
   border-bottom: 1px solid white !important;
 }
 .el-dialog__body .el-table th.is-leaf {
-  border: 1px solid white ;
+  border: 1px solid white;
 }
 /* 下载按钮 */
 .downloadfile {
@@ -1824,4 +1825,8 @@ export default {
 .el-scrollbar li:hover {
   color: black;
 }
+
+.jinduchakans .el-table th.is-leaf {
+  border: 1px solid white !important;
+}
 </style>

src/views/workingArrangements/workCalendar/index.vue

@@ -194,6 +194,7 @@
         :rules="rulesb"
         label-width="100px"
         :inline="true"
+        class="jinduchakans"
       >
         <div class="jiben">任务信息</div>
         <el-form-item label="发布人" prop="publishPeople" label-width="auto">
@@ -620,4 +621,8 @@ export default {
   left: 9%;
   top: 1%;
 }
+
+.jinduchakans  .el-table th.is-leaf{
+  border: 1px solid white !important;
+}
 </style>

src/views/workingArrangements/worktaskplan/index.vue

@@ -1628,7 +1628,7 @@ export default {
   border: 1px solid white !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 583px;
+  width: 619px;
   height: 104px;
 }
 ::v-deep .box .el-textarea__inner {
@@ -1639,7 +1639,7 @@ export default {
   width: 800px;
 }
 ::v-deep .el-dialog__body .el-table tr:nth-child(odd) {
-  background-color: transparent !important;
+  /* background-color: transparent !important; */
 }
 ::v-deep .el-dialog__body .el-table tr:nth-child(even) {
   background-color: #2a6b9a !important;
@@ -1671,7 +1671,7 @@ export default {
   margin-bottom: 21px;
 }
 .ren_wu {
-  width: 501px;
+  width: 540px !important;
 }
 .ren_wu1 {
   width: 636px;
@@ -1719,7 +1719,7 @@ export default {
   margin-right: 107px;
 }
 ::v-deep .addbox .el-dialog__body {
-  margin-left: 86px !important;
+  margin-left: 56px !important;
 }
 /* 查看 */
 ::v-deep .box4 .box3 .is-disabled {
@@ -1796,4 +1796,11 @@ hr {
   color: #fff;
   background-color: #1d96ff;
 }
+
+::v-deep .el-dialog {
+  background-color: #004D86;
+}
+::v-deep .el-dialog__title{
+  color: #fff;
+}
 </style>