1

src/api/access/accessControl.js

@@ -8,3 +8,12 @@ export function listBarracks(query) {
     params: query
   })
 }
+
+// 获取列表
+export function attendancerecordList(query) {
+  return request({
+    url: 'grassrootsregistration/attendancerecord/list',
+    method: 'get',
+    params: query
+  })
+}

src/views/PrintsManage/manage/index.vue

@@ -97,7 +97,8 @@
         <template slot-scope="scope">
           <el-tooltip :content="scope.row.name" placement="top">
             <div
-              style="  overflow: hidden;
+              style="
+                overflow: hidden;
                 display: -webkit-box;
                 text-overflow: ellipsis;
                 -webkit-line-clamp: 2;
@@ -283,14 +284,14 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="归还时间" prop="returnTime" class="box1">
+          <!-- <el-form-item label="归还时间" prop="returnTime" class="box1">
             <el-date-picker
               v-model="form.returnTime"
               type="date"
               placeholder="选择日期"
             >
             </el-date-picker>
-          </el-form-item>
+          </el-form-item> -->
           <div class="jiben">打印说明</div>
           <el-form-item label prop="explainInfo">
             <el-input
@@ -479,6 +480,7 @@
                 label="是否为双面打"
                 label-width="120px"
                 prop="isPrintTwo"
+                style="margin-right: 100px"
               >
                 <!-- <el-radio-group
                 v-model="item.isPrintTwo"
@@ -499,7 +501,7 @@
                 <span class="greed" v-if="item.isPrintTwo == '1'"></span>
                 <span class="CCC" v-if="item.isPrintTwo == '0'"></span>
               </el-form-item>
-              <el-form-item
+              <!-- <el-form-item
                 label="是否需归还"
                 label-width="120px"
                 prop="isReturns"
@@ -509,12 +511,11 @@
                   active-color="#13ce66"
                   inactive-color="#ccc"
                   active-value="1"
-                  inactive-value="0"
                 >
                 </el-switch>
                 <span class="greed" v-if="item.isReturn == '1'"></span>
                 <span class="CCC" v-if="item.isReturn == '0'"></span>
-              </el-form-item>
+              </el-form-item> -->
             </el-form>
           </div>
           <el-form-item style="margin-left: 20px" prop="name">
@@ -591,7 +592,7 @@
         ref="form1"
         :model="form1"
         :inline="true"
-        :rules="rules"
+        :rules="ruless"
         label-width="120px"
         style="margin-left: 37px"
       >
@@ -617,10 +618,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="归还时间" prop="returnTime" class="box1">
-          <el-date-picker v-model="form.returnTime" type="date" placeholder="选择日期">
+        <!-- <el-form-item label="归还时间" prop="returnTime" class="box1">
+          <el-date-picker v-model="form1.returnTime" type="date" placeholder="选择日期">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <div class="jiben">打印说明</div>
         <el-form-item label prop="explainInfo">
           <el-input
@@ -643,7 +644,7 @@
           <el-option label="请选择字典生成" value />
         </el-select>-->
           </el-form-item>
-          <el-form-item prop="size" style="margin-right: 23px;">
+          <el-form-item prop="size" style="margin-right: 23px">
             <el-input
               class="forEach"
               disabled
@@ -651,7 +652,7 @@
               placeholder="请输入文件大小"
             />
           </el-form-item>
-          <el-form-item prop="levelM" style="margin-right: 23px;">
+          <el-form-item prop="levelM" style="margin-right: 23px">
             <el-select
               v-model="form1.levelM"
               clearable
@@ -666,7 +667,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="printNumber" >
+          <el-form-item prop="printNumber">
             <el-input
               class="forEach"
               v-model="form1.printNumber"
@@ -703,6 +704,7 @@
             label="是否为双面打"
             label-width="120px"
             prop="isPrintTwo"
+            style="margin-right: 200px"
           >
             <!-- <el-radio-group
               v-model="item.isPrintTwo"
@@ -723,7 +725,7 @@
             <span class="greed" v-if="form1.isPrintTwo == '1'"></span>
             <span class="CCC" v-if="form1.isPrintTwo == '0'"></span>
           </el-form-item>
-          <el-form-item label="是否需归还" label-width="120px" prop="isReturns">
+          <!-- <el-form-item label="是否需归还" label-width="120px" prop="isReturns">
             <el-switch
               v-model="form1.isReturn"
               active-color="#13ce66"
@@ -734,7 +736,7 @@
             </el-switch>
             <span class="greed" v-if="form1.isReturn == 1"></span>
             <span class="CCC" v-if="form1.isReturn == 0"></span>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item prop="name">
             <!-- <fileUpload v-model="form.file" /> -->
             <el-upload
@@ -794,7 +796,15 @@
             placeholder="请输入打印份数"
           />
         </el-form-item>
-        <el-form-item label="是否需要归还" prop="isReturn">
+        <el-form-item label="归还时间" prop="returnTime">
+          <el-date-picker
+            v-model="dyform.returnTime"
+            type="date"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="是否需要归还" prop="isReturn">
           <el-radio-group
             v-model="dyform.isReturn"
             style="width: 200px"
@@ -804,7 +814,7 @@
             <el-radio label="1">归还</el-radio>
             <el-radio label="0">无需归还</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="是否为彩打" prop="isPrintColor">
           <el-radio-group v-model="dyform.isPrintColor" style="width:200px;" size="mini">
             <el-radio label="1">是</el-radio>
@@ -835,8 +845,7 @@
         </el-form-item>
         <div class="jiben jiben2">打印说明</div>
         <div
-          style="
-            width: 98.5%;
+          style="width: 98.5%;
             height: 45px;
             font-size: 14px;
             line-height: 45px;
@@ -1112,9 +1121,6 @@ export default {
         sendName: [
           { required: true, message: "发送人不能为空", trigger: "change" },
         ],
-        isReturn: [
-          { required: true, message: "是否归还需要选择", trigger: "change" },
-        ],
         printName: [
           { required: true, message: "打印文件不能为空", trigger: "change" },
         ],
@@ -1125,6 +1131,7 @@ export default {
           { required: true, message: "归还时间不能为空", trigger: "change" },
         ]
       },
+      ruless: {},
       //级别
       levelMs: [],
       //文印室
@@ -1403,6 +1410,7 @@ export default {
     updatesubmit() {
       this.$refs["form1"].validate((valid) => {
         if (valid) {
+          this.form1.isReturn = 1;
           updateManage(this.form1).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open1 = false;
@@ -1426,6 +1434,7 @@ export default {
             var num = 0;
             var num1 = this.tomList.length;
             for (let index = 0; index < this.tomList.length; index++) {
+              this.tomList[index].isReturn = 1;
               if (
                 this.tomList[index].levelM &&
                 this.tomList[index].printNumber
@@ -1435,6 +1444,7 @@ export default {
                 return this.$modal.msgWarning("请选择级别,份数");
               }
             }
+            this.form.printsManageList = this.tomList;
             // this.tomList.forEach((item,i)=>{
             //   if(item.levelM){
             //     num+=1

src/views/access/accessControl/index.vue

@@ -14,7 +14,6 @@
           v-model="queryParams.starttime"
           type="datetime"
           placeholder="请选择开始时间"
-          @change="handleQuery"
           value-format="yyyy-MM-dd HH:mm:ss"
         >
         </el-date-picker>
@@ -26,12 +25,18 @@
           v-model="queryParams.endtime"
           type="datetime"
           placeholder="请选择结束时间"
-          @change="handleQuery"
           value-format="yyyy-MM-dd HH:mm:ss"
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item prop="ename">
+        <el-input
+          v-model="queryParams.ename"
+          placeholder="请输入名字"
+        ></el-input>
+      </el-form-item>
       <el-form-item>
+        <el-button size="btr" @click="handleQuery">搜索</el-button>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -89,19 +94,20 @@
         </template>
       </el-table-column> -->
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getToat" />
   </div>
 </template>
 
 <script>
 import axios from "axios";
-import { listBarracks } from "@/api/access/accessControl";
+import { listBarracks, attendancerecordList } from "@/api/access/accessControl";
 export default {
   name: "access",
   data() {
     return {
       // 查询参数
       queryParams: {
-        number: 10,
         pageNum: 1,
         pageSize: 10,
       },
@@ -112,12 +118,20 @@ export default {
       loading: false,
       // 总条数
       total: 0,
+      forms: {},
     };
   },
   created() {
-    this.getTiem();
+    this.getTiem()
   },
   methods: {
+    getToat(){
+      if(this.queryParams.starttime&&this.queryParams.endtime){
+        this.getList(this.queryParams.starttime,this.queryParams.endtime,this.queryParams.ename);
+      }else{
+        this.getTiem()
+      }
+    },
     // 导出操作
     handleDao() {
       if (this.queryParams.starttime && this.queryParams.endtime) {
@@ -147,35 +161,52 @@ export default {
         new Date(firstDay).toISOString().slice(0, 10) + " " + "00:00:00";
       var endtimes =
         new Date(lastDay).toISOString().slice(0, 10) + " " + "23:50:00";
-      // console.log(starttimes, endtimes);
-      this.getList(starttimes, endtimes);
+        this.getList(starttimes,endtimes);
     },
+
     handleQuery() {
-      this.getList(this.queryParams.starttime, this.queryParams.endtime);
+      if(this.queryParams.starttime&&this.queryParams.endtime){
+        this.getList(this.queryParams.starttime,this.queryParams.endtime,this.queryParams.ename);
+      }
     },
     // 重置
     resetQuery() {
-      this.getTiem();
+      this.queryParams.pageNum = 0;
+      this.queryParams.pageSize = 10;
       this.queryParams.starttime = "";
       this.queryParams.endtime = "";
+      this.queryParams.ename = "";
+      this.getTiem();
     },
-    getList(starttime, endtime, number) {
+    getList(starttimes,endtimes,name,) {
       this.loading = true;
-      axios
-        .post(
-          "http://192.168.5.188:85/api/v2/transaction/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
-          {
-            starttime,
-            endtime,
-          }
-        )
-        .then((res) => {
-          this.loading = false;
-          if (res.data.ret != 174) {
-            this.bdglevenList = res.data.data.items;
-            this.total = res.data.data.items.length;
-          }
-        });
+      var formes = {};
+      formes.starttime=starttimes;
+      formes.endtime= endtimes;
+      formes.ename= name;
+      formes.pageNum= this.queryParams.pageNum;
+      formes.pageSize= this.queryParams.pageSize;
+      console.log(formes);
+      attendancerecordList(formes).then((res) => {
+        this.loading = false;
+        this.bdglevenList = res.rows;
+        this.total=res.total
+      });
+      // axios
+      //   .post(
+      //     "http://192.168.5.188:85/api/v2/transaction/get/?key=2633p84hnnlavzcy9afjcbtj1jdnega0ftscjkka6h7a",
+      //     {
+      //       starttime,
+      //       endtime,
+      //     }
+      //   )
+      //   .then((res) => {
+      //     this.loading = false;
+      //     if (res.data.ret != 174) {
+      //       this.bdglevenList = res.data.data.items;
+      //       this.total = res.data.data.items.length;
+      //     }
+      //   });
     },
   },
 };

src/views/pt.vue

@@ -575,6 +575,27 @@
         <button @click="quchulifun4">去处理</button>
       </div>
     </div>
+    <!-- 提示打印 -->
+    <div class="tkbox4" v-if="open6">
+      <div class="tkbox-title">
+        <div class="tkbox-title-left">
+          <img src="../assets/images/八一.png" alt />
+          <span>重要消息</span>
+        </div>
+        <div class="tkbox-title-right">
+          <img src="../assets/images/关闭.png" alt @click="showfun5" />
+        </div>
+      </div>
+      <div class="tkbox-main">
+        <p>
+          <img src="../assets/images/警示.png" alt />
+          <span>{{ opentitel }}</span>
+        </p>
+      </div>
+      <div class="tkbox-footer">
+        <button @click="quchulifun5">去处理</button>
+      </div>
+    </div>
     <!-- 添加或修改集中文印记录对话框 -->
     <!-- <el-dialog :title="title" style="margin-top: 200px;" :visible.sync="open5" width="565px" append-to-body>
       <el-form ref="form" :model="form" :inline="true" :rules="rules" label-width="120px">
@@ -714,130 +735,6 @@
         <button @click="cancel">取 消</button>
       </div>
     </el-dialog>
-    <!-- 提示打印 -->
-    <el-dialog
-    title="查看通知公告"
-    :visible.sync="open5"
-    width="800px"
-    append-to-body
-  >
-    <div class="jiben">基本信息</div>
-    <el-form ref="form" :model="form" :rules="rules" :inline="true">
-      <el-row>
-        <el-col :span="12">
-          <p
-            style="
-              width: 100%;
-              height: 30px;
-              line-height: 30px;
-              color: #fff;
-              fontsize: 16px;
-            "
-            v-if="!ggflg"
-          >
-            公告标题:<span style="margin-left: 10px; fontsize: 14px">{{
-              form.noticeTitle
-            }}</span>
-          </p>
-          <el-form-item label="公告标题" v-if="ggflg" prop="noticeTitle">
-            <el-input
-              v-model="form.noticeTitle"
-              placeholder="请输入公告标题"
-            />
-          </el-form-item>
-          <!-- <el-form-item label="公告标题" prop="noticeTitle">
-            <el-input
-
-              v-model="form.noticeTitle"
-              placeholder="请输入公告标题"
-              style="width: 300px"
-            />
-          </el-form-item> -->
-        </el-col>
-        <el-col :span="12" v-if="ggflg">
-          <el-form-item label="公告类型" prop="noticeType">
-            <el-select v-model="form.noticeType" placeholder="请选择">
-              <el-option
-                v-for="dict in dict.type.sys_notice_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col
-          :span="24"
-          style="margin-top: 15px; margin-bottom: 10px"
-          v-if="ggflg"
-        >
-          <el-form-item label="状态">
-            <el-radio-group v-model="form.status">
-              <el-radio
-                v-for="dict in dict.type.sys_notice_status"
-                :key="dict.value"
-                :label="dict.value"
-                style="margin-right: 20px"
-                >{{ dict.label }}</el-radio
-              >
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row style="margin-top: 10px">
-        <el-col :span="12" v-if="!ggflg">
-          <el-form-item label="发布人" prop="createBy" label-width="0">
-            <el-input
-              v-model="form.createBy"
-              disabled
-              placeholder="请输入发布人"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="!ggflg">
-          <el-form-item label="附件" label-width="0px" prop="filename">
-            <a
-              :href="url + form.filename"
-              target="_blank"
-              download
-              style="
-                display: inline-block;
-                width: 90px;
-                height: 30px;
-                background-color: #409eff;
-                border: none;
-                border-radus: 3px;
-                color: #fff;
-                line-height: 30px;
-                text-align: center;
-              "
-              >下载附件</a
-            >
-            <!-- <fileUpload v-model="form.filename" class="m-l-20" /> -->
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="jiben">内容</div>
-      <el-col :span="24">
-        <el-form-item
-          label
-          prop="remark"
-          class="textareas"
-          style="width: 100%"
-        >
-          <el-input
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-      </el-col>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <button class="button1" v-if="ggflg" @click="submitForm">确 定</button>
-      <button @click="cancel">取 消</button>
-    </div>
-  </el-dialog>
   </div>
 </template>
 <script>
@@ -856,7 +753,7 @@ import {
   getWorkTask,
   getNone,
   noReminder,
-  remindPrint
+  remindPrint,
 } from "@/api/pt";
 import { getUserProfile } from "@/api/system/user";
 import Cookies from "js-cookie";
@@ -903,6 +800,9 @@ export default {
       yuStatus: false,
       yuStatus1: false,
       yuStatus2: false,
+      // 提示打印
+      open6: false,
+      opentitel: null,
     };
   },
   created() {
@@ -912,7 +812,7 @@ export default {
     this.timer2 = null;
     this.startTime2();
     this.xianShang();
-    this.getTiXing()
+    this.getTiXing();
     getNone().then((res) => {
       this.str = res.msg;
     });
@@ -937,10 +837,20 @@ export default {
   },
   methods: {
     // 获取提示信息
-    getTiXing(){
-      remindPrint().then(res=>{
+    getTiXing() {
+      remindPrint().then((res) => {
         console.log(res);
-      })
+        this.opentitel = res.msg;
+        var tarr = Cookies.get("tixing");
+        if (res.num == 0) {
+          if (tarr) {
+            this.open6 = false;
+          } else {
+            this.open6 = true;
+            Cookies.set("tixing", "true");
+          }
+        }
+      });
     },
     // 退出
     async logout() {
@@ -952,6 +862,7 @@ export default {
         .then(() => {
           this.$store.dispatch("LogOut").then(() => {
             location.href = "/index";
+            Cookies.remove("tixing");
           });
         })
         .catch(() => {});
@@ -1169,6 +1080,11 @@ export default {
       this.open4 = false;
       printTriggerClear().then((res) => {});
     },
+    showfun5() {
+      this.open6 = false;
+      printTriggerClear().then((res) => {});
+    },
+
     quchulifun() {
       printTriggerClear().then((res) => {
         if (res.code == 200) {
@@ -1201,6 +1117,14 @@ export default {
         }
       });
     },
+    quchulifun5() {
+      Cookies.set("tixing", "false");
+      printTriggerClear().then((res) => {
+        if (res.code == 200) {
+          window.open(`/#/print/printlog`, "_self");
+        }
+      });
+    },
     startTime2() {
       this.timer = setInterval(() => {
         // printTrigger().then((res) => {
@@ -1834,7 +1758,7 @@ hr {
   background-size: 100% 100%;
   background-repeat: no-repeat;
   position: absolute;
-  right: 26%;
+  right: 42%;
   top: 38%;
 }