From 61747a14819075bf6da2c1597b6c22e22e026686 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 15 四月 2024 14:25:11 +0800
Subject: [PATCH] 4-15修改提交

---
 src/webapp/api/init.json                                         |   12 
 src/webapp/api/init1.json                                        |    6 
 src/main/java/com/flow/service/impl/ZongInvoiceServiceImpl.java  |   46 
 src/webapp/page/Fuwuqi.jsp                                       |  254 -
 src/main/java/com/flow/pojo/Card.java                            |   14 
 src/webapp/images/download.png                                   |    0 
 src/webapp/page/setting.jsp                                      |   21 
 src/webapp/page/XinXi.jsp                                        |    2 
 src/main/java/com/flow/mapper/CardMapper.java                    |   48 
 src/main/java/com/flow/mapper/LoginJiLuMapper.java               |    8 
 src/main/java/com/flow/service/OperationLogService.java          |   17 
 src/webapp/page/loginJiLu.jsp                                    |   21 
 src/webapp/api/init2.json                                        |   33 
 src/main/java/com/flow/service/impl/OperationLogServiceImpl.java |   39 
 src/webapp/page/OperationLog.jsp                                 |  133 +
 src/main/java/com/flow/pojo/Manager.java                         |   27 
 src/main/resources/spring-servlet.xml                            |   31 
 src/main/java/com/flow/service/impl/LoginJiLuServiceImpl.java    |    5 
 src/webapp/page/Duanxinlog.jsp                                   |   84 
 src/main/java/com/flow/service/impl/CardServiceImpl.java         |   77 
 src/main/java/com/flow/mapper/OperationLogMapper.java            |   14 
 src/main/java/com/flow/service/impl/ChongZhiServiceImpl.java     |   19 
 src/main/java/com/flow/pojo/Chongzhi.java                        |   10 
 src/main/java/com/flow/service/zongInvoicesService.java          |    8 
 src/main/java/com/flow/service/impl/CompanyServiceImpl.java      |   97 
 src/main/java/com/flow/service/ManagerService.java               |   23 
 src/main/java/com/flow/controller/IndexController.java           |   72 
 src/main/java/com/flow/controller/ChongZhiController.java        |    5 
 src/main/java/com/flow/service/LoginJiLuService.java             |    2 
 src/main/java/com/flow/controller/TbFuwuqiController.java        |   31 
 src/main/java/com/flow/service/impl/InvoicesServiceImpl.java     |    2 
 src/webapp/page/KaiPiao.jsp                                      |   25 
 src/webapp/page/index1.jsp                                       | 1350 ++++++++-----
 src/main/java/com/flow/mapper/CompanyMapper.java                 |    4 
 src/main/java/com/flow/pojo/Company.java                         |   30 
 src/main/java/com/flow/quartz/MyJob2.java                        |   36 
 pom.xml                                                          |   12 
 src/webapp/page/KaiPiaoJiLu.jsp                                  |  477 ++++
 src/main/java/com/flow/service/TbFuwuqiService.java              |    2 
 src/main/java/com/flow/service/impl/DuanxinlogServiceImpl.java   |    6 
 src/main/java/com/flow/quartz/MyJob3.java                        |   38 
 src/main/java/com/flow/service/DuanxinlogService.java            |    2 
 src/webapp/api/init3.json                                        |   93 
 src/webapp/page/Gongs.jsp                                        |  239 +
 src/main/java/com/flow/service/impl/ManagerServiceImpl.java      |  116 +
 src/main/java/com/flow/controller/orderController.java           |  119 +
 src/main/java/com/flow/controller/ManagerController.java         |   90 
 src/main/java/com/flow/controller/LoginController.java           |   18 
 src/main/java/com/flow/controller/PayController.java             |   23 
 src/webapp/page/index.jsp                                        |   38 
 src/main/java/com/flow/service/ChongZhiService.java              |    2 
 src/main/java/com/flow/service/impl/JieMiServiceImpl.java        |   14 
 src/webapp/page/manager.jsp                                      |  895 +++++++++
 src/main/java/com/flow/service/CompanyService.java               |    2 
 src/webapp/page/ChongZhi.jsp                                     |  282 ++
 src/main/java/com/flow/pojo/TbFuwuqi.java                        |   13 
 src/main/java/com/flow/service/CardService.java                  |    6 
 src/main/java/com/flow/controller/InvoicesController.java        |    4 
 src/main/java/com/flow/mapper/ManagerMapper.java                 |   18 
 src/main/java/com/flow/controller/DuanxinlogController.java      |   71 
 src/main/java/com/flow/controller/ZongInvoicesController.java    |  230 ++
 src/main/java/com/flow/pojo/OperationLog.java                    |   25 
 src/main/java/com/flow/pojo/Zonginvoices.java                    |   10 
 src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java     |   26 
 src/webapp/page/Login.jsp                                        |   74 
 src/webapp/WEB-INF/web.xml                                       |    1 
 src/main/java/com/flow/controller/OperationLogController.java    |   32 
 67 files changed, 4,537 insertions(+), 1,047 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9b05546..8483b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,6 +297,18 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.83</version>
         </dependency>
+        <!-- 鏂囨。涓婁紶渚濊禆 -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.3</version>
+        </dependency>
 
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/flow/controller/ChongZhiController.java b/src/main/java/com/flow/controller/ChongZhiController.java
index c40b4ca..443a0e9 100644
--- a/src/main/java/com/flow/controller/ChongZhiController.java
+++ b/src/main/java/com/flow/controller/ChongZhiController.java
@@ -58,6 +58,11 @@
         return p;
     }
 
+    @PostMapping({"DeleteChongZhi"})
+    public int DeleteChongZhi(String chongZhiId) {
+        return this.chongZhiService.DeleteChongZhi(chongZhiId);
+    }
+
     @PostMapping({"findChongZhiJine"})
     public String findChongZhiJine() {
         return this.chongZhiService.findChongZhiJine();
diff --git a/src/main/java/com/flow/controller/DuanxinlogController.java b/src/main/java/com/flow/controller/DuanxinlogController.java
index 3ad3679..d38e39e 100644
--- a/src/main/java/com/flow/controller/DuanxinlogController.java
+++ b/src/main/java/com/flow/controller/DuanxinlogController.java
@@ -1,14 +1,8 @@
 package com.flow.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.flow.mapper.CardMapper;
-import com.flow.mapper.CompanyMapper;
-import com.flow.mapper.DuanxinlogMapper;
-import com.flow.mapper.TbFuwuqiMapper;
-import com.flow.pojo.Card;
-import com.flow.pojo.Company;
-import com.flow.pojo.Duanxinlog;
-import com.flow.pojo.TbFuwuqi;
+import com.flow.mapper.*;
+import com.flow.pojo.*;
 import com.flow.service.DuanxinlogService;
 import com.flow.service.TbFuwuqiService;
 import com.flow.util.DESUtil;
@@ -25,8 +19,10 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -55,10 +51,20 @@
     @Autowired
     CompanyMapper companyMapper;
 
+    @Autowired
+    ManagerMapper managerMapper;
     @GetMapping({"findDuanxinlog"})
     result<List<Duanxinlog>> findDuanxinlog(Integer page, Integer limit) {
         PageInfo<Duanxinlog> cz = this.duanxinlogService.FindDuanxinlog(page, limit);
         return resultutil.returnSuccess(cz.getTotal(), cz.getList());
+    }
+    @PostMapping({"DeleteDuanxinlog"})
+    public ModelAndView DeleteManager(String num) {
+        this.duanxinlogService.DeleteDuanxinlog(num);
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("/page/Duanxinlog.jsp");
+        return modelAndView;
+
     }
 
     /*
@@ -117,6 +123,27 @@
                     SendSmsRequest req = new SendSmsRequest();
 //                    String[] phoneNumberSet1 = {"18701153496"};
                     String[] phoneNumberSet1 = {DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key)};
+                    QueryWrapper sms = new QueryWrapper();
+                    sms.eq("none", "0");
+                    sms.eq("smsreception", "1");
+                    List<Manager> managerList = (managerMapper).selectList(sms);
+                    for (int s=0;s<managerList.size();s++){
+//                        System.out.println(managerList.get(s).getPhone());
+//                        phoneNumberSet1[s] = managerList.get(s).getPhone();
+                        String[] phoneNumberSet12  = {managerList.get(s).getPhone()};
+                        System.out.println(phoneNumberSet12);
+                        req.setPhoneNumberSet(phoneNumberSet12);
+
+                        req.setSmsSdkAppId("1400838975");
+                        req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+                        req.setTemplateId("2100321");
+
+//                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+                        String[] templateParamSet1 = {String.valueOf("鎮ㄦ湁娴侀噺鍗″皢浜庯細"  + fuwuqiList.get(i).getEnddate()+"鍒版湡锛�")};
+                        req.setTemplateParamSet(templateParamSet1);
+                        // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+                        SendSmsResponse resp = client.SendSms(req);
+                    }
                     req.setPhoneNumberSet(phoneNumberSet1);
 
                     req.setSmsSdkAppId("1400838975");
@@ -157,8 +184,8 @@
      */
 //    @EnableScheduling
 //    @Scheduled(cron = "*/10 * * * * ?")//娴嬭瘯10绉掓墽琛屼竴娆�
-//    @Scheduled(cron = "0 0 16 * * ?")
-    @Scheduled(cron = "0 0 */1 * * ?")//涓�灏忔椂鎵ц涓�娆�
+    @Scheduled(cron = "0 49 10 * * ?")
+//    @Scheduled(cron = "0 0 */1 * * ?")//涓�灏忔椂鎵ц涓�娆�
     public void sms() throws Exception {
         System.out.println("鐭俊瀹氭椂鍣ㄦ墽琛�============銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��");
         //鏌ヨ鏁版嵁搴撲腑鎵�鏈夌殑寮曟搸鏁版嵁
@@ -208,6 +235,29 @@
 //                        String[] phoneNumberSet1 = {cardList.get(i).getCardnumber()};
                     String[] phoneNumberSet1 = {DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key)};
 //                    String[] phoneNumberSet1 = {"18701153496"};
+                    QueryWrapper sms = new QueryWrapper();
+                    sms.eq("none", "0");
+                    sms.eq("smsreception", "1");
+                    List<Manager> managerList = (managerMapper).selectList(sms);
+                    for (int s=0;s<managerList.size();s++){
+//                        System.out.println(managerList.get(s).getPhone());
+//                        phoneNumberSet1[s] = managerList.get(s).getPhone();
+                        String[] phoneNumberSet12  = {managerList.get(s).getPhone()};
+                        System.out.println(phoneNumberSet12);
+                        req.setPhoneNumberSet(phoneNumberSet12);
+
+                        req.setSmsSdkAppId("1400838975");
+                        req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+                        req.setTemplateId("2100321");
+
+//                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+                        String[] templateParamSet1 = {String.valueOf("鎮ㄦ湁娴侀噺鍗″皢浜庯細"  + cardList.get(i).getEnddate()+"鍒版湡锛�")};
+                        req.setTemplateParamSet(templateParamSet1);
+                        // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+                        SendSmsResponse resp = client.SendSms(req);
+                    }
+//                    phoneNumberSet1[managerList.size()] = DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key);
+//                    System.out.println(phoneNumberSet1);
                     req.setPhoneNumberSet(phoneNumberSet1);
 
                     req.setSmsSdkAppId("1400838975");
@@ -219,6 +269,7 @@
                     req.setTemplateParamSet(templateParamSet1);
                     // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
                     SendSmsResponse resp = client.SendSms(req);
+                    System.out.println(SendSmsResponse.toJsonString(resp));
                     // 杈撳嚭json鏍煎紡鐨勫瓧绗︿覆鍥炲寘
                     Duanxinlog duanxinlog = new Duanxinlog();
                     duanxinlog.setIdentification(cardList.get(i).getCardnumber());
diff --git a/src/main/java/com/flow/controller/IndexController.java b/src/main/java/com/flow/controller/IndexController.java
index 27c254f..03e3ba8 100644
--- a/src/main/java/com/flow/controller/IndexController.java
+++ b/src/main/java/com/flow/controller/IndexController.java
@@ -8,10 +8,15 @@
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.flow.mapper.CardMapper;
+import com.flow.mapper.OperationLogMapper;
 import com.flow.pojo.Card;
+import com.flow.pojo.OperationLog;
 import com.flow.pojo.TbFuwuqi;
 import com.flow.service.CardService;
 import com.flow.service.CompanyService;
+import com.flow.service.OperationLogService;
 import com.flow.util.result;
 import com.flow.util.resultutil;
 import com.github.pagehelper.PageInfo;
@@ -29,6 +34,7 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,6 +48,12 @@
     CardService cardService;
     @Autowired
     CompanyService companyService;
+
+    @Autowired
+    CardMapper cardMapper;
+
+    @Autowired
+    OperationLogMapper operationLogMapper;
 
     public IndexController() {
     }
@@ -60,9 +72,9 @@
 
         for (int i = 0; i < cz.getSize(); ++i) {
             if (((Card) cz.getList().get(i)).getCompany() != null) {
-                ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
-                ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
-                ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getZflow() - ((Card) cz.getList().get(i)).getSyflow());
+//                ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
+//                ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
+//                ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getZflow() - ((Card) cz.getList().get(i)).getSyflow());
 
                 if (((Card) cz.getList().get(i)).getBindid() == null || ((Card) cz.getList().get(i)).getBindid().equals("undefined")) {
                     ((Card) cz.getList().get(i)).setBindid("鏈煡");
@@ -108,15 +120,15 @@
         return this.companyService.chaZi(Zong);
     }
 
-    @GetMapping({"FindCardZi"})
-    public result<List<Card>> FindCardZi(String Zong, Integer page, Integer limit) throws Exception {
-        PageInfo<Card> cz = this.cardService.FindCardaZi(Zong, page, limit);
+    @PostMapping({"FindCardZi"})
+    public result<List<Card>> FindCardZi(Card card, Integer page, Integer limit) throws Exception {
+        PageInfo<Card> cz = this.cardService.FindCardaZi(card, page, limit);
 
         for (int i = 0; i < cz.getSize(); ++i) {
             if (((Card) cz.getList().get(i)).getCompany() != null) {
-                ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
-                ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
-                ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getZflow() - ((Card) cz.getList().get(i)).getSyflow());
+//                ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
+//                ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
+//                ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getZflow() - ((Card) cz.getList().get(i)).getSyflow());
                 SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
                 Date date = new Date();
                 if (cz.getList().get(i).getEnddate() != null) {
@@ -140,8 +152,9 @@
     }
 
     @PostMapping({"DeleteCard"})
-    public int DeleteCard(String num) {
-        return this.cardService.DeleteCard(num);
+    public int DeleteCard(String num ,String caozuoname) {
+
+        return this.cardService.DeleteCard(num,caozuoname);
     }
 
     @PostMapping({"Update"})
@@ -155,6 +168,34 @@
     @PostMapping({"UpdateChong"})
     public ModelAndView UpdateChong(Card card) {
         this.cardService.UpdateCardChong(card);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("cardnumber", card.getCardnumber());
+        Card tbFuwuqi1 = cardMapper.selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("淇敼");
+        operationLog.setCaozuocontent("淇敼鍗″彿锛�"+tbFuwuqi1.getCardnumber());
+//        operationLogMapper.addOperationLog(operationLog);
+        operationLog.setCaozuoname(card.getCaozuoname());
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        operationLog.setCaozuodate(formatter.format(date));
+        operationLogMapper.insert(operationLog);
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("/page/index1.jsp");
+        modelAndView.addObject("operatornum", 2);
+        return modelAndView;
+    }
+    @PostMapping({"updateBatchById"})
+    @Transactional(rollbackFor = Exception.class)
+    public ModelAndView updateBatchById(Card card) {
+        this.cardService.updateBatchById(card);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("淇敼");
+        operationLog.setCaozuocontent("淇敼鍗″彿锛�"+card.getCardnumber());
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        operationLog.setCaozuodate(formatter.format(date));
+        operationLogMapper.insert(operationLog);
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setViewName("/page/index1.jsp");
         modelAndView.addObject("operatornum", 2);
@@ -231,9 +272,12 @@
         PageInfo<Card> cz = this.cardService.tableSearch(card, page, limit);
 
         for (int i = 0; i < cz.getSize(); ++i) {
-            ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
-            ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
-            ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getSyll() / 1024);
+            if (((Card) cz.getList().get(i)).getCompany().equals("鍗庢槦鏅烘帶")){
+                ((Card) cz.getList().get(i)).setCompany("鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙�");
+            }
+//            ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
+//            ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
+//            ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getSyll() / 1024);
             SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
             Date date = new Date();
             if (cz.getList().get(i).getEnddate() != null) {
diff --git a/src/main/java/com/flow/controller/InvoicesController.java b/src/main/java/com/flow/controller/InvoicesController.java
index ae6f6a0..f2c1abd 100644
--- a/src/main/java/com/flow/controller/InvoicesController.java
+++ b/src/main/java/com/flow/controller/InvoicesController.java
@@ -26,12 +26,12 @@
     public InvoicesController() {
     }
 
-    @GetMapping({"Invoices"})
+    @PostMapping({"Invoices"})
     public Invoices findInvoices(Invoices invoices) throws Exception {
         return this.invoicesSevice.findInvoices(invoices);
     }
 
-    @GetMapping({"Invoicess"})
+    @PostMapping({"Invoicess"})
     public Company findInvoicess(Invoices invoices) throws Exception {
         return this.companyService.findC(invoices.getCompany());
     }
diff --git a/src/main/java/com/flow/controller/LoginController.java b/src/main/java/com/flow/controller/LoginController.java
index d1bf674..27e0a52 100644
--- a/src/main/java/com/flow/controller/LoginController.java
+++ b/src/main/java/com/flow/controller/LoginController.java
@@ -21,12 +21,14 @@
 import com.tencentcloudapi.sms.v20210111.SmsClient;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Random;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -52,19 +54,19 @@
     public result<List<Loginjilu>> FindCard(Integer page, Integer limit) throws Exception {
         PageInfo<Loginjilu> cz = this.loginJiLuService.FindLoginJiLu(page, limit);
 
-        for(int i = 0; i < cz.getSize(); ++i) {
-            ((Loginjilu)cz.getList().get(i)).setLoginphone(DESUtil.decrypt(((Loginjilu)cz.getList().get(i)).getLoginphone(), DESUtil.key));
+        for (int i = 0; i < cz.getSize(); ++i) {
+            ((Loginjilu) cz.getList().get(i)).setLoginphone(DESUtil.decrypt(((Loginjilu) cz.getList().get(i)).getLoginphone(), DESUtil.key));
         }
 
         return resultutil.returnSuccess(cz.getTotal(), cz.getList());
     }
 
-    @GetMapping({"FindLoginJiLuZi"})
-    public result<List<Loginjilu>> FindCardZi(String Zong, Integer page, Integer limit) throws Exception {
-        PageInfo<Loginjilu> cz = this.loginJiLuService.FindLoginJiLuZi(Zong, page, limit);
+    @PostMapping({"FindLoginJiLuZi"})
+    public result<List<Loginjilu>> FindCardZi(Loginjilu loginjilu, Integer page, Integer limit) throws Exception {
+        PageInfo<Loginjilu> cz = this.loginJiLuService.FindLoginJiLuZi(loginjilu, page, limit);
 
-        for(int i = 0; i < cz.getSize(); ++i) {
-            ((Loginjilu)cz.getList().get(i)).setLoginphone(DESUtil.decrypt(((Loginjilu)cz.getList().get(i)).getLoginphone(), DESUtil.key));
+        for (int i = 0; i < cz.getSize(); ++i) {
+            ((Loginjilu) cz.getList().get(i)).setLoginphone(DESUtil.decrypt(((Loginjilu) cz.getList().get(i)).getLoginphone(), DESUtil.key));
         }
 
         return resultutil.returnSuccess(cz.getTotal(), cz.getList());
@@ -75,7 +77,7 @@
     public Company Login(Company company, HttpSession session) throws Exception {
         company.setCompanyabbname(company.getCompanyabbname());
         company.setLoginphone(DESUtil.encrypt(company.getLoginphone(), DESUtil.key));
-        if (company.getPassword()!=null){
+        if (company.getPassword() != null) {
             company.setPassword(DESUtil.encrypt(company.getPassword(), DESUtil.key));
         }
         Company company1 = this.companyService.findUser(company);
diff --git a/src/main/java/com/flow/controller/ManagerController.java b/src/main/java/com/flow/controller/ManagerController.java
new file mode 100644
index 0000000..f2793df
--- /dev/null
+++ b/src/main/java/com/flow/controller/ManagerController.java
@@ -0,0 +1,90 @@
+package com.flow.controller;
+
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.Manager;
+import com.flow.pojo.TbFuwuqi;
+import com.flow.service.ManagerService;
+import com.flow.util.result;
+import com.flow.util.resultutil;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping({"/hxzk"})
+public class ManagerController {
+
+    @Autowired
+    ManagerService managerService;
+
+    @GetMapping({"findManager"})
+    result<List<Manager>> findManager(Integer page, Integer limit) {
+        PageInfo<Manager> cz = this.managerService.FindManager(page, limit);
+        return resultutil.returnSuccess(cz.getTotal(), cz.getList());
+    }
+
+    @PostMapping({"addManager"})
+    public ModelAndView addManager(Manager manager) throws Exception {
+        ModelAndView modelAndView = new ModelAndView();
+        manager.setId(null);
+        this.managerService.addManager(manager);
+//        modelAndView.addObject("suoshu", this.managerService.findSuoShu());
+        modelAndView.setViewName("/page/manager.jsp");
+        return modelAndView;
+    }
+
+    @PostMapping({"UpdateManager"})
+    public ModelAndView UpdateManager(Manager manager) {
+        this.managerService.UpdateManager(manager);
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("/page/manager.jsp");
+        return modelAndView;
+    }
+
+    @PostMapping({"DeleteManager"})
+    public ModelAndView DeleteManager(String num,String caozuoname) {
+        this.managerService.DeleteManager(num,caozuoname);
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("/page/manager.jsp");
+        return modelAndView;
+
+    }
+
+    @PostMapping({"ManagerSearch"})
+    public result<List<Manager>> tableSearch(Manager manager, int page, int limit) throws Exception {
+        PageInfo<Manager> cz = this.managerService.tableSearch(manager, page, limit);
+//        for(int i = 0; i < cz.getSize(); ++i) {
+//            if (((Manager)cz.getList().get(i)).getCompany() != null) {
+//                SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
+//                Date date = new Date();
+//                Date endDay = date2.parse(cz.getList().get(i).getEnddate());//缁撴潫鏃堕棿
+//                Long starTime = date.getTime();
+//                Long endTime = endDay.getTime();
+//                Long num11 = endTime - starTime;//鏃堕棿鎴�
+//
+////                if ((num11/24/60/60/1000)<0){
+////                    ((Manager)cz.getList().get(i)).setRemainingdays("0澶�");
+////                }else{
+////                    ((Manager)cz.getList().get(i)).setRemainingdays(+num11/24/60/60/1000+"澶�");
+////                }
+////                this.cardService.UpdateCard((Card)cz.getList().get(i));
+////                this.cardService.UpdateCard((Card)cz.getList().get(i));
+//            }
+//        }
+        return resultutil.returnSuccess(cz.getTotal(), cz.getList());
+    }
+
+    @PostMapping({"ifManager"})
+    public List<Manager> ifManager(Manager manager) {
+        return this.managerService.ifManager(manager);
+    }
+
+}
diff --git a/src/main/java/com/flow/controller/OperationLogController.java b/src/main/java/com/flow/controller/OperationLogController.java
new file mode 100644
index 0000000..a1a7582
--- /dev/null
+++ b/src/main/java/com/flow/controller/OperationLogController.java
@@ -0,0 +1,32 @@
+package com.flow.controller;
+
+import com.flow.mapper.CompanyMapper;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.OperationLog;
+import com.flow.service.OperationLogService;
+import com.flow.util.result;
+import com.flow.util.resultutil;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+@RestController
+@RequestMapping({"/hxzk"})
+@Component
+public class OperationLogController {
+
+    @Autowired
+    OperationLogService operationLogService;
+    @GetMapping({"findOperationLog"})
+    result<List<OperationLog>> findOperationLog(Integer page, Integer limit) {
+        PageInfo<OperationLog> cz = this.operationLogService.FindOperationLog(page, limit);
+        return resultutil.returnSuccess(cz.getTotal(), cz.getList());
+    }
+
+
+
+}
diff --git a/src/main/java/com/flow/controller/PayController.java b/src/main/java/com/flow/controller/PayController.java
index c72a8d6..d4bb8da 100644
--- a/src/main/java/com/flow/controller/PayController.java
+++ b/src/main/java/com/flow/controller/PayController.java
@@ -13,8 +13,17 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.UUID;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.flow.mapper.CardMapper;
+import com.flow.pojo.Card;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,10 +33,14 @@
 public class PayController {
     public PayController() {
     }
-
+    @Autowired
+    CardMapper cardMapper;
     @PostMapping({"buy"})
-    public void buy(HttpServletResponse response, String card, String type, String feiyong, String chongzhiCompany) throws AlipayApiException, IOException {
+    public void buy(HttpServletResponse response, String card, String type, String feiyong, String chongzhiCompany) throws AlipayApiException, IOException, ParseException {
         try {
+
+
+//        card1.setEnddate(newdate);
             String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDIAu0w0z9jhDRhXpxybnTtrIJi2AOgct0BeUYb58OCJ62nXPmPLV+Kgh/Bs37Woq9Vm28TIQKBB+pt8nmmMbYYlkS3ouWFX30r3jgxspRDAMszJDH9CY+JKWckRoC7B36+q2AQRM3TFqnKD1GxsubPUNVBW2ocZyRkSewhT+5ZTNzQ9a0OSjn3etP+VDX/H2QBNnBO4d36b7h6G9kv68FnL5Q8bSj11/UwsQNwTyfgIRxp3D9Lwp3602nHYWdxGL6GMtKiEiZb+IjAI+i9TT6iHe8Ek7fprUynnHiGDkoq7/0iwRtZ2UHtoIYqTxM9+v4UfD+8MmSMkSNuecjGzDbdAgMBAAECggEAJaavYd6Sczhi5+V4i+4RIuCzlsnVPPICepGKyhwB6NFxVi0haXuAHcHLGpqgiOUNHo9pBG/VWdbUoafgkJGRFuXKv8rxa/8CwCxP5cMZN9fBaLoqktim5YoeuWxwNUT+7gOyzL03BcKhacEiftIPsv0jd+8udXRRHHPx+H9kffit38ZUiaA//yKJ2dUTkmXcJHjaECXQzVsFqourCeCW9BUviXKL+RLky/aUHlr5tamQP36RLxVp8bQkxPw03dQzgpn+LAmDTzpjcATkpD5OTG4fn3T8lT7nxD5XdyWpjveWfjsQ2jwKegnrqE62lhbtMWci0Izz9Otgb96eBDD2PQKBgQDsCQhcAoM5WX5I3Cp3dxjFqggngdMIDt5EQPFmRWLT7/THFWeOcwEi1bnEu2Qzzxun1JjhYCzAYcSWNJUjG8R7CuQb34Mk0B6XPZhrNY91QuRnzCcDZ9OtDRZIHTPFmoEq2iCJGgNJnrHEUq02yH8DA68qD/f2K6BUV+9ySikRbwKBgQDY7drXkq5ruUMtxNQT08GsgZ2plO4c7NZtsiKCkk+jhHc218C+kA9epyzHntZTcZbAvIw/5sJFc78dFxAKmr0MCkoSCoyHjxg+XJXPeLLBvcFxhiTIYafiUEwNT2kkicTYA76TLUl5RYY+J4Or2CnYEsP9y5ujG8rz1QznJKe+cwKBgBkbQNtgnQqtnUQsvwukDGuCEYn6QjM6OaQy8Dp7qO54OKYwfapmSzmkWDU35YmpPvzUHUrjyv7Pp3R+tVpdqsGXv/nDBZUV2hsmPx8wPEkxy0/LJF81XQusN7GGAarEK3ceapWKwczD547FaI1KOFBexPQJbMuvikdObzbN8p5bAoGAdNBoxysip7mktlHGjkK6iUVm/DnJm2Ph+EIzmTJmljwv4iV+kl+LF0JYt8oNyfNh5bnioEqIFNRGdsjDh6JZ6NDloB90G09wE6zRs15gjDm9oH9G8Wy89f6dZZF8ogNaL6ScjC6X4SkSKAgpPHFz3voD9ngdAFFoEbOJdjLj7YcCgYEA56smryiVRJOrz9KAb4xWmrBGTnPt/CXWMRy1xFFm99/OeJ7FZPRxTSWWfQT/T2gy1jeGPoG40097vtBtNV3aLJ+GWltUOHuWIK5iT0+AYSazoDvr0D/NQNc6yAG2d1ednTKSrio8gDqJcx8wUGIOeXN/AK4+ToCwMq/Q2kwJXWg=";
             String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp2K7FOmZqN+RQJ4slX9IT9dtu6FuMiWHFtCY0WDscvCeCEtiT5EqVvhJqQCgbGc7RcYjHlS/MSEg5YLayCEIkxM0R+d7RRDzPOEsxQxheYlZmb+iehL3fnVCG03e9yCZGBCwkElSyYIldwIRk/nu93fwzQvtx0HutTANUgI5JBo/w6mT3nPUajn9bSiU1fT0hZZ2huhTxtLRndj89We8nz7BJASOxwCHj7Oog5XHHh06dW+eIFDyQu71PZLoKG7+EW2Lo5D1qFk2jd/VAl+Ss0ATtvrJ9+nAftONu6dlfw5Q7iQL382xQS0QC2BU87yLUatehObB21N5VAoyyTMsmQIDAQAB";
             response.setContentType("textl/html;charset=UTF-8");
@@ -39,8 +52,10 @@
             AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
             String bizContent = "{\"out_trade_no\":\"" + shopId + "\",\"total_amount\":\"" + feiyong + "\",\"subject\":\"" + chongzhiCompany + "\",\"body\":\"" + card + "\",\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}";
             alipayRequest.setBizContent(bizContent);
-            alipayRequest.setReturnUrl("http://a.iotposition.com:8088/HxzkFlow/");
-            alipayRequest.setNotifyUrl("http://a.iotposition.com:8088/HxzkFlow/order/payed");
+            alipayRequest.setReturnUrl("http://localhost:8888/HxzkFlow/page/index.jsp");
+            alipayRequest.setNotifyUrl("http://localhost:8888/HxzkFlow/order/payed");
+//            alipayRequest.setReturnUrl("http://a.iotposition.com:8088/HxzkFlow/page/index.jsp");
+//            alipayRequest.setNotifyUrl("http://a.iotposition.com:8088/HxzkFlow/order/payed");
             String result = ((AlipayTradePagePayResponse)alipayClient.pageExecute(alipayRequest)).getBody();
             out.print(result);
         } catch (Throwable var20) {
diff --git a/src/main/java/com/flow/controller/TbFuwuqiController.java b/src/main/java/com/flow/controller/TbFuwuqiController.java
index c17ac30..efeee02 100644
--- a/src/main/java/com/flow/controller/TbFuwuqiController.java
+++ b/src/main/java/com/flow/controller/TbFuwuqiController.java
@@ -1,9 +1,14 @@
 package com.flow.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.flow.mapper.OperationLogMapper;
+import com.flow.mapper.TbFuwuqiMapper;
 import com.flow.pojo.Card;
+import com.flow.pojo.OperationLog;
 import com.flow.pojo.TbFuwuqi;
 import com.flow.service.CompanyService;
+import com.flow.service.OperationLogService;
 import com.flow.service.TbFuwuqiService;
 import com.flow.util.result;
 import com.flow.util.resultutil;
@@ -29,6 +34,12 @@
     @Autowired
     CompanyService companyService;
 
+    @Autowired
+    OperationLogService operationLogService;
+    @Autowired
+    TbFuwuqiMapper tbFuwuqiMapper;
+    @Autowired
+    OperationLogMapper operationLogMapper;
     @GetMapping({"findTbFuwuqi"})
     result<List<TbFuwuqi>> findBangZhu(Integer page, Integer limit) throws ParseException {
         PageInfo<TbFuwuqi> cz = this.tbFuwuqiService.FindTbFuwuqi(page, limit);
@@ -46,6 +57,7 @@
                     ((TbFuwuqi)cz.getList().get(i)).setRemainingdays(+num11/24/60/60/1000+"澶�");
                 }
                 if (!((TbFuwuqi)cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((TbFuwuqi)cz.getList().get(i)).getRemainingdays().equals(+num11/24/60/60/1000+"澶�") ){
+                    System.out.println("鎵撳嵃鏁版嵁==========銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��");
                     this.tbFuwuqiService.UpdateTbFuwuqi((TbFuwuqi)cz.getList().get(i));
                 }
 //
@@ -71,6 +83,7 @@
                     ((TbFuwuqi)cz.getList().get(i)).setRemainingdays(+num11/24/60/60/1000+"澶�");
                 }
                 if (!((TbFuwuqi)cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((TbFuwuqi)cz.getList().get(i)).getRemainingdays().equals(+num11/24/60/60/1000+"澶�") ){
+                    System.out.println("222222222222");
                     this.tbFuwuqiService.UpdateTbFuwuqi((TbFuwuqi)cz.getList().get(i));
                 }
             }
@@ -91,14 +104,26 @@
     @PostMapping({"UpdateTbFuwuqi"})
     public ModelAndView UpdateCard(TbFuwuqi tbFuwuqi) {
         this.tbFuwuqiService.UpdateTbFuwuqi(tbFuwuqi);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("id", tbFuwuqi.getId());
+        TbFuwuqi tbFuwuqi1 = tbFuwuqiMapper.selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("淇敼");
+        operationLog.setCaozuocontent("淇敼鏈嶅姟鍣細"+tbFuwuqi1.getServername());
+        operationLog.setCaozuoname(tbFuwuqi1.getCaozuoname());
+        operationLogService.addOperationLog(operationLog);
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        operationLog.setCaozuodate(formatter.format(date));
+        operationLogMapper.insert(operationLog);
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setViewName("/page/Fuwuqi.jsp");
         return modelAndView;
     }
 
     @PostMapping({"DeleteTbFuwuqi"})
-    public int DeleteCard(String num) {
-        return this.tbFuwuqiService.DeleteTbFuwuqi(num);
+    public int DeleteCard(String num,String caozuoname) {
+        return this.tbFuwuqiService.DeleteTbFuwuqi(num,caozuoname);
     }
 
     @PostMapping({"tbFuwuqiSearch"})
@@ -124,10 +149,10 @@
         }
         return resultutil.returnSuccess(cz.getTotal(), cz.getList());
     }
-
     @PostMapping({"ifFuwuqi"})
     public TbFuwuqi ifFuwuqi(TbFuwuqi tbFuwuqi) {
         return this.tbFuwuqiService.ifFuwuqi(tbFuwuqi);
     }
 
+
 }
diff --git a/src/main/java/com/flow/controller/ZongInvoicesController.java b/src/main/java/com/flow/controller/ZongInvoicesController.java
index ee96cb8..7fe9060 100644
--- a/src/main/java/com/flow/controller/ZongInvoicesController.java
+++ b/src/main/java/com/flow/controller/ZongInvoicesController.java
@@ -5,23 +5,45 @@
 
 package com.flow.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.flow.mapper.zongInvoicesMapper;
+import com.flow.pojo.Manager;
+import com.flow.pojo.OperationLog;
+import com.flow.pojo.TbFuwuqi;
 import com.flow.pojo.Zonginvoices;
 import com.flow.service.zongInvoicesService;
 import com.flow.util.result;
 import com.flow.util.resultutil;
 import com.github.pagehelper.PageInfo;
+
+import java.io.*;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 @RestController
 @RequestMapping({"/hxzk"})
 public class ZongInvoicesController {
     @Autowired
     zongInvoicesService zongInvoicesService;
+    @Autowired
+    zongInvoicesMapper zongInvoicesMapper;
 
     public ZongInvoicesController() {
     }
@@ -48,8 +70,208 @@
         return this.zongInvoicesService.findsqnum(zonginvoices);
     }
 
+    @PostMapping({"UpdateKaiPiao"})
+    public ModelAndView UpdateKaiPiao(Zonginvoices zonginvoices) {
+        this.zongInvoicesService.UpdateKaiPiao(zonginvoices);
+//        QueryWrapper queryWrapper = new QueryWrapper();
+//        queryWrapper.eq("id", tbFuwuqi.getId());
+//        TbFuwuqi tbFuwuqi1 = tbFuwuqiMapper.selectOne(queryWrapper);
+//        OperationLog operationLog = new OperationLog();
+//        operationLog.setCaozuotype("淇敼");
+//        operationLog.setCaozuocontent("淇敼鏈嶅姟鍣細"+tbFuwuqi1.getServername());
+//        operationLogService.addOperationLog(operationLog);
+//        Date date = new Date();
+//        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        operationLog.setCaozuodate(formatter.format(date));
+//        operationLogMapper.insert(operationLog);
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("/page/ChongZhi.jsp");
+        return modelAndView;
+    }
+    @PostMapping({"DeleteKaiPiao"})
+    public int DeleteKaiPiao(String kaipiaoId) {
+        return this.zongInvoicesService.DeleteKaiPiao(kaipiaoId);
+    }
+
     @PostMapping({"adddanhao"})
     public int adddanhao(Zonginvoices zonginvoices) {
         return this.zongInvoicesService.adddanhao(zonginvoices);
     }
+
+    @PostMapping({"ZonginvoicesSearch"})
+    public result<List<Zonginvoices>> tableSearch(Zonginvoices manager, int page, int limit) throws Exception {
+        PageInfo<Zonginvoices> cz = this.zongInvoicesService.tableSearch(manager, page, limit);
+//        for(int i = 0; i < cz.getSize(); ++i) {
+//            if (((Manager)cz.getList().get(i)).getCompany() != null) {
+//                SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
+//                Date date = new Date();
+//                Date endDay = date2.parse(cz.getList().get(i).getEnddate());//缁撴潫鏃堕棿
+//                Long starTime = date.getTime();
+//                Long endTime = endDay.getTime();
+//                Long num11 = endTime - starTime;//鏃堕棿鎴�
+//
+////                if ((num11/24/60/60/1000)<0){
+////                    ((Manager)cz.getList().get(i)).setRemainingdays("0澶�");
+////                }else{
+////                    ((Manager)cz.getList().get(i)).setRemainingdays(+num11/24/60/60/1000+"澶�");
+////                }
+////                this.cardService.UpdateCard((Card)cz.getList().get(i));
+////                this.cardService.UpdateCard((Card)cz.getList().get(i));
+//            }
+//        }
+        return resultutil.returnSuccess(cz.getTotal(), cz.getList());
+    }
+
+    /**
+     *  鏂囨。涓婁紶
+     */
+    @ResponseBody
+    @PostMapping("/saveDocument")
+    public ModelAndView saveDocument(MultipartFile file, HttpServletRequest request,Zonginvoices zonginvoices) throws IOException {
+        System.out.println("鎵撳嵃鏁版嵁=========銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��");
+        String filename = this.AddXcd(file,request);
+        System.out.println(filename );
+//        System.out.println("doc=" + doc);
+        //1.鑾峰彇鍘熷鏂囦欢鍚�
+//        String uploadFileName = file.getOriginalFilename();
+//        System.out.println("瑕佷笂浼犵殑鍘熷鏂囦欢鍚嶅瓧鏄�:" + uploadFileName);
+//        //2.鎴彇鏂囦欢鎵╁睍鍚�
+//        String extendName = uploadFileName.substring(uploadFileName.lastIndexOf(".") + 1, uploadFileName.length());
+//        //3.鎶婃枃浠跺姞涓婇殢鏈烘暟锛岄槻姝㈡枃浠堕噸澶�
+//        String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+//        //4.鐢熸垚鐨勬柊鐨勬湇鍔″櫒鏂囦欢鍚�
+//        String newfileName = uuid + "." + extendName;
+//        System.out.println("鐢熸垚鐨勬柊鐨勬湇鍔″櫒鏂囦欢鍚嶆槸:" + newfileName); //闃叉鏈嶅姟鍣ㄦ枃浠跺悕閲嶅悕
+//        //5.鑾峰彇鐪熷疄鐨勬湇鍔″櫒鏂囦欢涓婁紶鍦板潃 (鏂囦欢鐨勫瓨鍌ㄤ綅缃�)
+//        String filePath = request.getServletContext().getRealPath("WEB-INF") + "\\" + newfileName;
+//        System.out.println("鏈嶅姟鍣ㄨ繍琛岀洰褰曪紝鏈�缁堜笂浼犵殑璺緞:" + filePath);
+//        //6.鎵ц涓婁紶
+//        file.transferTo(new File(filePath));
+//        System.out.println("鏂囦欢涓婁紶缁撴潫锛�");
+//        //璋冪敤鏂囦欢涓婁紶宸ュ叿绫� 涓婁紶鏂囦欢
+
+        zonginvoices.setDanhao(filename);
+        this.zongInvoicesService.UpdateKaiPiao(zonginvoices);
+//       FileUpLoadUtils.Fileupload(file, request, doc, docService);
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("/page/KaiPiaoJiLu.jsp");
+        return modelAndView;
+//        return t
+
+    }
+    public static String AddXcd(MultipartFile file,HttpServletRequest request) throws IOException {
+        // 鑾峰彇鍥剧墖鐨勫師濮嬫枃浠跺悕绉�
+        String oldName=file.getOriginalFilename();
+        //鑾峰彇鏈嶅姟鍣ㄨ矾寰勶細upload    getRealPath:鑾峰彇涓�涓浉瀵硅矾寰勭殑鐪熷疄璺緞
+//        String path="D:\\HxzkFlow\\HxzkFlow\\HxzkFlow\\src\\webapp\\WEB-INF";
+
+        String path="C:\\Users\\Administrator\\Desktop\\nginx\\html\\apache-tomcat-7.0.70\\webapps\\HxzkFlow\\WEB-INF";
+        //鏂囦欢鏀瑰悕================================
+        //1.鎴彇鍚庣紑鏍煎紡.png .jpg
+        String suffix=null;
+        if (oldName.length()>0){
+            suffix= oldName.substring(oldName.lastIndexOf("."));
+        }
+        //2.鐢熸垚鏂扮殑鏂囦欢鍚�
+        SimpleDateFormat dateFormat=new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        String dateStr=dateFormat.format(new Date());
+        //鐢熸垚闅忔満鏁�
+        Random random=new Random();
+        int max=1000000;
+        int min=100000;
+        int rand= random.nextInt(max);
+        while (rand<min){
+            rand= random.nextInt(max);
+        }
+        //鐢熸垚鏂扮殑鏂囦欢鍚嶇О
+        String newName=dateStr.concat(rand+"").concat(suffix);
+        /*File.separator:鏄郴缁熻嚜鍔ㄥ垽瀹氬垎闅旂锛堜笉鍚岀殑鎿嶄綔绯荤粺涓� 璺緞鍒嗛殧绗︿笉涓�鏍�  浣嗘槸java璇█鏄法骞冲彴鐨� 鎵�浠ュ氨闇�瑕� 缁熶竴 鍒嗛殧绗︼級*/
+        File file1=new File(path+File.separator+newName);
+        //鎶婃垜浠笂娆$殑鏂囦欢閫氳繃transferTo鍐欏叆鏈湴鏂囦欢
+        file.transferTo(file1);
+        return newName;
+    }
+    @ResponseBody
+    @RequestMapping("/down")
+    public void down( Integer id,HttpServletRequest request, HttpServletResponse response) throws Exception{
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("sqnum", id);
+        Zonginvoices zonginvoices =  zongInvoicesMapper.selectOne(queryWrapper);
+
+        //妯℃嫙鏂囦欢锛宮yfile.txt涓洪渶瑕佷笅杞界殑鏂囦欢
+        String fileName = request.getSession().getServletContext().getRealPath("WEB-INF")+"/"+zonginvoices.getDanhao();
+        //鑾峰彇杈撳叆娴�
+        InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName)));
+        //鍋囧浠ヤ腑鏂囧悕涓嬭浇鐨勮瘽
+        String filename = zonginvoices.getDanhao();
+        //杞爜锛屽厤寰楁枃浠跺悕涓枃涔辩爜
+        filename = URLEncoder.encode(filename,"UTF-8");
+        //璁剧疆鏂囦欢涓嬭浇澶�
+        response.addHeader("Content-Disposition", "attachment;filename=" + filename);
+        //1.璁剧疆鏂囦欢ContentType绫诲瀷锛岃繖鏍疯缃紝浼氳嚜鍔ㄥ垽鏂笅杞芥枃浠剁被鍨�
+        response.setContentType("multipart/form-data");
+        BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());
+        int len = 0;
+        while((len = bis.read()) != -1){
+            out.write(len);
+            out.flush();
+        }
+        out.close();
+    }
+    /**
+     * 涓嬭浇鏂囨。
+     */
+    @ResponseBody
+    @RequestMapping("/downloadDocument")
+    public ResponseEntity<byte[]> downloadDocument(Integer id, HttpServletRequest request) {
+
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("sqnum", id);
+        Zonginvoices zonginvoices =  zongInvoicesMapper.selectOne(queryWrapper);
+        //鑾峰緱璇oc瀵硅薄
+//        Doc doc = docService.getById(id);
+        //鐢ㄦ枃浠朵笅杞藉伐鍏风被 涓嬭浇鏂囦欢
+        ResponseEntity<byte[]> responseEntity = this.FileDownLoad(id, zonginvoices, request);
+        return responseEntity;
+    }
+
+    public static ResponseEntity<byte[]> FileDownLoad(Integer id, Zonginvoices zonginvoices ,HttpServletRequest request) {
+
+        //鑾峰緱瑕佷笅杞界殑鍦板潃
+//        String path = request.getSession().getServletContext().getRealPath("D:\\HxzkFlow\\HxzkFlow\\HxzkFlow\\src\\webapp\\WEB-INF");
+        String path = request.getSession().getServletContext().getRealPath("D:\\HxzkFlow\\HxzkFlow\\HxzkFlow\\src\\webapp\\WEB-INF\\")+zonginvoices.getDanhao();
+
+        File file = new File(path, zonginvoices.getDanhao());
+        if (file.exists()) {
+            try {
+                //璁剧疆璇锋眰澶�
+                HttpHeaders headers = new HttpHeaders();
+
+                /**
+                 *  1.鐢╰itle(瀛樺湪涓枃)涓烘枃浠跺悕锛屽彲鑳戒細鏈変贡鐮侀棶棰�
+                 *
+                 *  2.鐢╢ileName(涓嶅瓨鍦ㄤ腑鏂� )涓烘枃浠跺悕锛屼笉浼氭湁涔辩爜闂
+                 *  濡�:  String downName = new String(doc.getFileName().getBytes("utf-8"), "ISO-8859-1");
+                 *  ---瑕佷繚璇佹病鏈変贡鐮侀棶棰樺彲绗簩绉嶆柟寮�
+                 *
+                 */
+                //鏂囦欢涓嬭浇鐨勫悕瀛�, 鍙兘瀛樺湪涔辩爜闂
+                String newFileName = zonginvoices.getDanhao().split("\\.")[1];
+                String downName = new String(newFileName.getBytes("utf-8"), "ISO-8859-1");
+
+                // 璁剧疆浠ラ檮浠剁殑褰㈠紡涓嬭浇
+                headers.setContentDispositionFormData("attachment", downName);
+                // 璁剧疆鏂囦欢鍐呭浠ユ祦鐨勫舰寮忔潵涓嬭浇
+                headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+                // 鐢╯pringmvc 鎻愪緵鐨勪笅杞芥柟寮�
+                ResponseEntity<byte[]> responseEntity = new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file), headers, HttpStatus.OK);
+                return responseEntity;
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/flow/controller/orderController.java b/src/main/java/com/flow/controller/orderController.java
index 5967e6a..a82aeda 100644
--- a/src/main/java/com/flow/controller/orderController.java
+++ b/src/main/java/com/flow/controller/orderController.java
@@ -5,11 +5,14 @@
 
 package com.flow.controller;
 
-import com.flow.pojo.Card;
-import com.flow.pojo.Chongzhi;
-import com.flow.pojo.TbFuwuqi;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.flow.mapper.CardMapper;
+import com.flow.mapper.DuanxinlogMapper;
+import com.flow.mapper.ManagerMapper;
+import com.flow.pojo.*;
 import com.flow.service.CardService;
 import com.flow.service.ChongZhiService;
+import com.flow.service.DuanxinlogService;
 import com.flow.service.TbFuwuqiService;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -24,7 +27,10 @@
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +52,13 @@
     @Autowired
     TbFuwuqiService tbFuwuqiService;
 
+    @Autowired
+    CardMapper cardMapper;
+
+    @Autowired
+    DuanxinlogService duanxinlogService;
+    @Autowired
+    ManagerMapper managerMapper;
     public orderController() {
     }
 
@@ -57,6 +70,7 @@
         double money = Double.parseDouble(request.getParameter("total_amount"));
         String formattedTime = currentTime.format(formatter);
         String card = request.getParameter("body");
+
         String[] values = card.split(",");
         double mones = (double)values.length * money;
         DecimalFormat decimalFormat = new DecimalFormat("#.##");
@@ -67,15 +81,42 @@
         String kaiMoney = decimalFormat.format(finalResult);
         String[] var21 = values;
         int var22 = values.length;
-
+        List<Card> list = new ArrayList<>();
         for(int var23 = 0; var23 < var22; ++var23) {
             String value = var21[var23];
             Card card1 = new Card();
             card1.setRechargedate(formattedTime);
             card1.setRechargemoney(String.valueOf(money));
-            card1.setCardnumber(value);
-            this.cardService.UpdateCardNum(card1);
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("num", (long) Integer.parseInt(value));
+        Card card12 = cardMapper.selectOne(queryWrapper);
+            SimpleDateFormat sfd = new SimpleDateFormat("yyyy-MM-dd");
+            Date date= sfd.parse(card12.getEnddate());
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            calendar.add(Calendar.YEAR, 1);
+        String newdate = sfd.format(calendar.getTime());
+            card1.setEnddate(newdate);
+
+            Date date1= sfd.parse(card12.getRemainingdays());
+            Calendar calendar1 = Calendar.getInstance();
+            calendar1.setTime(date1);
+            calendar1.add(Calendar.YEAR, 1);
+            String newdate1 = sfd.format(calendar.getTime());
+            card1.setRemainingdays(newdate1);
+//            card1.setCardnumber(value);
+            System.out.println(value);
+
+//            QueryWrapper queryWrapper = new QueryWrapper();
+//            queryWrapper.eq("cardnumber", value);
+//            Card card2 = cardMapper.selectOne(queryWrapper);
+            card1.setNum((long) Integer.parseInt(value));
+            System.out.println(card1);
+            list.add(card1);
+//            this.cardService.UpdateCardNum(card1);
         }
+
+        cardMapper.updateBatchByIdcz(list);
 
         System.out.println("鍏呭�艰褰�");
         String value1 = request.getParameter("subject");
@@ -84,22 +125,22 @@
         if (value1 != null && value1 != "") {
             chongzhi = new Chongzhi();
             chongzhi.setCzcard(card);
-            chongzhi.setCzmoney(formattedMones);
+            chongzhi.setCzmoney(String.valueOf(money));
             chongzhi.setJynum(out_trade_no);
             chongzhi.setCzdate(formattedTime);
             chongzhi.setStatus("鏈紑绁�");
-            chongzhi.setKaimoney(kaiMoney);
+            chongzhi.setKaimoney(String.valueOf(money));
             chongzhi.setCompany(value1);
             this.chongZhiService.addChongZhi(chongzhi);
         } else {
             chongzhi = new Chongzhi();
             chongzhi.setCzcard(card);
-            chongzhi.setCzmoney(formattedMones);
+            chongzhi.setCzmoney(String.valueOf(money));
             chongzhi.setJynum(out_trade_no);
             chongzhi.setCzdate(formattedTime);
             chongzhi.setCompany("鏃�");
             chongzhi.setStatus("鏈紑绁�");
-            chongzhi.setKaimoney(kaiMoney);
+            chongzhi.setKaimoney(String.valueOf(money));
             this.chongZhiService.addChongZhi(chongzhi);
         }
 
@@ -115,13 +156,41 @@
             SendSmsRequest req = new SendSmsRequest();
             String[] phoneNumberSet1 = new String[]{"15210640466"};
             req.setPhoneNumberSet(phoneNumberSet1);
+            QueryWrapper sms = new QueryWrapper();
+            sms.eq("none", "0");
+            sms.eq("smsreception", "1");
+            List<Manager> managerList = (managerMapper).selectList(sms);
+            for (int s=0;s<managerList.size();s++){
+//                        System.out.println(managerList.get(s).getPhone());
+//                        phoneNumberSet1[s] = managerList.get(s).getPhone();
+                String[] phoneNumberSet12  = {managerList.get(s).getPhone()};
+                System.out.println(phoneNumberSet12);
+                req.setPhoneNumberSet(phoneNumberSet12);
+
+                req.setSmsSdkAppId("1400838975");
+                req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+                req.setTemplateId("1907853");
+
+//                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+                String[] templateParamSet1 = new String[]{value1, formattedTime, String.valueOf(money), String.valueOf(values.length)};
+                req.setTemplateParamSet(templateParamSet1);
+                // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+                SendSmsResponse resp = client.SendSms(req);
+            }
             req.setSmsSdkAppId("1400838975");
             req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
             req.setTemplateId("1907853");
-            String[] templateParamSet1 = new String[]{value1, formattedTime, String.valueOf(formattedMones), String.valueOf(values.length)};
+            String[] templateParamSet1 = new String[]{value1, formattedTime, String.valueOf(money), String.valueOf(values.length)};
             req.setTemplateParamSet(templateParamSet1);
             SendSmsResponse resp = client.SendSms(req);
             System.out.println(SendSmsResponse.toJsonString(resp));
+            Duanxinlog duanxinlog = new Duanxinlog();
+            duanxinlog.setIdentification(value1);
+            duanxinlog.setReceiver(value1);
+            duanxinlog.setNumber(phoneNumberSet1[0]);
+//            duanxinlog.setContent("灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛佹偍鏈夋祦閲忓崱灏嗕簬"+cardList.get(i).getEnddate()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝e父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒"
+//            );
+            this.duanxinlogService.addDuanxinlog(duanxinlog);
         } catch (TencentCloudSDKException var30) {
             System.out.println(var30.toString());
             response.getWriter().println("success");
@@ -200,6 +269,27 @@
             SmsClient client = new SmsClient(cred, "ap-beijing", clientProfile);
             SendSmsRequest req = new SendSmsRequest();
             String[] phoneNumberSet1 = new String[]{"15210640466"};
+            QueryWrapper sms = new QueryWrapper();
+            sms.eq("none", "0");
+            sms.eq("smsreception", "1");
+            List<Manager> managerList = (managerMapper).selectList(sms);
+            for (int s=0;s<managerList.size();s++){
+//                        System.out.println(managerList.get(s).getPhone());
+//                        phoneNumberSet1[s] = managerList.get(s).getPhone();
+                String[] phoneNumberSet12  = {managerList.get(s).getPhone()};
+                System.out.println(phoneNumberSet12);
+                req.setPhoneNumberSet(phoneNumberSet12);
+
+                req.setSmsSdkAppId("1400838975");
+                req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+                req.setTemplateId("1907853");
+
+//                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+                String[] templateParamSet1 = new String[]{value1, formattedTime, String.valueOf(money), String.valueOf(values.length)};
+                req.setTemplateParamSet(templateParamSet1);
+                // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+                SendSmsResponse resp = client.SendSms(req);
+            }
             req.setPhoneNumberSet(phoneNumberSet1);
             req.setSmsSdkAppId("1400838975");
             req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
@@ -208,6 +298,13 @@
             req.setTemplateParamSet(templateParamSet1);
             SendSmsResponse resp = client.SendSms(req);
             System.out.println(SendSmsResponse.toJsonString(resp));
+            Duanxinlog duanxinlog = new Duanxinlog();
+            duanxinlog.setIdentification(value1);
+            duanxinlog.setReceiver(value1);
+            duanxinlog.setNumber(phoneNumberSet1[0]);
+//            duanxinlog.setContent("灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛佹偍鏈夋祦閲忓崱灏嗕簬"+cardList.get(i).getEnddate()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝e父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒"
+//            );
+            this.duanxinlogService.addDuanxinlog(duanxinlog);
         } catch (TencentCloudSDKException var30) {
             System.out.println(var30.toString());
             response.getWriter().println("success");
diff --git a/src/main/java/com/flow/mapper/CardMapper.java b/src/main/java/com/flow/mapper/CardMapper.java
index 10530d1..63fa27f 100644
--- a/src/main/java/com/flow/mapper/CardMapper.java
+++ b/src/main/java/com/flow/mapper/CardMapper.java
@@ -10,13 +10,14 @@
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 public interface CardMapper extends BaseMapper<Card> {
     @Select({"select * from card where none = 0  ORDER BY enterdate DESC"})
     List<Card> findAllUsers();
 
     @Select({"select * from card where none = 0 and company = #{Zong} ORDER BY enterdate DESC"})
-    List<Card> findAllUsersZi(String var1);
+    List<Card> findAllUsersZi(@Param("Zong")String var1);
 
     @Select({"SELECT COUNT(*) FROM card where none = 0"})
     int findCardNum1();
@@ -48,9 +49,50 @@
     @Select({"SELECT count(*) FROM card WHERE syflow < '2G' and none = 0 and company = #{zi}"})
     int findCardNum5z(String var1);
 
-    @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%') and company = #{company}"})
+    @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%') and company = #{company} ORDER BY enterdate DESC"})
     List<Card> FindSearch(@Param("number") String var1, @Param("company") String var2);
 
-    @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%')"})
+    @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%') ORDER BY enterdate DESC"})
     List<Card> FindSearch1(@Param("number") String var1);
+
+    @Update({
+            "<script>",
+            "UPDATE card",
+            "<set>",
+            "<foreach item='item' collection='list' separator=','>",
+            "carddate = #{item.carddate},",
+            "enddate = #{item.enddate},",
+            "unitprice = #{item.unitprice},",
+            "enterdate = #{item.enterdate}",
+//            "...", // 鏇村鐨勫瓧娈垫洿鏂拌鍙�
+            "</foreach>",
+            "</set>",
+            "WHERE num IN",
+            "<foreach item='item' collection='list' open='(' separator=',' close=')'>",
+            "#{item.num}",
+            "</foreach>",
+            "</script>"
+    })
+    int updateBatchById(List<Card> list);
+
+    @Update({
+            "<script>",
+            "UPDATE card",
+            "<set>",
+            "<foreach item='item' collection='list' separator=','>",
+            "rechargedate = #{item.rechargedate},",
+            "rechargemoney = #{item.rechargemoney},",
+            "enddate = #{item.enddate},",
+            "remainingdays = #{item.remainingdays},",
+            "enterdate = #{item.rechargedate}",
+//            "...", // 鏇村鐨勫瓧娈垫洿鏂拌鍙�
+            "</foreach>",
+            "</set>",
+            "WHERE num IN",
+            "<foreach item='item' collection='list' open='(' separator=',' close=')'>",
+            "#{item.num}",
+            "</foreach>",
+            "</script>"
+    })
+    int updateBatchByIdcz(List<Card> list);
 }
diff --git a/src/main/java/com/flow/mapper/CompanyMapper.java b/src/main/java/com/flow/mapper/CompanyMapper.java
index 521a2c9..b70aa25 100644
--- a/src/main/java/com/flow/mapper/CompanyMapper.java
+++ b/src/main/java/com/flow/mapper/CompanyMapper.java
@@ -13,10 +13,10 @@
 import org.apache.ibatis.annotations.Select;
 
 public interface CompanyMapper extends BaseMapper<Company> {
-    @Select({"select * from company where none = 0"})
+    @Select({"select * from company where none = 0 ORDER BY enterdate DESC"})
     List<Company> findAllcompany();
 
-    @Select({"select * from company where none = 0 and companyabbName = #{Zong}"})
+    @Select({"select * from company where none = 0 and companyabbName = #{Zong} ORDER BY enterdate DESC"})
     List<Company> findAllcompanyZi(String var1);
 
     @Select({"SELECT * FROM company where none = 0 and companyabbName = #{companybbName} or none = 0 and companyName = #{companyName} "})
diff --git a/src/main/java/com/flow/mapper/LoginJiLuMapper.java b/src/main/java/com/flow/mapper/LoginJiLuMapper.java
index 1446ba8..5da21c4 100644
--- a/src/main/java/com/flow/mapper/LoginJiLuMapper.java
+++ b/src/main/java/com/flow/mapper/LoginJiLuMapper.java
@@ -8,14 +8,16 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.flow.pojo.Loginjilu;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 public interface LoginJiLuMapper extends BaseMapper<Loginjilu> {
-    @Select({"select * from loginjilu where none = 0 ORDER BY LoginDate DESC"})
+    @Select({"select * from loginjilu where none = 0 ORDER BY LoginDate DESC "})
     List<Loginjilu> findAllLoginJiLu();
 
-    @Select({"select * from loginjilu where none = 0 and LoginCompany = #{Zong}"})
-    List<Loginjilu> findAllLoginJiLuZi(String var1);
+    @Select({"select * from loginjilu where none = 0 and LoginCompany = #{Zong} ORDER BY LoginDate DESC"})
+    List<Loginjilu> findAllLoginJiLuZi(@Param("Zong")String var1);
 
     @Select({"select COUNT(*) from loginjilu where to_days(logindate) = to_days(now()) and none = 0"})
     String jrfwl();
diff --git a/src/main/java/com/flow/mapper/ManagerMapper.java b/src/main/java/com/flow/mapper/ManagerMapper.java
new file mode 100644
index 0000000..bcf7f22
--- /dev/null
+++ b/src/main/java/com/flow/mapper/ManagerMapper.java
@@ -0,0 +1,18 @@
+package com.flow.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.Manager;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface ManagerMapper extends BaseMapper<Manager> {
+
+    @Select({"select * from tb_user where none = 0 ORDER BY addtime DESC"})
+    List<Manager> FindManager();
+
+    @Select({"select * from tb_user where none = 0  and name = #{name} or juese = #{juese}"})
+    List<Manager> ifManager(@Param("name") String var1, @Param("juese") String var2);
+}
diff --git a/src/main/java/com/flow/mapper/OperationLogMapper.java b/src/main/java/com/flow/mapper/OperationLogMapper.java
new file mode 100644
index 0000000..f23b2e0
--- /dev/null
+++ b/src/main/java/com/flow/mapper/OperationLogMapper.java
@@ -0,0 +1,14 @@
+package com.flow.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.OperationLog;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface OperationLogMapper extends BaseMapper<OperationLog> {
+
+    @Select({"select * from operatio_log where none = 0 ORDER BY caozuodate DESC"})
+    List<OperationLog> FindOperationLog();
+}
diff --git a/src/main/java/com/flow/pojo/Card.java b/src/main/java/com/flow/pojo/Card.java
index 7842e41..4bf6ef9 100644
--- a/src/main/java/com/flow/pojo/Card.java
+++ b/src/main/java/com/flow/pojo/Card.java
@@ -5,10 +5,14 @@
 
 package com.flow.pojo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName("card")
 public class Card {
+    @TableId(type = IdType.AUTO)
     private Long num;
     private String company;
     private String cardnumber;
@@ -35,6 +39,8 @@
 
     private String remainingdays;
 
+    @TableField(exist = false)
+    private String caozuoname;
 
     public Card(Long num, String company, String cardnumber, Integer zflow, Integer syflow, String carddate, String operator, String bindid, String location, String notes, String enddate, String enterdate, String rechargedate, String rechargemoney, String none, String status, String iccid, Integer syll, String uptime,String flow,Integer unitprice,String remainingdays) {
         this.num = num;
@@ -579,4 +585,12 @@
     public void setUnitprice(Integer unitprice) {
         this.unitprice = unitprice;
     }
+
+    public String getCaozuoname() {
+        return caozuoname;
+    }
+
+    public void setCaozuoname(String caozuoname) {
+        this.caozuoname = caozuoname;
+    }
 }
diff --git a/src/main/java/com/flow/pojo/Chongzhi.java b/src/main/java/com/flow/pojo/Chongzhi.java
index 28adccc..12f925f 100644
--- a/src/main/java/com/flow/pojo/Chongzhi.java
+++ b/src/main/java/com/flow/pojo/Chongzhi.java
@@ -18,6 +18,8 @@
     private String kaimoney;
     private String status;
 
+    private String none;
+
     public Chongzhi(Long num, String czcard, String czmoney, String jynum, String czdate, String company, String kaimoney, String status) {
         this.num = num;
         this.czcard = czcard;
@@ -236,4 +238,12 @@
     public String getStatus() {
         return this.status;
     }
+
+    public String getNone() {
+        return none;
+    }
+
+    public void setNone(String none) {
+        this.none = none;
+    }
 }
diff --git a/src/main/java/com/flow/pojo/Company.java b/src/main/java/com/flow/pojo/Company.java
index 954aa73..4b66d10 100644
--- a/src/main/java/com/flow/pojo/Company.java
+++ b/src/main/java/com/flow/pojo/Company.java
@@ -5,6 +5,7 @@
 
 package com.flow.pojo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName("company")
@@ -21,7 +22,12 @@
     private String company;
     private String none;
     private String password;
+    private String enterdate;
 
+    private String rudq;
+
+    @TableField(exist = false)
+    private String caozuoname;
     public Company(Long companyid, String companyname, String companyabbname, String loginphone, String shuinum, String address, String phone, String accountbank, String account, String company, String none, String password) {
         this.companyid = companyid;
         this.companyname = companyname;
@@ -332,4 +338,28 @@
     public String getPassword() {
         return this.password;
     }
+
+    public String getRudq() {
+        return rudq;
+    }
+
+    public void setRudq(String rudq) {
+        this.rudq = rudq;
+    }
+
+    public String getCaozuoname() {
+        return caozuoname;
+    }
+
+    public void setCaozuoname(String caozuoname) {
+        this.caozuoname = caozuoname;
+    }
+
+    public String getEnterdate() {
+        return enterdate;
+    }
+
+    public void setEnterdate(String enterdate) {
+        this.enterdate = enterdate;
+    }
 }
diff --git a/src/main/java/com/flow/pojo/Manager.java b/src/main/java/com/flow/pojo/Manager.java
new file mode 100644
index 0000000..134c12c
--- /dev/null
+++ b/src/main/java/com/flow/pojo/Manager.java
@@ -0,0 +1,27 @@
+package com.flow.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("tb_user")
+public class Manager {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    private String name;
+    private String phone;
+    private String juese;
+    private String uadd;
+    private String udelete;
+    private String uupdate;
+    private String none;
+    private String addtime;
+    @TableField(exist = false)
+    private String caozuoname;
+
+    private String smsreception;
+
+}
diff --git a/src/main/java/com/flow/pojo/OperationLog.java b/src/main/java/com/flow/pojo/OperationLog.java
new file mode 100644
index 0000000..33b901e
--- /dev/null
+++ b/src/main/java/com/flow/pojo/OperationLog.java
@@ -0,0 +1,25 @@
+package com.flow.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("operatio_log")
+public class OperationLog {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    private String caozuotype;
+
+    private String caozuocontent;
+
+    private String caozuodate;
+
+    private String none;
+
+    private String caozuoname;
+
+
+}
diff --git a/src/main/java/com/flow/pojo/TbFuwuqi.java b/src/main/java/com/flow/pojo/TbFuwuqi.java
index 89680e9..27e25aa 100644
--- a/src/main/java/com/flow/pojo/TbFuwuqi.java
+++ b/src/main/java/com/flow/pojo/TbFuwuqi.java
@@ -1,6 +1,7 @@
 package com.flow.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -12,6 +13,7 @@
     @TableId(type = IdType.AUTO)
     private Integer id;
 
+//    @TableField()
     private String company;
 
     private String startdate;
@@ -30,7 +32,8 @@
 
     private String servername;
 
-
+    @TableField(exist = false)
+    private String caozuoname;
 
     public TbFuwuqi(Integer id, String company, String startdate, String enddate, String remainingdays, Double expense, String rechargedate, String rechargemoney, String notes,String none,String servername) {
         this.id = id;
@@ -147,4 +150,12 @@
     public void setServername(String servername) {
         this.servername = servername;
     }
+
+    public String getCaozuoname() {
+        return caozuoname;
+    }
+
+    public void setCaozuoname(String caozuoname) {
+        this.caozuoname = caozuoname;
+    }
 }
diff --git a/src/main/java/com/flow/pojo/Zonginvoices.java b/src/main/java/com/flow/pojo/Zonginvoices.java
index f0f6c9e..2edf81d 100644
--- a/src/main/java/com/flow/pojo/Zonginvoices.java
+++ b/src/main/java/com/flow/pojo/Zonginvoices.java
@@ -26,6 +26,8 @@
     private String youji;
     private String lxphone;
 
+    private String none;
+
     public Zonginvoices(Integer sqnum, String sqdate, String fptt, String xydm, String khh, String zcaddress, String zcphone, String fptype, String sqkpmoney, String shuilv, String danhao, String fpstate, String fpxz, String company, String youji, String lxphone) {
         this.sqnum = sqnum;
         this.sqdate = sqdate;
@@ -428,4 +430,12 @@
     public String getLxphone() {
         return this.lxphone;
     }
+
+    public String getNone() {
+        return none;
+    }
+
+    public void setNone(String none) {
+        this.none = none;
+    }
 }
diff --git a/src/main/java/com/flow/quartz/MyJob2.java b/src/main/java/com/flow/quartz/MyJob2.java
index be763e4..46e57f9 100644
--- a/src/main/java/com/flow/quartz/MyJob2.java
+++ b/src/main/java/com/flow/quartz/MyJob2.java
@@ -5,10 +5,15 @@
 
 package com.flow.quartz;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.flow.mapper.ManagerMapper;
 import com.flow.pojo.Card;
 import com.flow.pojo.Company;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.Manager;
 import com.flow.service.CardService;
 import com.flow.service.CompanyService;
+import com.flow.service.DuanxinlogService;
 import com.flow.util.DESUtil;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -28,7 +33,11 @@
     CardService cardService;
     @Autowired
     CompanyService companyService;
+    @Autowired
+    ManagerMapper managerMapper;
 
+    @Autowired
+    DuanxinlogService duanxinlogService;
     public MyJob2() {
     }
 
@@ -64,6 +73,27 @@
                 SmsClient client = new SmsClient(cred, "ap-beijing", clientProfile);
                 SendSmsRequest req = new SendSmsRequest();
                 String[] phoneNumberSet1 = new String[]{GsPhone};
+                QueryWrapper sms = new QueryWrapper();
+                sms.eq("none", "0");
+                sms.eq("smsreception", "1");
+                List<Manager> managerList = (managerMapper).selectList(sms);
+                for (int s=0;s<managerList.size();s++){
+//                        System.out.println(managerList.get(s).getPhone());
+//                        phoneNumberSet1[s] = managerList.get(s).getPhone();
+                    String[] phoneNumberSet12  = {managerList.get(s).getPhone()};
+                    System.out.println(phoneNumberSet12);
+                    req.setPhoneNumberSet(phoneNumberSet12);
+
+                    req.setSmsSdkAppId("1400838975");
+                    req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+                    req.setTemplateId("1908206");
+
+//                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+                    String[] templateParamSet1 = new String[]{cardNum, "150MB"};
+                    req.setTemplateParamSet(templateParamSet1);
+                    // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+                    SendSmsResponse resp = client.SendSms(req);
+                }
                 req.setPhoneNumberSet(phoneNumberSet1);
                 req.setSmsSdkAppId("1400838975");
                 req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
@@ -72,6 +102,12 @@
                 req.setTemplateParamSet(templateParamSet1);
                 SendSmsResponse resp = client.SendSms(req);
                 System.out.println(SendSmsResponse.toJsonString(resp));
+                Duanxinlog duanxinlog = new Duanxinlog();
+                duanxinlog.setIdentification(cardList.get(i).getCardnumber());
+                duanxinlog.setReceiver(cardList.get(i).getCompany());
+                duanxinlog.setNumber(GsPhone);
+//                duanxinlog.setContent("灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛佹偍鏈夋湇鍔″櫒灏嗕簬"+cardList.get(i).getEnddate()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝e父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒");
+                this.duanxinlogService.addDuanxinlog(duanxinlog);
             } catch (TencentCloudSDKException var15) {
                 System.out.println(var15.toString());
             }
diff --git a/src/main/java/com/flow/quartz/MyJob3.java b/src/main/java/com/flow/quartz/MyJob3.java
index df6c149..ac76318 100644
--- a/src/main/java/com/flow/quartz/MyJob3.java
+++ b/src/main/java/com/flow/quartz/MyJob3.java
@@ -5,10 +5,15 @@
 
 package com.flow.quartz;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.flow.mapper.ManagerMapper;
 import com.flow.pojo.Card;
 import com.flow.pojo.Company;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.Manager;
 import com.flow.service.CardService;
 import com.flow.service.CompanyService;
+import com.flow.service.DuanxinlogService;
 import com.flow.util.DESUtil;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -28,6 +33,12 @@
     CardService cardService;
     @Autowired
     CompanyService companyService;
+
+    @Autowired
+    ManagerMapper managerMapper;
+
+    @Autowired
+    DuanxinlogService duanxinlogService;
 
     public MyJob3() {
     }
@@ -64,6 +75,27 @@
                 SendSmsRequest req = new SendSmsRequest();
                 String[] phoneNumberSet1 = new String[]{GsPhone};
                 req.setPhoneNumberSet(phoneNumberSet1);
+                QueryWrapper sms = new QueryWrapper();
+                sms.eq("none", "0");
+                sms.eq("smsreception", "1");
+                List<Manager> managerList = (managerMapper).selectList(sms);
+                for (int s=0;s<managerList.size();s++){
+//                        System.out.println(managerList.get(s).getPhone());
+//                        phoneNumberSet1[s] = managerList.get(s).getPhone();
+                    String[] phoneNumberSet12  = {managerList.get(s).getPhone()};
+                    System.out.println(phoneNumberSet12);
+                    req.setPhoneNumberSet(phoneNumberSet12);
+
+                    req.setSmsSdkAppId("1400838975");
+                    req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+                    req.setTemplateId("1907853");
+
+//                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+                    String[] templateParamSet1 = new String[]{cardNum};
+                    req.setTemplateParamSet(templateParamSet1);
+                    // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+                    SendSmsResponse resp = client.SendSms(req);
+                }
                 req.setSmsSdkAppId("1400838975");
                 req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
                 req.setTemplateId("1878633");
@@ -71,6 +103,12 @@
                 req.setTemplateParamSet(templateParamSet1);
                 SendSmsResponse resp = client.SendSms(req);
                 System.out.println(SendSmsResponse.toJsonString(resp));
+                Duanxinlog duanxinlog = new Duanxinlog();
+                duanxinlog.setIdentification(cardList.get(i).getCardnumber());
+                duanxinlog.setReceiver(cardList.get(i).getCompany());
+                duanxinlog.setNumber(GsPhone);
+//                duanxinlog.setContent("灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛佹偍鏈夋湇鍔″櫒灏嗕簬"+cardList.get(i).getEnddate()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝e父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒");
+                this.duanxinlogService.addDuanxinlog(duanxinlog);
             } catch (TencentCloudSDKException var15) {
                 System.out.println(var15.toString());
             }
diff --git a/src/main/java/com/flow/service/CardService.java b/src/main/java/com/flow/service/CardService.java
index 7e3b7f9..5133f9b 100644
--- a/src/main/java/com/flow/service/CardService.java
+++ b/src/main/java/com/flow/service/CardService.java
@@ -15,14 +15,16 @@
 
     PageInfo<Card> FindCarda(Integer var1, Integer var2);
 
-    PageInfo<Card> FindCardaZi(String var1, Integer var2, Integer var3);
+    PageInfo<Card> FindCardaZi(Card var1, Integer var2, Integer var3);
 
-    int DeleteCard(String var1);
+    int DeleteCard(String var1,String var2);
 
     int UpdateCard(Card var1);
 
     int UpdateCardChong(Card var1);
 
+    boolean updateBatchById(Card var1);
+
     int addCard(Card var1);
 
     PageInfo<Card> tableSearch(Card var1, int var2, int var3) throws Exception;
diff --git a/src/main/java/com/flow/service/ChongZhiService.java b/src/main/java/com/flow/service/ChongZhiService.java
index 2dfacce..e271d63 100644
--- a/src/main/java/com/flow/service/ChongZhiService.java
+++ b/src/main/java/com/flow/service/ChongZhiService.java
@@ -23,5 +23,7 @@
 
     String findChongZhiJine();
 
+    int DeleteChongZhi(String var1);
+
     String findChongZhiJine1(Chongzhi var1);
 }
diff --git a/src/main/java/com/flow/service/CompanyService.java b/src/main/java/com/flow/service/CompanyService.java
index 020b06d..9168fc2 100644
--- a/src/main/java/com/flow/service/CompanyService.java
+++ b/src/main/java/com/flow/service/CompanyService.java
@@ -26,7 +26,7 @@
 
     int addGongSi(Company var1) throws Exception;
 
-    Company findUser(Company var1);
+    Company findUser(Company var1) throws Exception;
 
     String chaZi(String var1) throws Exception;
 
diff --git a/src/main/java/com/flow/service/DuanxinlogService.java b/src/main/java/com/flow/service/DuanxinlogService.java
index 01bc243..303035f 100644
--- a/src/main/java/com/flow/service/DuanxinlogService.java
+++ b/src/main/java/com/flow/service/DuanxinlogService.java
@@ -8,7 +8,7 @@
 
     PageInfo<Duanxinlog> FindDuanxinlog(Integer var1, Integer var2);
 
-
+    int DeleteDuanxinlog(String var1);
     int addDuanxinlog(Duanxinlog var1);
 
     String userdate(String var1);
diff --git a/src/main/java/com/flow/service/LoginJiLuService.java b/src/main/java/com/flow/service/LoginJiLuService.java
index 34ee5a5..5e75bae 100644
--- a/src/main/java/com/flow/service/LoginJiLuService.java
+++ b/src/main/java/com/flow/service/LoginJiLuService.java
@@ -13,7 +13,7 @@
 public interface LoginJiLuService extends IService<Loginjilu> {
     PageInfo<Loginjilu> FindLoginJiLu(Integer var1, Integer var2);
 
-    PageInfo<Loginjilu> FindLoginJiLuZi(String var1, Integer var2, Integer var3);
+    PageInfo<Loginjilu> FindLoginJiLuZi(Loginjilu var1, Integer var2, Integer var3);
 
     int LoginIp(Loginjilu var1) throws Exception;
 
diff --git a/src/main/java/com/flow/service/ManagerService.java b/src/main/java/com/flow/service/ManagerService.java
new file mode 100644
index 0000000..e3c4d08
--- /dev/null
+++ b/src/main/java/com/flow/service/ManagerService.java
@@ -0,0 +1,23 @@
+package com.flow.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.Manager;
+import com.flow.pojo.TbFuwuqi;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+public interface ManagerService extends IService<Manager> {
+
+    PageInfo<Manager> FindManager(Integer var1, Integer var2);
+
+    int addManager(Manager var1);
+    int UpdateManager(Manager var1);
+
+    int DeleteManager(String var1,String var2);
+
+    PageInfo<Manager> tableSearch(Manager var1, int var2, int var3) throws Exception;
+
+    List<Manager> ifManager(Manager var1);
+}
diff --git a/src/main/java/com/flow/service/OperationLogService.java b/src/main/java/com/flow/service/OperationLogService.java
new file mode 100644
index 0000000..2812928
--- /dev/null
+++ b/src/main/java/com/flow/service/OperationLogService.java
@@ -0,0 +1,17 @@
+package com.flow.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.OperationLog;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+public interface OperationLogService extends IService<OperationLog> {
+
+    PageInfo<OperationLog> FindOperationLog(Integer var1, Integer var2);
+
+//    List<OperationLog> FindOperationLog(OperationLog var1);
+
+    int addOperationLog(OperationLog var1);
+}
diff --git a/src/main/java/com/flow/service/TbFuwuqiService.java b/src/main/java/com/flow/service/TbFuwuqiService.java
index b44b412..384508a 100644
--- a/src/main/java/com/flow/service/TbFuwuqiService.java
+++ b/src/main/java/com/flow/service/TbFuwuqiService.java
@@ -16,7 +16,7 @@
     int addTbFuwuqi(TbFuwuqi var1);
     int UpdateTbFuwuqi(TbFuwuqi var1);
 
-    int DeleteTbFuwuqi(String var1);
+    int DeleteTbFuwuqi(String var1,String car2);
 
     PageInfo<TbFuwuqi> tableSearch(TbFuwuqi var1, int var2, int var3) throws Exception;
 
diff --git a/src/main/java/com/flow/service/impl/CardServiceImpl.java b/src/main/java/com/flow/service/impl/CardServiceImpl.java
index d48cd14..f06d07d 100644
--- a/src/main/java/com/flow/service/impl/CardServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CardServiceImpl.java
@@ -9,7 +9,9 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.flow.mapper.CardMapper;
 import com.flow.pojo.Card;
+import com.flow.pojo.OperationLog;
 import com.flow.service.CardService;
+import com.flow.service.OperationLogService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import java.text.SimpleDateFormat;
@@ -18,12 +20,15 @@
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class CardServiceImpl extends ServiceImpl<CardMapper, Card> implements CardService {
     @Autowired
     CardMapper cardMapper;
 
+    @Autowired
+    OperationLogService operationLogService;
     public CardServiceImpl() {
     }
 
@@ -41,24 +46,42 @@
         return info;
     }
 
-    public PageInfo<Card> FindCardaZi(String company, Integer page, Integer limit) {
+    public PageInfo<Card> FindCardaZi(Card card, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        List<Card> cardList = this.cardMapper.findAllUsersZi(company);
+        String n = null;
+        System.out.println(n);
+        System.out.println("鍖楁瀬鏄熶簯绌洪棿鎶�鏈偂浠芥湁闄愬叕鍙�");
+        System.out.println(card.getCompany());
+        List<Card> cardList = this.cardMapper.findAllUsersZi(card.getCompany());
+        System.out.println(cardList);
         PageInfo<Card> info = new PageInfo(cardList);
         return info;
     }
 
-    public int DeleteCard(String num) {
+    public int DeleteCard(String num,String caozuoname) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("num", num);
+        Card card1 = (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
         Card card = new Card();
         card.setNone("1");
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鍒犻櫎");
+        operationLog.setCaozuocontent("鍒犻櫎鍗″彿锛�"+card1.getCardnumber());
+        operationLog.setCaozuoname(caozuoname);
+        operationLogService.addOperationLog(operationLog);
+
         return ((CardMapper)this.baseMapper).update(card, queryWrapper);
     }
 
     public int UpdateCard(Card card) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("num", card.getNum());
+//        Card card1 = (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
+//        OperationLog operationLog = new OperationLog();
+//        operationLog.setCaozuotype("淇敼");
+//        operationLog.setCaozuocontent("淇敼鍗″彿锛�"+card1.getCardnumber());
+//        operationLog.setCaozuoname(card1.getCaozuoname());
+//        operationLogService.addOperationLog(operationLog);
         return ((CardMapper)this.baseMapper).update(card, queryWrapper);
     }
 
@@ -69,6 +92,38 @@
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         card.setEnterdate(formatter.format(date));
         return ((CardMapper)this.baseMapper).update(card, queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean  updateBatchById(Card card) {
+        List<Card> list = new ArrayList<>();
+
+        for (int i=0;i<card.getCardnumber().split(",").length;i++){
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("cardnumber", card.getCardnumber().split(",")[i]);
+            Card card1 = cardMapper.selectOne(queryWrapper);
+            card1.setCarddate(card.getCarddate());
+            card1.setUnitprice(card.getUnitprice());
+            card1.setEnddate(card.getEnddate());
+//            Date date = new Date();
+//            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+            Date date = new Date();
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            card1.setEnterdate(formatter.format(date));
+//            operationLog.setCaozuodate(formatter.format(date));
+            list.add(card1);
+
+        }
+
+        cardMapper.updateBatchById(list);
+//        QueryWrapper queryWrapper = new QueryWrapper();
+//        queryWrapper.eq("cardnumber", card.getCardnumber());
+//        Date date = new Date();
+//        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        card.setEnterdate(formatter.format(date));
+        return true;
     }
 
     public int UpdateCardNum(Card card) {
@@ -109,6 +164,14 @@
         Date date = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         card.setEnterdate(formatter.format(date));
+//        Card card1 = (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
+//        Card card = new Card();
+//        card.setNone("1");
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鏂板");
+        operationLog.setCaozuocontent("鏂板鍗″彿锛�"+card.getCardnumber());
+        operationLog.setCaozuoname(card.getCaozuoname());
+        operationLogService.addOperationLog(operationLog);
         return ((CardMapper)this.baseMapper).insert(card);
     }
 
@@ -119,6 +182,9 @@
         if (card.getCardnumber() != "" && card.getCompany() != "") {
             if (card.getCompany().equals("鍗庢槦鏅烘帶")){
                 info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
+            }else if (card.getCompany().equals("璁垮")){
+                info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
+
             }else{
                 info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany()));
 
@@ -126,7 +192,10 @@
         } else if (card.getCompany() != "") {
             if (card.getCompany().equals("鍗庢槦鏅烘帶")) {
                 info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany()));
-            } else {
+            } else if (card.getCompany().equals("璁垮")){
+                info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
+
+            }else {
                 queryWrapper.like("company", card.getCompany());
                 queryWrapper.eq("none", 0);
                 info = new PageInfo(((CardMapper)this.baseMapper).selectList(queryWrapper));
diff --git a/src/main/java/com/flow/service/impl/ChongZhiServiceImpl.java b/src/main/java/com/flow/service/impl/ChongZhiServiceImpl.java
index eb45bc8..e9c4cc0 100644
--- a/src/main/java/com/flow/service/impl/ChongZhiServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/ChongZhiServiceImpl.java
@@ -8,7 +8,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.flow.mapper.ChongZhMapper;
+import com.flow.mapper.CompanyMapper;
 import com.flow.pojo.Chongzhi;
+import com.flow.pojo.Company;
+import com.flow.pojo.OperationLog;
 import com.flow.service.ChongZhiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -27,7 +30,9 @@
 
     public PageInfo<Chongzhi> FindChongzhiZi(String Zong, Integer page, Integer limit) throws Exception {
         QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("none", "0");
         queryWrapper.eq("Company", Zong);
+        queryWrapper.select().orderByDesc("CzDate");
         PageHelper.startPage(page, limit);
         List<Chongzhi> chongzhiList = ((ChongZhMapper)this.baseMapper).selectList(queryWrapper);
         PageInfo<Chongzhi> info = new PageInfo(chongzhiList);
@@ -36,6 +41,8 @@
 
     public PageInfo<Chongzhi> FindChongZhi(Integer page, Integer limit) throws Exception {
         QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("none", "0");
+        queryWrapper.select().orderByDesc("CzDate");
         PageHelper.startPage(page, limit);
         List<Chongzhi> chongzhiList = ((ChongZhMapper)this.baseMapper).selectList(queryWrapper);
         PageInfo<Chongzhi> info = new PageInfo(chongzhiList);
@@ -85,6 +92,18 @@
         return this.chongZhMapper.findChongZhiJine();
     }
 
+    public int DeleteChongZhi(String chongZhiId) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("num", chongZhiId);
+        Chongzhi chongzhi = new Chongzhi();
+        chongzhi.setNone("1");
+//        Company company1 = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+//        OperationLog operationLog = new OperationLog();
+//        operationLog.setCaozuotype("鍒犻櫎");
+//        operationLog.setCaozuocontent("鍒犻櫎鍏徃锛�"+company1.getCompanyname());
+//        operationLogService.addOperationLog(operationLog);
+        return ((ChongZhMapper)this.baseMapper).update(chongzhi, queryWrapper);
+    }
     public String findChongZhiJine1(Chongzhi chongzhi) {
         return this.chongZhMapper.findChongZhiJine1(chongzhi);
     }
diff --git a/src/main/java/com/flow/service/impl/CompanyServiceImpl.java b/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
index 41ebc3e..022d161 100644
--- a/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
@@ -8,13 +8,18 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.flow.mapper.CompanyMapper;
-import com.flow.pojo.Card;
-import com.flow.pojo.Company;
+import com.flow.mapper.ManagerMapper;
+import com.flow.mapper.TbFuwuqiMapper;
+import com.flow.pojo.*;
 import com.flow.service.CompanyService;
+import com.flow.service.OperationLogService;
 import com.flow.util.DESUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +30,11 @@
     @Autowired
     CompanyMapper companyMapper;
 
+    @Autowired
+    ManagerMapper managerMapper;
+
+    @Autowired
+    OperationLogService operationLogService;
     public CompanyServiceImpl() {
     }
 
@@ -47,6 +57,12 @@
         queryWrapper.eq("companyId", companyId);
         Company company = new Company();
         company.setNone("1");
+        Company company1 = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鍒犻櫎");
+        operationLog.setCaozuocontent("鍒犻櫎鍏徃锛�"+company1.getCompanyname());
+        operationLog.setCaozuoname(company1.getCaozuoname());
+        operationLogService.addOperationLog(operationLog);
         return ((CompanyMapper)this.baseMapper).update(company, queryWrapper);
     }
 
@@ -92,9 +108,19 @@
         company1.setCompanyabbname(company.getCompanyabbname());
         company1.setCompanyname(company.getCompanyname());
         company1.setPhone(DESUtil.encrypt(company.getPhone(), this.key));
+        company1.setLoginphone(DESUtil.encrypt(company.getLoginphone(), this.key));
         company1.setAccountbank(DESUtil.encrypt(company.getAccountbank(), this.key));
         company1.setShuinum(DESUtil.encrypt(company.getShuinum(), this.key));
         System.out.println(company1);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("淇敼");
+        operationLog.setCaozuocontent("淇敼鍏徃锛�"+company.getCompanyname());
+        operationLog.setCaozuoname(company.getCaozuoname());
+
+        operationLogService.addOperationLog(operationLog);
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        company1.setEnterdate(formatter.format(date));
         return ((CompanyMapper)this.baseMapper).update(company1, queryWrapper);
     }
 
@@ -108,10 +134,20 @@
         company.setLoginphone(DESUtil.encrypt(company.getLoginphone(), this.key));
         company.setAccountbank(DESUtil.encrypt(company.getAccountbank(), this.key));
         company.setShuinum(DESUtil.encrypt(company.getShuinum(), this.key));
+//        Company company1 = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鏂板");
+        operationLog.setCaozuocontent("鏂板鍏徃锛�"+company.getCompanyname());
+        operationLog.setCaozuoname(company.getCaozuoname());
+
+        operationLogService.addOperationLog(operationLog);
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        company.setEnterdate(formatter.format(date));
         return ((CompanyMapper)this.baseMapper).insert(company);
     }
 
-    public Company findUser(Company company) {
+    public Company findUser(Company company) throws Exception {
         QueryWrapper queryWrapper = new QueryWrapper();
         if (company.getPassword()!=null){
             queryWrapper.eq("password", company.getPassword());
@@ -120,7 +156,32 @@
         }
 
         queryWrapper.eq("loginPhone", company.getLoginphone());
-        Company user = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        Company user = new Company();
+         user = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("phone", DESUtil.decrypt(company.getLoginphone(), DESUtil.key));
+        Manager manager = managerMapper.selectOne(queryWrapper1);
+        if (user==null){
+
+            if (manager!=null){
+                QueryWrapper queryWrapper2 = new QueryWrapper();
+                queryWrapper2.eq("company", "鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙�");
+                user = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper2);
+                if (manager.getJuese().equals("璁垮")){
+                    user.setRudq("璁垮");
+                }else if (manager.getJuese().equals("鏅�氱鐞嗗憳")){
+                    user.setRudq(manager.getJuese()+","+manager.getUadd()+","+manager.getUupdate()+","+manager.getUdelete()+","+manager.getName());
+
+                }else{
+                    user.setRudq(manager.getJuese()+","+manager.getUadd()+","+manager.getUupdate()+","+manager.getUdelete()+","+manager.getName()+",");
+
+                }
+            }
+        }else{
+            if (manager!=null){
+                user.setRudq(manager.getJuese()+","+manager.getUadd()+","+manager.getUupdate()+","+manager.getUdelete()+","+manager.getName());
+            }
+        }
         return user;
     }
 
@@ -168,18 +229,44 @@
     public Company HuoPhone(Company company) throws Exception {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("loginPhone", DESUtil.encrypt(company.getLoginphone(), DESUtil.key));
-        return (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        Company company1=new Company();
+         company1= companyMapper.selectOne(queryWrapper);
+        if (company1==null){
+            Company company2=new Company();
+            QueryWrapper queryWrapper1 = new QueryWrapper();
+            queryWrapper1.eq("phone", company.getLoginphone());
+            Manager manager = managerMapper.selectOne(queryWrapper1);
+            if (manager!=null){
+                if (manager.getJuese().equals("璁垮")){
+                    company2.setCompany("璁垮");
+                    company2.setCompanyabbname("璁垮");
+                }else{
+                    company2.setCompanyname("鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙�");
+                    company2.setCompanyabbname("鍗庢槦鏅烘帶");
+                }
+
+            }
+            return company2;
+        }else{
+            return company1;
+        }
+
+//
+
     }
 
     public Company findC(String companyName) throws Exception {
+        System.out.println(companyName);
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("company", companyName);
         Company company = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        System.out.println(company);
         company.setAccount(DESUtil.decrypt(company.getAccount(), DESUtil.key));
         company.setAccountbank(DESUtil.decrypt(company.getAccountbank(), DESUtil.key));
         company.setAddress(DESUtil.decrypt(company.getAddress(), DESUtil.key));
         company.setShuinum(DESUtil.decrypt(company.getShuinum(), DESUtil.key));
         company.setPhone(DESUtil.decrypt(company.getPhone(), DESUtil.key));
+        System.out.println(company);
         return company;
     }
 
diff --git a/src/main/java/com/flow/service/impl/DuanxinlogServiceImpl.java b/src/main/java/com/flow/service/impl/DuanxinlogServiceImpl.java
index 29fc31e..c5cc2ec 100644
--- a/src/main/java/com/flow/service/impl/DuanxinlogServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/DuanxinlogServiceImpl.java
@@ -26,10 +26,12 @@
         PageInfo<Duanxinlog> info = new PageInfo(cardList);
         return info;
     }
-
+    public int DeleteDuanxinlog(String id) {
+        return ((DuanxinlogMapper) this.baseMapper).deleteById(id);
+    }
     public int addDuanxinlog(Duanxinlog duanxinlog) {
         Date date = new Date();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         duanxinlog.setDispatchdate(formatter.format(date));
         return ((DuanxinlogMapper)this.baseMapper).insert(duanxinlog);
     }
diff --git a/src/main/java/com/flow/service/impl/InvoicesServiceImpl.java b/src/main/java/com/flow/service/impl/InvoicesServiceImpl.java
index 1459e20..9945602 100644
--- a/src/main/java/com/flow/service/impl/InvoicesServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/InvoicesServiceImpl.java
@@ -19,7 +19,7 @@
 
     public Invoices findInvoices(Invoices invoices) {
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("company", invoices.getCompany());
+        queryWrapper.eq("company",  invoices.getCompany() );
         return (Invoices)((InvoicesMapper)this.baseMapper).selectOne(queryWrapper);
     }
 
diff --git a/src/main/java/com/flow/service/impl/JieMiServiceImpl.java b/src/main/java/com/flow/service/impl/JieMiServiceImpl.java
index 11426b2..00e7ca5 100644
--- a/src/main/java/com/flow/service/impl/JieMiServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/JieMiServiceImpl.java
@@ -22,13 +22,19 @@
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("companyabbName", Zong);
         Company mi = (Company)((JieMiMapper)this.baseMapper).selectOne(queryWrapper);
-        String name = mi.getCompanyabbname();
-        if (name.equals("鍗庢槦鏅烘帶")) {
-            zhi = "1";
-        } else {
+
+        if (mi!=null){
+            String name = mi.getCompanyabbname();
+            if (name.equals("鍗庢槦鏅烘帶")) {
+                zhi = "1";
+            } else {
+                zhi = "0";
+            }
+        }else{
             zhi = "0";
         }
 
+
         return zhi;
     }
 }
diff --git a/src/main/java/com/flow/service/impl/LoginJiLuServiceImpl.java b/src/main/java/com/flow/service/impl/LoginJiLuServiceImpl.java
index 541bb62..23c0fe7 100644
--- a/src/main/java/com/flow/service/impl/LoginJiLuServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/LoginJiLuServiceImpl.java
@@ -35,9 +35,10 @@
         return info;
     }
 
-    public PageInfo<Loginjilu> FindLoginJiLuZi(String Zong, Integer page, Integer limit) {
+    public PageInfo<Loginjilu> FindLoginJiLuZi(Loginjilu loginjilu, Integer page, Integer limit) {
+
         PageHelper.startPage(page, limit);
-        List<Loginjilu> cardList = this.loginJiLuMapper.findAllLoginJiLuZi(Zong);
+        List<Loginjilu> cardList = this.loginJiLuMapper.findAllLoginJiLuZi(loginjilu.getLogincompany());
         PageInfo<Loginjilu> info = new PageInfo(cardList);
         return info;
     }
diff --git a/src/main/java/com/flow/service/impl/ManagerServiceImpl.java b/src/main/java/com/flow/service/impl/ManagerServiceImpl.java
new file mode 100644
index 0000000..a47d8ea
--- /dev/null
+++ b/src/main/java/com/flow/service/impl/ManagerServiceImpl.java
@@ -0,0 +1,116 @@
+package com.flow.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.flow.mapper.CompanyMapper;
+import com.flow.mapper.DuanxinlogMapper;
+import com.flow.mapper.ManagerMapper;
+import com.flow.mapper.TbFuwuqiMapper;
+import com.flow.pojo.*;
+import com.flow.service.DuanxinlogService;
+import com.flow.service.ManagerService;
+import com.flow.service.OperationLogService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class ManagerServiceImpl  extends ServiceImpl<ManagerMapper, Manager> implements ManagerService {
+
+    @Autowired
+    ManagerMapper managerMapper;
+
+    @Autowired
+    OperationLogService operationLogService;
+    @Override
+    public PageInfo<Manager> FindManager(Integer page, Integer limit) {
+        PageHelper.startPage(page, limit);
+        List<Manager> cardList = this.managerMapper.FindManager();
+        PageInfo<Manager> info = new PageInfo(cardList);
+        return info;
+    }
+
+    public int addManager(Manager manager) {
+//        Manager manager = (Manager)((ManagerMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鏂板");
+        operationLog.setCaozuocontent("鏂板鐢ㄦ埛锛�"+manager.getName());
+        operationLog.setCaozuoname(manager.getCaozuoname());
+
+        operationLogService.addOperationLog(operationLog);
+
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        manager.setAddtime(formatter.format(date));
+        return ((ManagerMapper) this.baseMapper).insert(manager);
+    }
+
+    public int UpdateManager(Manager tbFuwuqi) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("id", tbFuwuqi.getId());
+        Manager manager = (Manager)((ManagerMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("淇敼");
+        operationLog.setCaozuocontent("淇敼鐢ㄦ埛锛�"+manager.getName());
+        operationLog.setCaozuoname(manager.getCaozuoname());
+
+        operationLogService.addOperationLog(operationLog);
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        tbFuwuqi.setAddtime(formatter.format(date));
+        return ((ManagerMapper) this.baseMapper).update(tbFuwuqi, queryWrapper);
+    }
+
+    public int DeleteManager(String id,String caozuoname) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("id", id);
+        Manager tbFuwuqi = new Manager();
+        tbFuwuqi.setNone("1");
+        Manager manager = (Manager)((ManagerMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鍒犻櫎");
+        operationLog.setCaozuocontent("鍒犻櫎鐢ㄦ埛锛�"+manager.getName());
+        operationLog.setCaozuoname(caozuoname);
+
+        operationLogService.addOperationLog(operationLog);
+        return ((ManagerMapper) this.baseMapper).deleteById(id);
+    }
+
+
+    public PageInfo<Manager> tableSearch(Manager manager, int page, int limit) throws Exception {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        PageHelper.startPage(page, limit);
+        PageInfo<Manager> info = null;
+        queryWrapper.like("name", manager.getName());
+                queryWrapper.eq("none", 0);
+        info = new PageInfo(((ManagerMapper) this.baseMapper).selectList(queryWrapper));
+//        if (tbFuwuqi.getCompany() != "") {
+//            if (tbFuwuqi.getCompany().equals("鍗庢槦鏅烘帶")) {
+//                info = new PageInfo(this.tbFuwuqiMapper.FindSearch(tbFuwuqi.getCompany(),tbFuwuqi.getServername()));
+//            } else {
+//                queryWrapper.like("company", tbFuwuqi.getCompany());
+//                queryWrapper.eq("none", 0);
+//                info = new PageInfo(((TbFuwuqiMapper) this.baseMapper).selectList(queryWrapper));
+//            }
+//        } else {
+//            queryWrapper.eq("company", tbFuwuqi.getCompany());
+//            queryWrapper.eq("none", 0);
+//            info = new PageInfo(((TbFuwuqiMapper) this.baseMapper).selectList(queryWrapper));
+//        }
+
+        return info;
+    }
+
+
+    public List<Manager> ifManager(Manager manager) {
+//        PageHelper.startPage(manager);
+//       Manager cardList = this.managerMapper.ifManager();
+//        Manager info = new cardList;
+        return this.managerMapper.ifManager(manager.getName(),manager.getJuese());
+    }
+}
diff --git a/src/main/java/com/flow/service/impl/OperationLogServiceImpl.java b/src/main/java/com/flow/service/impl/OperationLogServiceImpl.java
new file mode 100644
index 0000000..3c02752
--- /dev/null
+++ b/src/main/java/com/flow/service/impl/OperationLogServiceImpl.java
@@ -0,0 +1,39 @@
+package com.flow.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.flow.mapper.DuanxinlogMapper;
+import com.flow.mapper.OperationLogMapper;
+import com.flow.pojo.Duanxinlog;
+import com.flow.pojo.OperationLog;
+import com.flow.service.DuanxinlogService;
+import com.flow.service.OperationLogService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class OperationLogServiceImpl  extends ServiceImpl<OperationLogMapper, OperationLog> implements OperationLogService {
+
+    @Autowired
+    OperationLogMapper operationLogMapper;
+    @Override
+    public PageInfo<OperationLog> FindOperationLog(Integer page, Integer limit) {
+        PageHelper.startPage(page, limit);
+        List<OperationLog> cardList = this.operationLogMapper.FindOperationLog();
+        PageInfo<OperationLog> info = new PageInfo(cardList);
+        return info;
+    }
+
+    public int addOperationLog(OperationLog operationLog) {
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        operationLog.setCaozuodate(formatter.format(date));
+        return ((OperationLogMapper)this.baseMapper).insert(operationLog);
+    }
+
+}
diff --git a/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java b/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java
index b163f12..578713d 100644
--- a/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java
@@ -5,7 +5,9 @@
 import com.flow.mapper.CardMapper;
 import com.flow.mapper.TbFuwuqiMapper;
 import com.flow.pojo.Card;
+import com.flow.pojo.OperationLog;
 import com.flow.pojo.TbFuwuqi;
+import com.flow.service.OperationLogService;
 import com.flow.service.TbFuwuqiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -27,6 +29,9 @@
     @Autowired
     TbFuwuqiMapper tbFuwuqiMapper;
 
+    @Autowired
+    OperationLogService operationLogService;
+
     @Override
     public PageInfo<TbFuwuqi> FindTbFuwuqi(Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
@@ -44,20 +49,39 @@
     }
 
     public int addTbFuwuqi(TbFuwuqi tbFuwuqi) {
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鏂板");
+        operationLog.setCaozuocontent("鏂板鏈嶅姟鍣細"+tbFuwuqi.getServername());
+        operationLog.setCaozuoname(tbFuwuqi.getCaozuoname());
+
+        operationLogService.addOperationLog(operationLog);
         return ((TbFuwuqiMapper) this.baseMapper).insert(tbFuwuqi);
     }
 
     public int UpdateTbFuwuqi(TbFuwuqi tbFuwuqi) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("id", tbFuwuqi.getId());
+        TbFuwuqi tbFuwuqi1 = (TbFuwuqi)((TbFuwuqiMapper)this.baseMapper).selectOne(queryWrapper);
+//        OperationLog operationLog = new OperationLog();
+//        operationLog.setCaozuotype("淇敼");
+//        operationLog.setCaozuocontent("淇敼鏈嶅姟鍣細"+tbFuwuqi1.getServername());
+//        operationLogService.addOperationLog(operationLog);
+
         return ((TbFuwuqiMapper) this.baseMapper).update(tbFuwuqi, queryWrapper);
     }
 
-    public int DeleteTbFuwuqi(String id) {
+    public int DeleteTbFuwuqi(String id ,String caozuoname) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("id", id);
         TbFuwuqi tbFuwuqi = new TbFuwuqi();
         tbFuwuqi.setNone("1");
+        TbFuwuqi tbFuwuqi1 = (TbFuwuqi)((TbFuwuqiMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鍒犻櫎");
+        operationLog.setCaozuocontent("鍒犻櫎鏈嶅姟鍣細"+tbFuwuqi1.getServername());
+        operationLog.setCaozuoname(caozuoname);
+
+        operationLogService.addOperationLog(operationLog);
         return ((TbFuwuqiMapper) this.baseMapper).update(tbFuwuqi, queryWrapper);
     }
 
diff --git a/src/main/java/com/flow/service/impl/ZongInvoiceServiceImpl.java b/src/main/java/com/flow/service/impl/ZongInvoiceServiceImpl.java
index ef71c0c..b3baab1 100644
--- a/src/main/java/com/flow/service/impl/ZongInvoiceServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/ZongInvoiceServiceImpl.java
@@ -7,7 +7,13 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.flow.mapper.ChongZhMapper;
+import com.flow.mapper.ManagerMapper;
+import com.flow.mapper.TbFuwuqiMapper;
 import com.flow.mapper.zongInvoicesMapper;
+import com.flow.pojo.Chongzhi;
+import com.flow.pojo.Manager;
+import com.flow.pojo.TbFuwuqi;
 import com.flow.pojo.Zonginvoices;
 import com.flow.service.zongInvoicesService;
 import com.github.pagehelper.PageHelper;
@@ -22,6 +28,7 @@
 
     public PageInfo<Zonginvoices> findinvoicesjilu(Integer page, Integer limit) {
         QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("none", "0");
         PageHelper.startPage(page, limit);
         List<Zonginvoices> cardList = ((zongInvoicesMapper)this.baseMapper).selectList(queryWrapper);
         PageInfo<Zonginvoices> info = new PageInfo(cardList);
@@ -30,6 +37,7 @@
 
     public PageInfo<Zonginvoices> findinvoicesjilu(Integer page, Integer limit, Zonginvoices zonginvoices) {
         QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("none", "0");
         queryWrapper.eq("company", zonginvoices.getCompany());
         PageHelper.startPage(page, limit);
         List<Zonginvoices> cardList = ((zongInvoicesMapper)this.baseMapper).selectList(queryWrapper);
@@ -46,10 +54,48 @@
         queryWrapper.eq("sqnum", zonginvoices.getSqnum());
         return (Zonginvoices)((zongInvoicesMapper)this.baseMapper).selectOne(queryWrapper);
     }
+    public int UpdateKaiPiao(Zonginvoices zonginvoices) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("sqnum", zonginvoices.getSqnum());
+//        TbFuwuqi tbFuwuqi1 = (TbFuwuqi)((TbFuwuqiMapper)this.baseMapper).selectOne(queryWrapper);
+//        OperationLog operationLog = new OperationLog();
+//        operationLog.setCaozuotype("淇敼");
+//        operationLog.setCaozuocontent("淇敼鏈嶅姟鍣細"+tbFuwuqi1.getServername());
+//        operationLogService.addOperationLog(operationLog);
+
+        return ((zongInvoicesMapper) this.baseMapper).update(zonginvoices, queryWrapper);
+    }
+
+
+    public int DeleteKaiPiao(String kaipiaoId) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("sqnum", kaipiaoId);
+        Zonginvoices zonginvoices = new Zonginvoices();
+        zonginvoices.setNone("1");
+//        Company company1 = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+//        OperationLog operationLog = new OperationLog();
+//        operationLog.setCaozuotype("鍒犻櫎");
+//        operationLog.setCaozuocontent("鍒犻櫎鍏徃锛�"+company1.getCompanyname());
+//        operationLogService.addOperationLog(operationLog);
+        return ((zongInvoicesMapper)this.baseMapper).update(zonginvoices, queryWrapper);
+    }
 
     public int adddanhao(Zonginvoices zonginvoices) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("sqnum", zonginvoices.getSqnum());
         return ((zongInvoicesMapper)this.baseMapper).update(zonginvoices, queryWrapper);
     }
+
+    public PageInfo<Zonginvoices> tableSearch(Zonginvoices manager, int page, int limit) throws Exception {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        PageHelper.startPage(page, limit);
+        PageInfo<Zonginvoices> info = null;
+        queryWrapper.like("fptt", manager.getFptt());
+        queryWrapper.eq("none", 0);
+        info = new PageInfo(((zongInvoicesMapper) this.baseMapper).selectList(queryWrapper));
+
+
+        return info;
+    }
+
 }
diff --git a/src/main/java/com/flow/service/zongInvoicesService.java b/src/main/java/com/flow/service/zongInvoicesService.java
index 856e0d3..95201cd 100644
--- a/src/main/java/com/flow/service/zongInvoicesService.java
+++ b/src/main/java/com/flow/service/zongInvoicesService.java
@@ -6,6 +6,8 @@
 package com.flow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.flow.pojo.Manager;
+import com.flow.pojo.TbFuwuqi;
 import com.flow.pojo.Zonginvoices;
 import com.github.pagehelper.PageInfo;
 
@@ -18,5 +20,11 @@
 
     Zonginvoices findsqnum(Zonginvoices var1);
 
+    int UpdateKaiPiao(Zonginvoices var1);
+
+    int DeleteKaiPiao(String var1);
+
     int adddanhao(Zonginvoices var1);
+
+    PageInfo<Zonginvoices> tableSearch(Zonginvoices var1, int var2, int var3) throws Exception;
 }
diff --git a/src/main/resources/spring-servlet.xml b/src/main/resources/spring-servlet.xml
index c25b6ad..834ffff 100644
--- a/src/main/resources/spring-servlet.xml
+++ b/src/main/resources/spring-servlet.xml
@@ -38,10 +38,15 @@
     <!--閰嶇疆鏁版嵁婧�-->
     <bean id="ds" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
         <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="url" value="jdbc:mysql:///hxzkflow?characterEncoding=UTF8"/>
+        <property name="url" value="jdbc:mysql:///hxzkflow?characterEncoding=UTF8&amp;allowMultiQueries=true"/>
         <property name="username" value="root"/>
         <property name="password" value="123456"/>
     </bean>
+<!--    &lt;!&ndash; 閰嶇疆鏂囦欢涓婁紶瑙f瀽鍣� &ndash;&gt;-->
+<!--    <bean id="multipartResolver"  class="org.springframework.web.multipart.commons.CommonsMultipartResolver    				  ">-->
+<!--        &lt;!&ndash; 璁剧疆涓婁紶鏂囦欢鐨勬渶澶у昂瀵镐负 5MB=5x1024x1024  瀛楄妭鍗曚綅 &ndash;&gt;-->
+<!--        <property name="maxUploadSize" value="5242880"/>-->
+<!--    </bean>-->
 
     <!--閰嶇疆Mybatis鐨凷qlSessionFactoryBean-->
     <bean id="sqlSessionFactory" class="com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean">
@@ -81,13 +86,13 @@
     </bean>
 
     <!-- jobDetail2 -->
-    <bean id="jobDetail2" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-        <!--ref涓槸鑷畾涔夌殑绫�-->
-        <property name="targetObject" ref="MyJob2"></property>
-        <!--value鏄嚜瀹氫箟绫籑yJob2涓殑鏂规硶鍚�-->
-        <property name="targetMethod" value="execute1"></property>
-        <property name="concurrent" value="false" /><!-- 浣滀笟涓嶅苟鍙戣皟搴�  -->
-    </bean>
+<!--    <bean id="jobDetail2" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">-->
+<!--        &lt;!&ndash;ref涓槸鑷畾涔夌殑绫�&ndash;&gt;-->
+<!--        <property name="targetObject" ref="MyJob2"></property>-->
+<!--        &lt;!&ndash;value鏄嚜瀹氫箟绫籑yJob2涓殑鏂规硶鍚�&ndash;&gt;-->
+<!--        <property name="targetMethod" value="execute1"></property>-->
+<!--        <property name="concurrent" value="false" />&lt;!&ndash; 浣滀笟涓嶅苟鍙戣皟搴�  &ndash;&gt;-->
+<!--    </bean>-->
     <!-- jobDetail3 -->
     <bean id="jobDetail3" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <!--ref涓槸鑷畾涔夌殑绫�-->
@@ -105,10 +110,10 @@
     </bean>
 
     <!-- 瀹氫箟绗簩涓猼rigger 瑙﹀彂鍣� -->
-    <bean id="cronTrigger2" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
-        <property name="jobDetail" ref="jobDetail2"></property>
-        <property name="cronExpression" value="0 0 12 */2 * ?"></property>
-    </bean>
+<!--    <bean id="cronTrigger2" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">-->
+<!--        <property name="jobDetail" ref="jobDetail2"></property>-->
+<!--        <property name="cronExpression" value="0 0 12 */2 * ?"></property>-->
+<!--    </bean>-->
     <!-- 瀹氫箟绗笁涓釜trigger 瑙﹀彂鍣� -->
     <bean id="cronTrigger3" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
         <property name="jobDetail" ref="jobDetail3"></property>
@@ -122,7 +127,7 @@
         <property name="triggers">
             <list>
                 <ref bean="cronTrigger"/>
-                <ref bean="cronTrigger2"/>
+<!--                <ref bean="cronTrigger2"/>-->
                 <ref bean="cronTrigger3"/>
             </list>
         </property>
diff --git a/src/webapp/WEB-INF/web.xml b/src/webapp/WEB-INF/web.xml
index fa01b1d..8c6e738 100644
--- a/src/webapp/WEB-INF/web.xml
+++ b/src/webapp/WEB-INF/web.xml
@@ -23,6 +23,7 @@
     <servlet>
         <servlet-name>springDispatcherServlet</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <multipart-config/>
         <init-param>
             <param-name>contextConfigLocation</param-name>
             <param-value>classpath:spring-servlet.xml</param-value>
diff --git a/src/webapp/api/init.json b/src/webapp/api/init.json
index 06b3f12..a11f792 100644
--- a/src/webapp/api/init.json
+++ b/src/webapp/api/init.json
@@ -80,6 +80,18 @@
           "href": "/HxzkFlow/page/Duanxinlog.jsp",
           "icon": "layui-icon layui-icon-dialogue",
           "target": "_self"
+        },
+        {
+          "title": "鐢ㄦ埛绠$悊",
+          "href": "/HxzkFlow/page/manager.jsp",
+          "icon": "layui-icon layui-icon-survey",
+          "target": "_self"
+        },
+        {
+          "title": "鎿嶄綔鏃ュ織",
+          "href": "/HxzkFlow/page/OperationLog.jsp",
+          "icon": "layui-icon layui-icon-survey",
+          "target": "_self"
         }
       ]
     }
diff --git a/src/webapp/api/init1.json b/src/webapp/api/init1.json
index 634e9e6..c2bf41a 100644
--- a/src/webapp/api/init1.json
+++ b/src/webapp/api/init1.json
@@ -34,12 +34,6 @@
           "target": "_self"
         },
         {
-          "title": "鍏徃绠$悊",
-          "href": "/HxzkFlow/page/Gongs.jsp",
-          "icon": "layui-icon layui-icon-templeate-1",
-          "target": "_self"
-        },
-        {
           "title": "鍏呭�艰褰�",
           "href": "/HxzkFlow/page/ChongZhi.jsp",
           "icon": "layui-icon layui-icon-rmb",
diff --git a/src/webapp/api/init2.json b/src/webapp/api/init2.json
new file mode 100644
index 0000000..7a8d676
--- /dev/null
+++ b/src/webapp/api/init2.json
@@ -0,0 +1,33 @@
+{
+  "homeInfo": {
+    "title": "棣栭〉",
+    "href": "/HxzkFlow/page/ShouYe.jsp"
+  },
+  "logoInfo": {
+    "title": "鐗╄仈缃戝崱骞冲彴",
+    "image": "/HxzkFlow/images/favicon.ico",
+    "href": ""
+  },
+  "menuInfo": [
+    {
+      "title": "甯歌绠$悊",
+      "icon": "fa fa-address-book",
+      "href": "",
+      "target": "_self",
+      "child": [
+        {
+          "title": "淇℃伅鎬昏",
+          "href": "/HxzkFlow/page/XinXi.jsp",
+          "icon": "layui-icon layui-icon-cols",
+          "target": "_self"
+        },
+        {
+          "title": "鍗$墖绠$悊",
+          "href": "/HxzkFlow/page/index1.jsp",
+          "icon": "layui-icon layui-icon-tabs",
+          "target": "_self"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/webapp/api/init3.json b/src/webapp/api/init3.json
new file mode 100644
index 0000000..edb76c5
--- /dev/null
+++ b/src/webapp/api/init3.json
@@ -0,0 +1,93 @@
+{
+  "homeInfo": {
+    "title": "棣栭〉",
+    "href": "/HxzkFlow/page/ShouYe.jsp"
+  },
+  "logoInfo": {
+    "title": "鐗╄仈缃戝崱骞冲彴",
+    "image": "/HxzkFlow/images/favicon.ico",
+    "href": ""
+  },
+  "menuInfo": [
+    {
+      "title": "甯歌绠$悊",
+      "icon": "fa fa-address-book",
+      "href": "",
+      "target": "_self",
+      "child": [
+        {
+          "title": "淇℃伅鎬昏",
+          "href": "/HxzkFlow/page/XinXi.jsp",
+          "icon": "layui-icon layui-icon-cols",
+          "target": "_self"
+        },
+        {
+          "title": "鍗$墖绠$悊",
+          "href": "/HxzkFlow/page/index1.jsp",
+          "icon": "layui-icon layui-icon-tabs",
+          "target": "_self"
+        },
+        {
+          "title": "浜戞湇鍔″櫒",
+          "href": "/HxzkFlow/page/Fuwuqi.jsp",
+          "icon": "layui-icon layui-icon-util",
+          "target": "_self"
+        },
+        {
+          "title": "鍏徃绠$悊",
+          "href": "/HxzkFlow/page/Gongs.jsp",
+          "icon": "layui-icon layui-icon-templeate-1",
+          "target": "_self"
+        },
+        {
+          "title": "鍏呭�艰褰�",
+          "href": "/HxzkFlow/page/ChongZhi.jsp",
+          "icon": "layui-icon layui-icon-rmb",
+          "target": "_self"
+        },
+        {
+          "title": "涓汉涓績",
+          "href": "/HxzkFlow/page/setting.jsp",
+          "icon": "layui-icon layui-icon-set",
+          "target": "_self"
+        },
+        {
+          "title": "闂鍜ㄨ",
+          "href": "/HxzkFlow/page/wenti.jsp",
+          "icon": "layui-icon layui-icon-help",
+          "target": "_self"
+        },
+        {
+          "title": "鐧诲綍璁板綍",
+          "href": "/HxzkFlow/page/loginJiLu.jsp",
+          "icon": "layui-icon layui-icon-log",
+          "target": "_self"
+        },
+        {
+          "title": "寮�绁ㄧ鐞�",
+          "href": "/HxzkFlow/page/KaiPiao.jsp",
+          "icon": "layui-icon layui-icon-log",
+          "target": "_self"
+        },
+        {
+          "title": "寮�绁ㄨ褰�",
+          "href": "/HxzkFlow/page/KaiPiaoJiLu.jsp",
+          "icon": "layui-icon layui-icon-survey",
+          "target": "_self"
+        },
+        {
+          "title": "鐭俊璁板綍",
+          "href": "/HxzkFlow/page/Duanxinlog.jsp",
+          "icon": "layui-icon layui-icon-dialogue",
+          "target": "_self"
+        },
+        {
+          "title": "鎿嶄綔鏃ュ織",
+          "href": "/HxzkFlow/page/OperationLog.jsp",
+          "icon": "layui-icon layui-icon-survey",
+          "target": "_self"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/webapp/images/download.png b/src/webapp/images/download.png
new file mode 100644
index 0000000..1e5fd73
--- /dev/null
+++ b/src/webapp/images/download.png
Binary files differ
diff --git a/src/webapp/page/ChongZhi.jsp b/src/webapp/page/ChongZhi.jsp
index ae79c76..4fea270 100644
--- a/src/webapp/page/ChongZhi.jsp
+++ b/src/webapp/page/ChongZhi.jsp
@@ -31,7 +31,7 @@
 </head>
 <body style="overflow-x: hidden;overflow-y: hidden">
 <div class="layuimini-container">
-    <div id="xxs" style="width: 100%;height: 130px;position: absolute;background-color: white;box-shadow: 2px -2px 20px #c2c2c2;display: none"></div>
+    <div id="xxs" style="width: 100%;height: 130px;position: absolute;background-color: white;display: none"></div>
     <div class="layuimini-main">
         <div >
             <div class="layui-card">
@@ -39,13 +39,21 @@
                     <div class="layui-carousel" id="stepForm" lay-filter="stepForm" >
                         <div carousel-item style="height: 800px">
                             <div style="background: none">
+<%--                                <script type="text/html" id="toolbarDemo">--%>
+<%--                                    <div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block;position: relative">--%>
+<%--                                        <button class="layui-btn layui-btn-danger" lay-submit lay-filter="formStep1" id="xyb" lay-event="getadd" style="position: relative;top: 600px;left: 1500px">涓嬩竴姝�</button>--%>
+<%--                                    </div>--%>
+
+
+<%--                                </script>--%>
+
                                 <div id="main1" style="display: inline-block;width: 100%;margin-top: -10px">
                                     <table id="demo" lay-filter="demo"></table>
                                 </div>
                                 <span style="position: relative;top: 10px;left: 1290px;font-size: 16px">宸查�夊緟寮�绁ㄩ噾棰�:<span style="color: orange;font-size: 16px" id="jine">0</span></span>
                             </div>
                             <div style="background: none;">
-                                <form class="layui-form" style="float: left;padding-top: 40px;width: 45%">
+                                <form class="layui-form" style="padding-top: 40px;">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">鍙戠エ鎶ご:</label>
                                         <div class="layui-input-block">
@@ -86,8 +94,8 @@
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">鍙戠エ绫诲瀷:</label>
                                         <div class="layui-input-block">
-                                            <input type="radio" name="sex" checked value="澧炲�肩◣鏅�氬彂绁�(鐢靛瓙)" title="澧炲�肩◣鏅�氬彂绁�(鐢靛瓙)" id="dianzi">
-                                            <input type="radio" name="sex" value="澧炲�肩◣涓撶敤鍙戠エ(绾歌川)" title="澧炲�肩◣涓撶敤鍙戠エ(绾歌川)" id="zhizhi">
+                                            <input type="radio" name="sex" checked value="澧炲�肩◣鏅�氬彂绁�" title="澧炲�肩◣鏅�氬彂绁�" id="dianzi">
+                                            <input type="radio" name="sex" value="澧炲�肩◣涓撶敤鍙戠エ" title="澧炲�肩◣涓撶敤鍙戠エ" id="zhizhi">
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
@@ -140,90 +148,90 @@
                                         </div>
                                     </div>
                                 </form>
-                                <div style="float: right;width: 45%;height: 480px;border: 1px solid #cccccc;margin-top: 40px">
-                                    <div style="height: 50px">
-                                        <div style="width: 68%;float: left;text-align: center;height: 70px;line-height: 70px"><h2 style="display: inline-block;color: firebrick">xx澧炲�肩◣XX绁╔X鍙戠エ</h2></div>
-                                        <div style="width: 30%;float:right;;height: 70px;text-align: center">
-                                            <span style="font-size: 8px;color: firebrick">鍙戠エ浠g爜:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>
-                                            <span style="font-size: 8px;color: firebrick">鍙戠エ鍙风爜:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>
-                                            <span style="font-size: 8px;color: firebrick">寮�绁ㄦ棩鏈�:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>
-                                            <span style="font-size: 8px;color: firebrick">鏁� 楠� 鐮�:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>
-                                        </div>
-                                    </div>
-                                    <div style="border-top:1px solid firebrick;width: 95%;margin: 0px auto;margin-top: 42px">
-                                        <div style="border-left: 1px solid firebrick;height: 90px;width: 5%;font-size: 12px;text-align: center;color: firebrick;border-right: 1px solid firebrick;border-bottom: 1px solid firebrick;float: left">璐�</br>涔�</br>鏂�</div>
-                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 90px;float: left;width: 60%">
-                                            <div style="margin-left: 10px">
-                                                <span style="color: #eb7350;font-size: 6px">鍚�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;绉帮細</span><span style="font-size: 8px">涓汉</span>
-                                            </div>
-                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">绾崇◣浜鸿瘑鍒彿锛�</div>
-                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">鍦板潃銆�&nbsp;&nbsp;&nbsp;鐢佃瘽锛�</div>
-                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">寮�鎴疯鍙婅处鍙凤細</div>
-                                        </div>
-                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 90px;float: left;width: 5%;color: firebrick;text-align: center;font-size: 12px">瀵�</br>鐮�</br>鍖�</div>
-                                        <div style="border-bottom: 1px solid firebrick;height: 90px;float: left;border-right: 1px solid firebrick;width: 29.2%"></div>
-                                    </div>
-                                    <div style="border:1px solid firebrick;width: 94.6%;margin: 0px auto;margin-top: 90px;height: 120px">
-                                        <div style="text-align: center;margin: auto;width: 94%">
-                                            <table>
-                                                <tr style="height: 50px">
-                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">璐х墿鎴栧簲绋庡姵鍔°�佹湇鍔″悕绉�</td>
-                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">瑙勬牸鍨嬪彿</td>
-                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">鍗曚綅</td>
-                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">鏁伴噺</td>
-                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">閲戦</td>
-                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">绋庣巼</td>
-                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">绋庨</td>
-                                                </tr>
-                                                <tr style="height: 50px">
-                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;text-align: center">鎶�鏈湇鍔¤垂</td>
-                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block"></td>
-                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;margin-left: 140px">濂�</td>
-                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;margin-left: 40px">1</td>
-                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;margin-left: 35px" id="ZMoney1"></td>
-                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block">6.00%</td>
-                                                    <td style="font-size: 10px;margin: 15px 18px;display: inline-block" id="ZMoney2"></td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                  <div style="width: 94.6%;border: 1px solid firebrick;height: 30px;border-top: 0px;margin: auto">
-                                      <div style="width: 25%;border-right: 1px solid firebrick;margin-left: 21px;border-bottom: 1px solid firebrick;height: 30px;line-height: 30px;float: left">
-                                          <span style="font-size: 10px;color: #eb7350;margin-left: 40px">浠风◣鍚堣&nbsp;&nbsp;&nbsp;(澶у啓)</span>
-                                      </div>
-                                      <div style="width: 69.6%;border-bottom: 1px solid firebrick;height: 30px;line-height: 30px;float: left">
-                                          <span style="font-size: 10px;color: #eb7350;margin-left: 40px" id="daxie"></span><span STYLE="margin-left:220px;font-size: 10px;color: #eb7350">(灏忓啓)&nbsp;锟�</span><span STYLE="font-size: 10px;color: #eb7350" id="xiaoxie"></span>
-                                      </div>
-                                  </div>
-                                    <div style="border-top:0px solid firebrick;width: 95%;margin: 0px auto;">
-                                        <div style="border-left: 1px solid firebrick;height: 100px;width: 5%;font-size: 12px;text-align: center;color: firebrick;border-right: 1px solid firebrick;border-bottom: 1px solid firebrick;float: left">閿�</br>鍞�</br>鏂�</div>
-                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 100px;float: left;width: 60%">
-                                            <div style="margin-left: 10px">
-                                                <span style="color: #eb7350;font-size: 6px">鍚�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;绉帮細</span>&nbsp;<span style="font-size: 8px">鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙�</span>
-                                            </div>
-                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">绾崇◣浜鸿瘑鍒彿锛�<span style="color: black">91110108MA001JXF7X</span></div>
-                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">鍦板潃銆�&nbsp;&nbsp;&nbsp;鐢佃瘽锛�<span style="color: black">浜競涓板彴鍖轰簲閲屽簵鍖楅噷涓�鍖�4鍙锋ゼ6灞�607瀹�&nbsp;010-68214881</span></div>
-                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">寮�鎴疯鍙婅处鍙凤細<span style="color: black">鎷涘晢閾惰鍖椾含鐜夋硥璺敮琛�&nbsp;110919469410101</span></div>
-                                        </div>
-                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 100px;float: left;width: 5%;color: firebrick;text-align: center;font-size: 12px">澶�</br>娉�</div>
-                                        <div style="border-bottom: 1px solid firebrick;height: 100px;float: left;border-right: 1px solid firebrick;width: 29.2%"></div>
-                                    </div>
-                                    <div style="width: 95%">
-                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px;margin-left: 30px">鏀舵浜�:</span>
-                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px">澶嶆牳:</span>
-                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px">寮�绁ㄤ汉:</span>
-                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px">閿�鍞柟(绔�):</span>
-                                    </div>
-                                </div>
+<%--                                <div style="float: right;width: 45%;height: 480px;border: 1px solid #cccccc;margin-top: 40px">--%>
+<%--                                    <div style="height: 50px">--%>
+<%--                                        <div style="width: 68%;float: left;text-align: center;height: 70px;line-height: 70px"><h2 style="display: inline-block;color: firebrick">xx澧炲�肩◣XX绁╔X鍙戠エ</h2></div>--%>
+<%--                                        <div style="width: 30%;float:right;;height: 70px;text-align: center">--%>
+<%--                                            <span style="font-size: 8px;color: firebrick">鍙戠エ浠g爜:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>--%>
+<%--                                            <span style="font-size: 8px;color: firebrick">鍙戠エ鍙风爜:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>--%>
+<%--                                            <span style="font-size: 8px;color: firebrick">寮�绁ㄦ棩鏈�:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>--%>
+<%--                                            <span style="font-size: 8px;color: firebrick">鏁� 楠� 鐮�:</span><span style="font-size: 8px">xxxxxxxxxxxxx</span><br>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                    <div style="border-top:1px solid firebrick;width: 95%;margin: 0px auto;margin-top: 42px">--%>
+<%--                                        <div style="border-left: 1px solid firebrick;height: 90px;width: 5%;font-size: 12px;text-align: center;color: firebrick;border-right: 1px solid firebrick;border-bottom: 1px solid firebrick;float: left">璐�</br>涔�</br>鏂�</div>--%>
+<%--                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 90px;float: left;width: 60%">--%>
+<%--                                            <div style="margin-left: 10px">--%>
+<%--                                                <span style="color: #eb7350;font-size: 6px">鍚�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;绉帮細</span><span style="font-size: 8px">涓汉</span>--%>
+<%--                                            </div>--%>
+<%--                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">绾崇◣浜鸿瘑鍒彿锛�</div>--%>
+<%--                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">鍦板潃銆�&nbsp;&nbsp;&nbsp;鐢佃瘽锛�</div>--%>
+<%--                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">寮�鎴疯鍙婅处鍙凤細</div>--%>
+<%--                                        </div>--%>
+<%--                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 90px;float: left;width: 5%;color: firebrick;text-align: center;font-size: 12px">瀵�</br>鐮�</br>鍖�</div>--%>
+<%--                                        <div style="border-bottom: 1px solid firebrick;height: 90px;float: left;border-right: 1px solid firebrick;width: 29.2%"></div>--%>
+<%--                                    </div>--%>
+<%--                                    <div style="border:1px solid firebrick;width: 94.6%;margin: 0px auto;margin-top: 90px;height: 120px">--%>
+<%--                                        <div style="text-align: center;margin: auto;width: 94%">--%>
+<%--                                            <table>--%>
+<%--                                                <tr style="height: 50px">--%>
+<%--                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">璐х墿鎴栧簲绋庡姵鍔°�佹湇鍔″悕绉�</td>--%>
+<%--                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">瑙勬牸鍨嬪彿</td>--%>
+<%--                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">鍗曚綅</td>--%>
+<%--                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">鏁伴噺</td>--%>
+<%--                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">閲戦</td>--%>
+<%--                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">绋庣巼</td>--%>
+<%--                                                    <td style="font-size: 10px;color:  #eb7350;margin: 15px 25px;display: inline-block">绋庨</td>--%>
+<%--                                                </tr>--%>
+<%--                                                <tr style="height: 50px">--%>
+<%--                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;text-align: center">鎶�鏈湇鍔¤垂</td>--%>
+<%--                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block"></td>--%>
+<%--                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;margin-left: 140px">濂�</td>--%>
+<%--                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;margin-left: 40px">1</td>--%>
+<%--                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block;margin-left: 35px" id="ZMoney1"></td>--%>
+<%--                                                    <td style="font-size: 10px;margin: 15px 25px;display: inline-block">6.00%</td>--%>
+<%--                                                    <td style="font-size: 10px;margin: 15px 18px;display: inline-block" id="ZMoney2"></td>--%>
+<%--                                                </tr>--%>
+<%--                                            </table>--%>
+<%--                                        </div>--%>
+<%--                                    </div>--%>
+<%--                                  <div style="width: 94.6%;border: 1px solid firebrick;height: 30px;border-top: 0px;margin: auto">--%>
+<%--                                      <div style="width: 25%;border-right: 1px solid firebrick;margin-left: 21px;border-bottom: 1px solid firebrick;height: 30px;line-height: 30px;float: left">--%>
+<%--                                          <span style="font-size: 10px;color: #eb7350;margin-left: 40px">浠风◣鍚堣&nbsp;&nbsp;&nbsp;(澶у啓)</span>--%>
+<%--                                      </div>--%>
+<%--                                      <div style="width: 69.6%;border-bottom: 1px solid firebrick;height: 30px;line-height: 30px;float: left">--%>
+<%--                                          <span style="font-size: 10px;color: #eb7350;margin-left: 40px" id="daxie"></span><span STYLE="margin-left:220px;font-size: 10px;color: #eb7350">(灏忓啓)&nbsp;锟�</span><span STYLE="font-size: 10px;color: #eb7350" id="xiaoxie"></span>--%>
+<%--                                      </div>--%>
+<%--                                  </div>--%>
+<%--                                    <div style="border-top:0px solid firebrick;width: 95%;margin: 0px auto;">--%>
+<%--                                        <div style="border-left: 1px solid firebrick;height: 100px;width: 5%;font-size: 12px;text-align: center;color: firebrick;border-right: 1px solid firebrick;border-bottom: 1px solid firebrick;float: left">閿�</br>鍞�</br>鏂�</div>--%>
+<%--                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 100px;float: left;width: 60%">--%>
+<%--                                            <div style="margin-left: 10px">--%>
+<%--                                                <span style="color: #eb7350;font-size: 6px">鍚�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;绉帮細</span>&nbsp;<span style="font-size: 8px">鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙�</span>--%>
+<%--                                            </div>--%>
+<%--                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">绾崇◣浜鸿瘑鍒彿锛�<span style="color: black">91110108MA001JXF7X</span></div>--%>
+<%--                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">鍦板潃銆�&nbsp;&nbsp;&nbsp;鐢佃瘽锛�<span style="color: black">浜競涓板彴鍖轰簲閲屽簵鍖楅噷涓�鍖�4鍙锋ゼ6灞�607瀹�&nbsp;010-68214881</span></div>--%>
+<%--                                            <div style="color: #eb7350;font-size: 8px;margin-left: 10px">寮�鎴疯鍙婅处鍙凤細<span style="color: black">鎷涘晢閾惰鍖椾含鐜夋硥璺敮琛�&nbsp;110919469410101</span></div>--%>
+<%--                                        </div>--%>
+<%--                                        <div style="border-bottom: 1px solid firebrick;border-right: 1px solid firebrick;height: 100px;float: left;width: 5%;color: firebrick;text-align: center;font-size: 12px">澶�</br>娉�</div>--%>
+<%--                                        <div style="border-bottom: 1px solid firebrick;height: 100px;float: left;border-right: 1px solid firebrick;width: 29.2%"></div>--%>
+<%--                                    </div>--%>
+<%--                                    <div style="width: 95%">--%>
+<%--                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px;margin-left: 30px">鏀舵浜�:</span>--%>
+<%--                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px">澶嶆牳:</span>--%>
+<%--                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px">寮�绁ㄤ汉:</span>--%>
+<%--                                        <span style="color: #eb7350;font-size: 10px;margin-right: 130px">閿�鍞柟(绔�):</span>--%>
+<%--                                    </div>--%>
+<%--                                </div>--%>
                             </div>
                             <div style="background: none">
                                 <div>
                                     <p style="text-align: center;margin: auto;margin-top: 70px"><img src="/HxzkFlow/images/successful.png" style="width: 100px"></p>
-                                    <h1 style="text-align: center;margin: auto;margin-top: 50px">鐢宠寮�绁ㄦ垚鍔�</h1>
+                                    <h1 style="text-align: center;margin: auto;margin-top: 50px;color: #c24f4a">鎻愪氦鎴愬姛璇风瓑寰呭紑绁�...</h1>
                                     <h3 style="text-align: center;margin: auto;margin-top:20px">鍙湪寮�绁ㄨ褰曟煡鐪嬪紑绁ㄦ槸鍚︽垚鍔�</h3>
                                     <form>
                                         <p style="text-align: center;margin: auto;margin-top: 50px">
-                                            <button  class="layui-btn" lay-submit lay-filter="saveBtn">鍐嶆寮�绁�</button>
+<%--                                            <button  class="layui-btn" lay-submit lay-filter="saveBtn">鍐嶆寮�绁�</button>--%>
                                             <button  data-refresh="鍒锋柊" onclick="reloads()" class="layui-btn layui-btn-danger">杩斿洖</button></p>
                                     </form>
                                 </div>
@@ -236,16 +244,27 @@
     </div>
 </div>
 <script type="text/html" id="toolbarDemo">
+
+        <button class="layui-btn  layui-btn-danger" lay-event="getDelete" id="btnde" style="display: none" >鍒犻櫎</button>
+
+
     <div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block;position: relative">
         <button class="layui-btn layui-btn-danger" lay-submit lay-filter="formStep1" id="xyb" lay-event="getadd" style="position: relative;top: 600px;left: 1500px">涓嬩竴姝�</button>
     </div>
 </script>
 <script type="text/html" id="checkboxTpl">
+
     <input type="checkbox" name="layTableCheckbox"  lay-event="getchange" lay-skin="primary" lay-filter="clickCheckbox" data-id="{{d.id}}">
 </script>
 <script type="text/html" id="titleTpl">
     {{# if(d.status === '鏈紑绁�') { }}
     <span style="color: orange">鏈紑绁�</span>
+    {{# } else if(d.status === '宸茬敵璇�') { }}
+    <span style="color: green">宸茬敵璇�</span>
+    {{# } else if(d.status === '宸插紑鍏�') { }}
+    <span style="color: green">宸插紑鍏�</span>
+    {{# } else if(d.status === '宸蹭綔搴�') { }}
+    <span style="color: green">宸蹭綔搴�</span>
     {{# } else if(d.status === '宸插紑绁�') { }}
     <span style="color: green">宸插紑绁�</span>
     {{# } }}
@@ -255,6 +274,19 @@
 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 <link rel="stylesheet" href="/HxzkFlow/js/step.js" media="all">
 <script>
+    var juese = localStorage.getItem("getjuese")
+    setTimeout(function () {
+    if (juese=="瓒呯骇绠$悊鍛�"){
+        var button = document.getElementById('btnde');
+        console.log(button)
+        // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+        button.style.display = '';
+    }
+},500)
+    // setTimeout(function () {
+    //     menu.tryChangeActive();
+    // }, 100);
+
     var Zong = localStorage.getItem("gsjc")
     var youji = "company="+localStorage.getItem("gsjc");
     $.post("/HxzkFlow/hxzk/findMailUser",youji,function (data){
@@ -262,6 +294,47 @@
         $("#ffp7").val(data.mailingaddress);
         $("#ffpphone").val(data.phone);
     })
+    // //鍒犻櫎
+    // function buttonDelete(){
+    //     console.log("鎵撳嵃鏁版嵁=====銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��")
+    //     layui.use(['jquery','table'],function (){
+    //         //寮曠敤layui鏂规硶
+    //         var $ = layui.jquery ;
+    //         var table = layui.table ;
+    //         // 鐩戝惉鎿嶄綔鎸夐挳鐨勭偣鍑讳簨浠�
+    //         table.on('tool(demo)', function(obj){
+    //
+    //             console.log(obj)
+    //             var data = obj.data;  // 鑾峰彇褰撳墠琛岀殑鏁版嵁
+    //             var cid = data.num;
+    //             console.log(cid);  // 杈撳嚭cid鍊硷紝鍙互鍋氬叾浠栧鐞�
+    //
+    //             // var nums = [];
+    //             // for (var i = 0; i < obj.length; i++) {
+    //                 // nums.push(JSON.stringify(obj.data[i].num))
+    //                 var datas = "chongZhiId=" + cid
+    //                 $.post("/HxzkFlow/hxzk/DeleteChongZhi", datas, function (data) {
+    //
+    //                 });
+    //             // }
+    //             layer.alert("鍒犻櫎鎴愬姛1")
+    //
+    //             // var datas = "id=" + cid
+    //             // $.get("/HxzkFlow/hxzk/downloadDocument", datas, function (data) {
+    //             //
+    //             // });
+    //             // $.ajax({
+    //             //     url:'/HxzkFlow/hxzk/downloadDocument',
+    //             //     type:'get',
+    //             //     data:{
+    //             //         id:cid
+    //             //     }
+    //             //
+    //             // })
+    //         });
+    //     })
+    // }
+
     layui.use([ 'form', 'step'], function () {
         var $ = layui.$,
             form = layui.form,
@@ -293,7 +366,7 @@
                 return false;
             }else{
 
-                var data = "jynum="+localStorage.getItem("fapiaonum")+"&status=宸插紑绁�"
+                var data = "jynum="+localStorage.getItem("fapiaonum")+"&status=宸茬敵璇�"
                 $.post("/HxzkFlow/hxzk/upstatus",data,function (data){
 
                 })
@@ -323,7 +396,7 @@
                 var sqkpmoney = $("#ZgMoney").text();
                 var shuilv1 = $(".shuilv").text();
                 var shuilv = shuilv1[0]
-                var fpstate1 = "宸插紑绁�"
+                var fpstate1 = "宸茬敵璇�"
                 var data = "sqdate="+sqdate+"&fptt="+fptt+"&xydm="+xydm+"&khh="+khh+"&zcaddress="+zcaddress+"&zcphone="+zcphone+"&fptype="+fptype+"&sqkpmoney="+sqkpmoney+"&shuilv="+shuilv+"&fpstate="+fpstate1+"&company="+localStorage.getItem("gsmc")+"&youji="+  $("#ffp7").val()+"&lxphone="+$("#ffpphone").val();
                 $.post("/HxzkFlow/hxzk/zongfpadd",data,function (data){
 
@@ -361,7 +434,7 @@
                         table.render({
                             elem: '#demo'
                             , layEvent: 'LAYTABLE_TIPS'
-                            , height: 780
+                            , height: 620
                             , url: '/HxzkFlow/hxzk/FindChongzhi' //鏁版嵁鎺ュ彛
                             ,cellMinWidth: 80
                             , page: true //寮�鍚垎椤�
@@ -374,13 +447,14 @@
                             , cols: [[ //琛ㄥご
                                 {type: 'checkbox', fixed: 'left', templet: '#checkboxTpl'}
                                 , {field: 'num', title: '搴忓彿', sort: true,width:'5%'}
+                                , {field: 'company', title: '鍏呭�煎叕鍙�',}
                                 , {field: 'jynum', title: '浜ゆ槗璁板綍鍙�',}
                                 , {field: 'czmoney', title: '鍏呭�奸噾棰�', sort: true}
                                 , {field: 'czdate', title: '鍏呭�兼椂闂�',}
                                 , {field: 'kaimoney', title: '鍙紑绁ㄩ噾棰�'}
                                 ,{field:'status', title: '鐘舵��',templet: '#titleTpl'}
                             ]],
-                            limit: 10,
+                            limit: 90,
                             limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
                         });
                     }else{
@@ -403,12 +477,15 @@
                                 }]
                                 , cols: [[ //琛ㄥご
                                     {type: 'checkbox', fixed: 'left', templet: '#checkboxTpl'}
+                                    , {field: 'company', title: '鍏呭�煎叕鍙�',}
                                     , {field: 'jynum', title: '浜ゆ槗璁板綍鍙�',}
                                     , {field: 'czmoney', title: '鍏呭�奸噾棰�', sort: true}
                                     , {field: 'czdate', title: '鍏呭�兼椂闂�',}
                                     , {field: 'kaimoney', title: '鍙紑绁ㄩ噾棰�',}
                                     ,{field:'status', title: '鐘舵��',templet: '#titleTpl'}
                                 ]],
+                                limit: 90,
+                                limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
                             });
                         })
                     }
@@ -417,7 +494,6 @@
 
             var money = 0;
             table.on('checkbox(demo)', function(obj){
-                console.log(obj)
                 if(obj.type === 'one'){
                     if (obj.checked) {
                         money =  parseFloat(money) + parseFloat(obj.data.czmoney)
@@ -426,7 +502,7 @@
                         var money1 =  $("#jine").text()
                         money =  parseFloat(money1) - parseFloat(obj.data.czmoney)
                     }
-                    $("#jine").text(money)
+                    $("#jine").text(money.toFixed(2))
                 }else{
                     if (obj.checked) {
                         var gsjc  = localStorage.getItem("gsjc")
@@ -471,11 +547,30 @@
                 console.log(obj)
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch(obj.event) {
+                    case 'getDelete':
+                        var data = checkStatus.data;
+                        if (data.length == 0) {
+                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                        } else {
+                            var nums = [];
+                            for (var i = 0; i < data.length; i++) {
+                                nums.push(JSON.stringify(data[i].num))
+                                var datas = "chongZhiId=" + JSON.stringify(data[i].num)
+                                $.post("/HxzkFlow/hxzk/DeleteChongZhi", datas, function (data) {
+
+                                });
+                            }
+                            layer.alert("鍒犻櫎鎴愬姛")
+                        }
+                        location.reload();
+                        // layui.table.reload('demo')
+                        break;
                     case 'getadd':
                         var data = checkStatus.data;
                         if(data.length == 0){
                             alert("璇峰厛閫夋嫨涓�鏉¤褰�")
                         }else{
+
                             localStorage.removeItem("fapiaonum")
                             localStorage.removeItem("fapiaomoney")
                             //淇濆瓨鍙戠エ鍙风爜锛屽拰鍙戠エ閲戦锛�
@@ -490,21 +585,25 @@
                                     fapiaonum += data[i].jynum+","
                                     fapiaomoney = parseInt(data[i].czmoney) + parseInt(fapiaomoney);
                                 }
-                                if(data[i].status == "宸插紑绁�"){
+                                if(data[i].status == "宸茬敵璇�"){
                                     fa = false
                                 }
                             }
                             if(fa == false){
                                 alert("褰撳墠閫夋嫨鐨勮褰曚腑锛屽凡缁忔湁瀛樺湪寮�绁ㄨ繃鐨勮褰�")
                             }else{
-                                var data = "company="+localStorage.getItem("gsmc")
-                                $.get("/HxzkFlow/hxzk/Invoices",data,function (data){
+                                var dataq = checkStatus.data;
+                                console.log(dataq)
+                                // var data = "company="+localStorage.getItem("gsmc")
+                                var data = "company="+dataq[0].company
+                                console.log(data)
+                                $.post("/HxzkFlow/hxzk/Invoices",data,function (data){
 
                                     if(data == "" || data == null){
                                         alert("璇峰厛鍘诲紑绁ㄧ鐞嗛〉闈繚瀛樺彂绁ㄤ俊鎭�!")
                                     }else{
                                         console.log(data.defaultinvoicetype)
-                                        if(data.defaultinvoicetype == "澧炲�肩◣鏅�氬彂绁�(鐢靛瓙)"){
+                                        if(data.defaultinvoicetype == "澧炲�肩◣鏅�氬彂绁�"){
                                             document.getElementById("dianzi").checked = true;
                                             console.log("1123")
                                         }else{
@@ -609,6 +708,7 @@
         return chinese;
     }
 
+
 </script>
 </body>
 </html>
diff --git a/src/webapp/page/Duanxinlog.jsp b/src/webapp/page/Duanxinlog.jsp
index f2ec078..8265b48 100644
--- a/src/webapp/page/Duanxinlog.jsp
+++ b/src/webapp/page/Duanxinlog.jsp
@@ -18,7 +18,16 @@
 <body style="width: 100%;text-align: center;overflow:hidden;">
 <div style="width: 100%;">
     <div style="margin-top: -10px;width: 100%;overflow:hidden;">
-        <div style="width:55%;display: inline-block" id="userWidth">
+<%--        <script type="text/html" id="toolbarDemo" >--%>
+            <div  id="toolbarDemo">
+<%--                <button class="layui-btn "  lay-event="getadd">鏂板</button>--%>
+<%--                <button class="layui-btn   layui-btn-warm"  lay-event="getUpdate">淇敼</button>--%>
+                <button class="layui-btn  layui-btn-danger" id="btnde" lay-event="getDelete" style="display: none;margin-left: -1400px;">鍒犻櫎</button>
+
+
+            </div>
+<%--        </script>--%>
+        <div style="margin-top: -40px;width:55%;display: inline-block" id="userWidth">
             <table id="demo"  lay-filter="demo"></table>
         </div>
 <%--        <div style="width: 40%;height: 600px;display: inline-block;" class="userNo">--%>
@@ -34,7 +43,13 @@
 <script src="/HxzkFlow/js/echarts.min.js"></script>
 <script>
 
+    var juese = localStorage.getItem("getjuese")
 
+    if (juese=="瓒呯骇绠$悊鍛�"){
+        var button = document.getElementById('btnde');
+        // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+        button.style.display = '';
+    }
     //娴忚鍣ㄥ叧闂簨浠�
 
     /**
@@ -87,6 +102,7 @@
         var table = layui.table;
         //绗竴涓疄渚�
         var Zong = localStorage.getItem("gsjc")
+
         var data ="Zong="+Zong
         if(Zong == null){
 
@@ -98,10 +114,10 @@
                     table.render({
                         elem: '#demo'
                         , layEvent: 'LAYTABLE_TIPS'
-                        , height: 780
+                        , height: 830
                         // ,cellMinWidth: 80
                         , url: '/HxzkFlow/hxzk/findDuanxinlog' //鏁版嵁鎺ュ彛
-                        , page: true //寮�鍚垎椤�
+                        // , page: true //寮�鍚垎椤�
                         , toolbar: '#toolbarDemo'
                         , defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
                             title: '鎻愮ず'
@@ -120,14 +136,72 @@
                         // done: function (res, curr, count) {
                         //     $("table").css("width", "100%")
                         // },
-                        limit: 10,
-                        limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
+                        limit: 500,
+                        // limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
                     });
 
                 }
             })
         }
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(demo)', function(obj){
+            var checkStatus = table.checkStatus(obj.config.id);
 
+            switch(obj.event) {
+                case 'getDelete':
+                    var data = checkStatus.data;
+                        if (data.length == 0) {
+                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                        } else {
+                            var nums = [];
+                            for (var i = 0; i < data.length; i++) {
+                                nums.push(JSON.stringify(data[i].id))
+                                var datas = "num=" + JSON.stringify(data[i].id)
+                                $.post("/HxzkFlow/hxzk/DeleteDuanxinlog", datas, function (data) {
+
+                                });
+                            }
+                            layer.alert("鍒犻櫎鎴愬姛")
+                        }
+
+                    layui.table.reload('demo')
+                    break;
+                case 'getUpdate':
+                    var data = checkStatus.data;
+                    if (up!=2){
+                        layer.alert("鎮ㄦ棤鏉冮檺鎿嶄綔")
+                    }else {
+                        if (data.length > 1) {
+                            layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
+                        } else if (data.length == 0) {
+                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                        } else {
+                            $("#companynameup").val(data[0].companyname)
+                            $("#companyabbnameup").val(data[0].companyabbname)
+                            $("#loginphoneup").val(data[0].loginphone)
+                            $("#shuinumup").val(data[0].shuinum);
+                            $("#addressup").val(data[0].address);
+                            $("#phoneup").val(data[0].phone)
+                            $("#accountbankup").val(data[0].accountbank)
+                            $("#accountup").val(data[0].account)
+                            $(".update").show();
+                            $(".heimu").show();
+                            $(".gongsiid").val(data[0].companyid);
+                            $("#companyidup").val(data[0].companyid);
+                        }
+                    }
+                    break;
+                case 'getadd':
+                    if (add1!=2){
+                        layer.alert("鎮ㄦ棤鏉冮檺鎿嶄綔")
+                    }else {
+                        var data = checkStatus.data;
+                        add();
+                    }
+                    break;
+            };
+            layui.table.reload('demo')
+        });
     })
 </script>
 </html>
diff --git a/src/webapp/page/Fuwuqi.jsp b/src/webapp/page/Fuwuqi.jsp
index 455b9e1..60bd4c2 100644
--- a/src/webapp/page/Fuwuqi.jsp
+++ b/src/webapp/page/Fuwuqi.jsp
@@ -22,6 +22,10 @@
     </style>
     <title>Title</title>
     <style>
+        .layui-btn-disabled {
+            pointer-events: none; /* 浣挎寜閽笉鍙偣鍑� */
+            opacity: 0.6; /* 闄嶄綆涓嶉�忔槑搴︿互鏄剧ず绂佺敤鐘舵�� */
+        }
         .panbox{
             width: 540px;
             height: 130px;
@@ -35,40 +39,36 @@
 </head>
 <body>
 
-<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: 10px">
-    <div class="layui-col-md4" style="position: relative;top: 29px;z-index: 999;width: 150px;left: 500px">
+<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: -60px">
+    <div class="layui-col-md4" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 500px" id="cardnum">
         <div class="layui-input-wrap">
             <input type="text" name="servername" style="width: 220px" value="" placeholder="璇疯緭鍏ユ湇鍔″櫒鍚嶇О" class="layui-input" lay-affix="clear">
         </div>
     </div>
-    <div class="layui-col-md4" style="margin-left: 20px">
-        <div class="layui-input-wrap" style="position: relative;top: 29px;z-index: 999;width: 150px;left: 560px">
+    <div class="layui-col-md4" style="margin-left: 20px" id="hide">
+        <div class="layui-input-wrap" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 560px">
             <input type="text" name="company" style="width: 150px"  placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear" class="layui-input">
         </div>
     </div>
-    <%--      <div class="layui-col-md4" style="float: left;width: 551px;margin-left: 4px">--%>
-    <%--          <div class="layui-input-wrap" style="position: relative;top: 89px;z-index: 99999;width: 150px;left: 92px">--%>
-    <%--              <input type="text" name="bindid" style="width: 150px"  placeholder="璇疯緭鍏ョ粦瀹氳澶�" lay-affix="clear" class="layui-input">--%>
-    <%--          </div>--%>
-    <%--      </div>--%>
-    <button style="position: relative;top: 36.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
-    <button style="position: relative;top: 36.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
+    <button style="position: relative;top: 25px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
+    <button style="position: relative;top: 25px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect" id="select">鏌ヨ</button>
 </form>
-<script type="text/html" id="toolbarDemo">
-    <div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block">
-        <button class="layui-btn"  lay-event="getadd">鏂板</button>
-        <button class="layui-btn layui-btn-warm"   lay-event="getUpdate">淇敼</button>
-        <button class="layui-btn layui-btn-danger" lay-event="getDelete">鍒犻櫎</button>
+<%--<script type="text/html" >--%>
+    <div class="layui-btn-container" style="margin-left: 0px;display: inline-block"  id="toolbarDemo">
+
+        <button class="layui-btn " id="btn-add" lay-event="getadd">鏂板</button>
+        <button class="layui-btn   layui-btn-warm" id="btn-update" lay-event="getUpdate">淇敼</button>
+        <button class="layui-btn  layui-btn-danger" id="btndelete" lay-event="getDelete">鍒犻櫎</button>
         <button class="layui-btn"  lay-event="getchongzhi">鍏呭��</button>
 
     </div>
-</script>
-<script type="text/html" id="toolbarDemo1">
-    <div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block">
+<%--</script>--%>
+<script type="text/html"  id="toolbarDemo1">
+    <div class="layui-btn-container" style="margin-left: 0px;display: inline-block">
         <button class="layui-btn"  lay-event="getchongzhi">鍏呭��</button>
     </div>
 </script>
-<div style="display: inline-block;width: 100%;margin-top: -60px;margin-left: -8px">
+<div style="display: inline-block;width: 100%;margin-top: -90px;margin-left: -8px">
     <table id="demo" lay-filter="demo"></table>
 </div>
 <div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>
@@ -291,7 +291,7 @@
 <script>
     var qb = localStorage.getItem("gsjc")
     var data = "qb="+qb
-
+    var getUserName = localStorage.getItem("getUserName")
     var chongzhiCompany = "";
 
     var accessKey = "448c2cedcdce41428a290d144e81ab6e"
@@ -346,124 +346,26 @@
     }
 
     if(qb === "鍗庢槦鏅烘帶"){
-        // url: 'https://api.spruceiot.cn/api/v1/sim/detail/query',
-        //鏌ユ壘鎵�鏈夊崱鍙�
-        // $.ajax({
-        //     url: '/HxzkFlow/hxzk/proxyfindCard',
-        //     method: 'POST',
-        //     data: {
-        //     },
-        //     success: function (data) {
-        //         var str = "";
-        //         var num = 0;
-        //         for (var i =2880; i<2894; i++){
-        //             num++
-        //            if (num == 90){
-        //                str += data[i].cardnumber
-        //            }else{
-        //                str += data[i].cardnumber+","
-        //            }
-        //         }
-        //         $.ajax({
-        //             url: '/HxzkFlow/hxzk/wlk',
-        //             data: {
-        //                 Nonce: nonce,
-        //                 Timestamp: formattedTime,
-        //                 targetUrl: "https://api.spruceiot.cn/api/v1/sim/detail/batch/query",
-        //                 targetUrl1: "?cNo="+str
-        //             },
-        //             success: function (data) {
-        //                 var zflow ="" //濂楅鎬婚噺
-        //                 var syflow = ""//濂楅宸茬敤
-        //                 var operator = "" //杩愯惀鍟�
-        //                 var carddate = "" // 寮�濮嬫棩鏈� 褰曞叆鏃ユ湡
-        //                 var enddate = "" //缁撴潫鏃ユ湡
-        //              for (var i = 0; i <data.result.length;i++){
-        //                  var sy = parseInt(data.result[i].dataLimit-data.result[i].dataUsage)
-        //                  $.ajax({
-        //                      url: '/HxzkFlow/hxzk/proxyupXinXi',
-        //                      method:'POST',
-        //                      data:{
-        //                          cardnumber:data.result[i].msisdn,
-        //                          zflow:data.result[i].dataLimit,
-        //                          syflow:sy,
-        //                          operator:data.result[i].operators,
-        //                          carddate:data.result[i].serviceStartDate,
-        //                          enddate:data.result[i].serviceEndDate,
-        //                          enterdate:data.result[i].serviceStartDate
-        //                      },
-        //                      success:function (data){
-        //                          console.log(data)
-        //                      }
-        //                  })
-        //              }
-        //             }
-        //         })
-        //     }
-        // })
+        var add1 = localStorage.getItem("getadd")
+        var up = localStorage.getItem("getup")
+        var getde = localStorage.getItem("getde")
 
+        if (add1==1){
+            var button = document.getElementById('btn-add');
+            // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
+        if (up==1){
+            var button = document.getElementById('btn-update');
 
-        //鏌ユ壘娴侀噺姹犲悕绉�
-        // $.ajax({
-        //     url: '/HxzkFlow/hxzk/wlk',
-        //     data: {
-        //         Nonce: nonce,
-        //         Timestamp: formattedTime,
-        //         targetUrl: "https://api.spruceiot.cn/api/v1/pool/list/query",
-        //         targetUrl1: "?queryType=0&pageIndex=1&pageSize=100"
-        //     },
-        //     success: function (data) {
-        //
-        //         for (var i = 0; i<data.result.list.length;i++){
-        //             console.log(data.result.list[i].name)
-        //         }
-        //     }
-        // })
-
-        //鏇存敼鍗″彿鍏徃鍚嶇О
-        // $.ajax({
-        //     url: '/HxzkFlow/hxzk/wlk',
-        //     data: {
-        //         Nonce: nonce,
-        //         Timestamp: formattedTime,
-        //         targetUrl: "https://api.spruceiot.cn/api/v1/pool/member/query",
-        //         targetUrl1: "?poolID=80&pageIndex=1&pageSize=100"
-        //     },
-        //     success: function (data) {
-        //
-        //      for(var i =0; i<data.result.list.length;i++){
-        //          console.log(data.result.list[i].msisdn)
-        //          $.ajax({
-        //              url: '/HxzkFlow/hxzk/proxyCardcompanyUp',
-        //              method: 'POST',
-        //              data:{
-        //                  card:data.result.list[i].msisdn,
-        //                  name:"鍗庢槦鍖楁枟绉诲姩1G鍏变韩姹�"
-        //              }
-        //          })
-        //      }
-        //     }
-        // })
-
-
-
-        // $.ajax({
-        //     url:'/HxzkFlow/hxzk/proxyCardList',
-        //     method:"post",
-        //     data:{
-        //         Nonce:nonce,
-        //         Timestamp:formattedTime,
-        //         targetUrl:"https://api.spruceiot.cn/api/v1/sim/list/query",
-        //         targetUrl1:"?pageIndex=1&pageSize=100"
-        //     },
-        //     success:function (data) {
-        //         //鎶婃墍鏈夊崱鍙峰瓨鍏ユ暟鎹簱锛�
-        //             console.log(data.result.total)
-        //     }
-        // })
-
-
-
+            // 璁剧疆寮忓睘鎬ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
+        if (getde==1){
+            var button = document.getElementById('btndelete');
+            // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
 
         $.get("/HxzkFlow/hxzk/chawu",function (data){
             $(".zk").text(data[0])
@@ -552,7 +454,7 @@
                         table.render({
                             elem: '#demo'
                             ,layEvent: 'LAYTABLE_TIPS'
-                            ,height: 780
+                            ,height: 850
                             ,url: '/HxzkFlow/hxzk/findTbFuwuqi' //鏁版嵁鎺ュ彛
                             // ,cellMinWidth: 80
                             ,width: 1680
@@ -581,14 +483,17 @@
                             limits:[10,20,30,40,50,60,70,80,90,100],
                         });
                     }else{
-                        $("#relo").css("left","-620px")
+                        $("#hide").hide();
+                        $("#relo").css("left","-60px")
+                        $("#select").css("left","620px")
+                        $("#cardnum").css("left","620px")
                         var dt ="Zong="+localStorage.getItem("gsmc")
                         $.post("/HxzkFlow/hxzk/chaZi",dt,function (data){
                             var jc = Zong;
                             table.render({
                                 elem: '#demo'
                                 , layEvent: 'LAYTABLE_TIPS'
-                                , height: 780
+                                , height: 850
                                 ,cellMinWidth: 80
                                 , url: '/HxzkFlow/hxzk/findTbFuwuqiZi?Zong='+jc //鏁版嵁鎺ュ彛
                                 , page: true //寮�鍚垎椤�
@@ -627,43 +532,51 @@
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(demo)', function(obj){
                 var checkStatus = table.checkStatus(obj.config.id);
+                var add1 = localStorage.getItem("getadd")
+                var up = localStorage.getItem("getup")
+                var getde = localStorage.getItem("getde")
+
                 switch(obj.event) {
                     case 'getDelete':
                         var data = checkStatus.data;
-                        if(data.length == 0){
-                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
-                        }else{
-                            var nums = [];
-                            for (var i = 0; i < data.length; i++) {
-                                nums.push(JSON.stringify(data[i].id))
-                                var datas = "num="+JSON.stringify(data[i].id)
-                                $.post("/HxzkFlow/hxzk/DeleteTbFuwuqi",datas,function (data){
+                            if (data.length == 0) {
+                                layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                            } else {
+                                var nums = [];
+                                for (var i = 0; i < data.length; i++) {
+                                    nums.push(JSON.stringify(data[i].id))
+                                    var datas = "num=" + JSON.stringify(data[i].id)+"&caozuoname="+getUserName
+                                    $.post("/HxzkFlow/hxzk/DeleteTbFuwuqi", datas, function (data) {
 
-                                });
+                                    });
+                                }
+                                layer.alert("鍒犻櫎鎴愬姛")
                             }
-                            layer.alert("鍒犻櫎鎴愬姛")
-                        }
+
                         layui.table.reload('demo')
                         break;
                     case 'getUpdate':
                         var data = checkStatus.data;
-                        if(data.length>1){
-                            layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
-                        }else if(data.length == 0){
-                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
-                        }else{
-                            showUpdate();
-                            $("#id").val(data[0].id);
-                            $("#servernameupp").val(data[0].servername);
-                            $("#companyd").val(data[0].company);
-                            $("#startdateg").val(data[0].startdate);
-                            $("#enddateg").val(data[0].enddate);
-                            $("#expense").val(data[0].expense);
-                        }
+
+                            if (data.length > 1) {
+                                layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
+                            } else if (data.length == 0) {
+                                layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                            } else {
+                                showUpdate();
+                                $("#id").val(data[0].id);
+                                $("#servernameupp").val(data[0].servername);
+                                $("#companyd").val(data[0].company);
+                                $("#startdateg").val(data[0].startdate);
+                                $("#enddateg").val(data[0].enddate);
+                                $("#expense").val(data[0].expense);
+                            }
+
                         break;
                     case 'getadd':
-                        var data = checkStatus.data;
-                        add();
+                            var data = checkStatus.data;
+                            add();
+
                         break;
                     case 'getchongzhi':
                         var data = checkStatus.data;
@@ -778,7 +691,7 @@
                             }
                         });
                         layer.msg('鎼滅储鎴愬姛');
-                    }else if(field.company == localStorage.getItem("gsmc")){
+                    }else if(field.company ==localStorage.getItem("gsjc") || field.company == localStorage.getItem("gsmc")  ){
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tbFuwuqiSearch",
                             method:'post',
@@ -966,7 +879,7 @@
             // if(parts.length>1){
             //     for (var i = 0 ; i<parts.length;i++){
 
-            var upp = "id="+add4+"&servername="+add1+"&company="+add2+"&startdate="+add3+"&enddate="+add8+"&expense="+add12
+            var upp = "id="+add4+"&servername="+add1+"&company="+add2+"&startdate="+add3+"&enddate="+add8+"&expense="+add12+"&caozuoname="+getUserName
             console.log(upp)
             $.post("/HxzkFlow/hxzk/UpdateTbFuwuqi",upp,function (data){
 
@@ -1028,7 +941,7 @@
                     // return false
                 }else{
                     console.log("33333332")
-                    var upp = "company="+add1+"&servername="+add5+"&startdate="+add2+"&enddate="+add3+"&expense="+add4
+                    var upp = "company="+add1+"&servername="+add5+"&startdate="+add2+"&enddate="+add3+"&expense="+add4+"&caozuoname="+getUserName
                     $.post("/HxzkFlow/hxzk/addTbFuwuqi",upp,function (data){
 
                     })
@@ -1066,6 +979,9 @@
         })
         $(".chongzhi").hide();
         $(".heimu").hide();
+        setTimeout(function () {
+            location.reload();
+        }, 500);
     }
 </script>
 </html>
diff --git a/src/webapp/page/Gongs.jsp b/src/webapp/page/Gongs.jsp
index e259cd0..5ac6fc0 100644
--- a/src/webapp/page/Gongs.jsp
+++ b/src/webapp/page/Gongs.jsp
@@ -10,29 +10,48 @@
 <html>
 <head>
     <title>Title</title>
-
+    <style>
+        .layui-btn-disabled {
+            pointer-events: none; /* 浣挎寜閽笉鍙偣鍑� */
+            opacity: 0.6; /* 闄嶄綆涓嶉�忔槑搴︿互鏄剧ず绂佺敤鐘舵�� */
+        }
+        .panbox{
+            width: 540px;
+            height: 130px;
+            float: left;
+            margin-left: 20px;
+            margin-top: 10px;
+            color: white;
+            font-size: 22px;
+        }
+    </style>
     <link href="/HxzkFlow/images/favicon.ico" rel="icon" type="image/x-icon"/>
     <link rel="stylesheet" href="/HxzkFlow/css/layui.css" media="all">
 
 </head>
-<body style="overflow-x: hidden">
-<div style="height: 0px">
-    <form class="layui-form layui-row layui-col-space16" style="position: relative;top: 113px;z-index: 999;left: 200px">
-        <div class="layui-form-item" style="display: inline-block;width: 500px;">
-            <label class="layui-form-label" style="color: white"></label>
-            <div class="layui-input-block" style="position: relative;top: -100px;left: 100px">
-                <input type="text" style="width: 396px;border-radius: 8px;" name="companyname" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ叕鍙稿悕绉版垨绠�绉�" class="layui-input">
-                <button style="position: relative;top: -38px;left: 330px;border-radius: 8px;border-bottom-left-radius: 0px;border-top-left-radius: 0px" class="layui-btn layui-btn-normal" id="chaxun" lay-submit lay-filter="demo-table-search">鏌ヨ</button>
-            </div>
-            <button style="position: relative;top: -176px;left: 90px" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1" id="relo">鍒锋柊</button>
+<body>
+<%--<div >--%>
+    <form class="layui-form layui-row layui-col-space16"  style="width: 1672px;margin-left: 12px;padding-bottom: -60px">
+<%--        <div class="layui-col-md4" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 500px" id="cardnum">--%>
+    <div class="layui-col-md4" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 500px" id="cardnum">
+        <div class="layui-input-wrap">
+            <input type="text" name="companyname" style="width: 220px" value="" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
+                   class="layui-input" lay-affix="clear">
         </div>
+    </div>
+    <button style="position: relative;top: 25px;z-index: 999;width: 70px;left: 95px" id="relo"
+            class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊
+    </button>
+    <button style="position: relative;top: 25px;z-index: 999;width: 80px;left: 500px" class="layui-btn layui-btn-normal"
+            lay-submit lay-filter="demo-table-search" lay-event="getselect" id="select">鏌ヨ
+    </button>
     </form>
 
-    <script type="text/html" id="toolbarDemo">
-        <div style="margin-left: 35px;">
-            <button class="layui-btn" lay-event="getadd" id="xinGs">鏂板</button>
-            <button class="layui-btn layui-btn-warm" lay-event="getUpdate">淇敼</button>
-            <button class="layui-btn layui-btn-danger" id="shanGs" lay-event="getDelete">鍒犻櫎</button>
+    <script type="text/html"  >
+        <div style="margin-left: 0px;" id="toolbarDemo">
+            <button class="layui-btn " id="btn-add" lay-event="getadd">鏂板</button>
+            <button class="layui-btn   layui-btn-warm" id="btn-update" lay-event="getUpdate">淇敼</button>
+            <button class="layui-btn  layui-btn-danger" id="btndelete" lay-event="getDelete">鍒犻櫎</button>
 
 
         </div>
@@ -42,8 +61,8 @@
             <button class="layui-btn layui-btn-warm" lay-event="getUpdate">淇敼</button>
         </div>
     </script>
-</div>
-<div style="display: inline-block;">
+<%--</div>--%>
+<div style="display: inline-block;margin-top: -80px">
     <table id="demo" lay-filter="demo"></table>
 </div>
 <div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>
@@ -65,6 +84,12 @@
             </div>
         </div>
         <div class="layui-form-item">
+            <label class="layui-form-label">鐧诲綍鐢佃瘽锛�</label>
+            <div class="layui-input-block">
+                <input lay-verify="required|phone" type="text" name="loginphone" id="loginphoneup" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ櫥褰曠數璇�" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
             <label class="layui-form-label">绋庡彿锛�</label>
             <div class="layui-input-block">
                 <input type="text" name="shuinum" id="shuinumup" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ◣鍙�" class="layui-input">
@@ -79,7 +104,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">鐢佃瘽锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="phone" id="phoneup" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ數璇�" class="layui-input">
+                <input lay-verify="required" type="text" name="phone" id="phoneup" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ數璇�" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
@@ -120,7 +145,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">鐧诲綍鐢佃瘽锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="loginphone" id="loginphoneadd" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ櫥褰曠數璇�" class="layui-input">
+                <input lay-verify="required|phone" type="text" name="loginphone" id="loginphoneadd" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ櫥褰曠數璇�" class="layui-input">
             </div>
         </div>
 
@@ -140,7 +165,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">鐢佃瘽锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="phone" lay-verify="title" id="phoneadd" autocomplete="off" placeholder="璇疯緭鍏ョ數璇�" class="layui-input">
+                <input lay-verify="required" type="text" name="phone" lay-verify="title" id="phoneadd" autocomplete="off" placeholder="璇疯緭鍏ョ數璇�" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
@@ -167,7 +192,50 @@
 <script src="/HxzkFlow/js/layui.js" charset="utf-8"></script>
 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 <script>
+    var qb = localStorage.getItem("gsjc")
+    var getUserName = localStorage.getItem("getUserName")
+    if(qb === "鍗庢槦鏅烘帶"){
+        var add1 = localStorage.getItem("getadd")
+        var up = localStorage.getItem("getup")
+        var getde = localStorage.getItem("getde")
 
+        if (add1==1){
+            var button = document.getElementById('btn-add');
+            // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
+        if (up==1){
+            var button = document.getElementById('btn-update');
+
+            // 璁剧疆寮忓睘鎬ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
+        if (getde==1){
+            var button = document.getElementById('btn-delete');
+            // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
+
+        $.get("/HxzkFlow/hxzk/chawu",function (data){
+            $(".zk").text(data[0])
+            $(".by").text(data[1])
+            $(".cy").text(data[2])
+            $(".dw").text(data[3])
+            $(".jjdl").text(data[4])
+        })
+        setInterval(function() {
+            $.get("/HxzkFlow/hxzk/chawu",function (data){
+                $(".zk").text(data[0])
+                $(".by").text(data[1])
+                $(".cy").text(data[2])
+                $(".dw").text(data[3])
+                $(".jjdl").text(data[4])
+            })
+        }, 60000);
+    }else{
+
+
+    }
     /**
      * 鍒ゆ柇鐢ㄦ埛鍦ㄨ瀹氱殑鏃堕棿鍐呮病鏈夋搷浣滅郴缁燂紝鍒欏埛鏂版祻瑙堝櫒
      * 鍙傛暟锛氭椂闂达紙鍗曚綅鍒嗛挓锛�
@@ -224,6 +292,7 @@
             var table = layui.table;
 
 
+
             var Zong = localStorage.getItem("gsjc")
             var data ="Zong="+Zong
             if(Zong == null){
@@ -234,8 +303,8 @@
                         table.render({
                             elem: '#demo'
                             , layEvent: 'LAYTABLE_TIPS'
-                            , height: 780
-
+                            , height: 850
+                            ,width: 1700
                             , url: '/HxzkFlow/hxzk/FindCompany' //鏁版嵁鎺ュ彛
                             , page: true //寮�鍚垎椤�
                             , toolbar: '#toolbarDemo'
@@ -247,13 +316,13 @@
                             , cols: [[ //琛ㄥご
                                 {type: 'checkbox', sort: true, fixed: "left"}
                                 , {field: 'companyid', title: '搴忓彿', sort: true ,width:'4%'}
-                                , {field: 'companyname', title: '鍏徃鍚嶇О',width:'10%'}
+                                , {field: 'companyname', title: '鍏徃鍚嶇О'}
                                 , {field: 'companyabbname', title: '鍏徃绠�绉�', sort: true,width:'10%'}
-                                , {field: 'loginphone', title: '鐧诲綍鐢佃瘽',width:'10%'}
+                                , {field: 'loginphone', title: '鐧诲綍鐢佃瘽',width:'7%'}
                                 , {field: 'shuinum', title: '绋庡彿',width:'10%'}
                                 , {field: 'address', title: '鍦板潃', sort: true,width:'10%'}
-                                , {field: 'phone', title: '鐢佃瘽', sort: true,width:'10%'}
-                                , {field: 'accountbank', title: '寮�鎴疯',width:'10%'}
+                                , {field: 'phone', title: '鐢佃瘽', sort: true,width:'8%'}
+                                , {field: 'accountbank', title: '寮�鎴疯'}
                                 , {field: 'account', title: '璐﹀彿', sort: true,width:'10%'}
 
                             ]],
@@ -271,7 +340,7 @@
                             table.render({
                                 elem: '#demo'
                                 , layEvent: 'LAYTABLE_TIPS'
-                                , height: 780
+                                , height: 850
 
                                 , url: '/HxzkFlow/hxzk/FindCompanyZi?Zong='+jc //鏁版嵁鎺ュ彛
 
@@ -311,48 +380,56 @@
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(demo)', function(obj){
                 var checkStatus = table.checkStatus(obj.config.id);
+                var add1 = localStorage.getItem("getadd")
+                var up = localStorage.getItem("getup")
+                var getde = localStorage.getItem("getde")
                 switch(obj.event) {
                     case 'getDelete':
                         var data = checkStatus.data;
-                        if(data.length == 0){
-                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
-                        }else{
-                            var nums = [];
-                            for (var i = 0; i < data.length; i++) {
-                                nums.push(JSON.stringify(data[i].companyid))
-                                var datas = "companyId="+JSON.stringify(data[i].companyid)
-                                $.post("/HxzkFlow/hxzk/DeleteCompany",datas,function (data){
 
-                                });
+                            if (data.length == 0) {
+                                layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                            } else {
+                                var nums = [];
+                                for (var i = 0; i < data.length; i++) {
+                                    nums.push(JSON.stringify(data[i].companyid))
+                                    var datas = "companyId=" + JSON.stringify(data[i].companyid)+"&caozuoname="+getUserName
+                                    $.post("/HxzkFlow/hxzk/DeleteCompany", datas, function (data) {
+
+                                    });
+                                }
+                                layer.alert("鍒犻櫎鎴愬姛")
                             }
-                            layer.alert("鍒犻櫎鎴愬姛")
-                        }
+
                         layui.table.reload('demo')
                         break;
                     case 'getUpdate':
                         var data = checkStatus.data;
-                        if(data.length>1){
-                            layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
-                        }else if(data.length == 0){
-                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
-                        }else{
-                            $("#companynameup").val(data[0].companyname)
-                            $("#companyabbnameup").val(data[0].companyabbname)
-                            $("#loginphoneup").val(data[0].loginphone)
-                            $("#shuinumup").val(data[0].shuinum);
-                            $("#addressup").val(data[0].address);
-                            $("#phoneup").val(data[0].phone)
-                            $("#accountbankup").val(data[0].accountbank)
-                            $("#accountup").val(data[0].account)
-                            $(".update").show();
-                            $(".heimu").show();
-                            $(".gongsiid").val(data[0].companyid);
-                            $("#companyidup").val(data[0].companyid);
-                        }
+
+                            if (data.length > 1) {
+                                layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
+                            } else if (data.length == 0) {
+                                layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                            } else {
+                                $("#companynameup").val(data[0].companyname)
+                                $("#companyabbnameup").val(data[0].companyabbname)
+                                $("#loginphoneup").val(data[0].loginphone)
+                                $("#shuinumup").val(data[0].shuinum);
+                                $("#addressup").val(data[0].address);
+                                $("#phoneup").val(data[0].phone)
+                                $("#accountbankup").val(data[0].accountbank)
+                                $("#accountup").val(data[0].account)
+                                $(".update").show();
+                                $(".heimu").show();
+                                $(".gongsiid").val(data[0].companyid);
+                                $("#companyidup").val(data[0].companyid);
+                            }
+
                         break;
                     case 'getadd':
-                        var data = checkStatus.data;
-                        add();
+                            var data = checkStatus.data;
+                            add();
+
                         break;
                 };
                 layui.table.reload('demo')
@@ -468,29 +545,30 @@
         }else if(add9 == "1"){
             return false;
         }else{
+            console.log(add1)
+            $.ajax({
+                url: "/HxzkFlow/hxzk/ifGongSi",
+                type: "POST",
+                data: data,
+                async: false,
+                success: function(data) {
+                    console.log(data)
+                    if(data != ""){
+                        alert("璇ュ叕鍙稿悕绉版垨绠�绉板凡瀛樺湪锛�")
+                        add9 = "1";
+                    }else{
+                        console.log("33333332")
+                        var upp = "companyname="+add1+"&companyabbname="+add2+"&loginphone="+add3+"&shuinum="+add4+"&address="+add5+"&phone="+add6+"&accountbank="+add7+"&account="+add8+"&caozuoname="+getUserName
+                        $.post("/HxzkFlow/hxzk/addGongSi",upp,function (data){
+
+                        })
+                        add9 = "0";
+                    }
+                }
+            });
             return true;
         }
-        console.log(add1)
-        $.ajax({
-            url: "/HxzkFlow/hxzk/ifGongSi",
-            type: "POST",
-            data: data,
-            async: false,
-            success: function(data) {
-                console.log(data)
-                if(data != ""){
-                    alert("璇ュ叕鍙稿悕绉版垨绠�绉板凡瀛樺湪锛�")
-                    add9 = "1";
-                }else{
-                    console.log("33333332")
-                    var upp = "companyname="+add1+"&companyabbname="+add2+"&loginphone="+add3+"&shuinum="+add4+"&address="+add5+"&phone="+add6+"&accountbank="+add7+"&account="+add8
-                    $.post("/HxzkFlow/hxzk/addGongSi",upp,function (data){
 
-                    })
-                    add9 = "0";
-                }
-            }
-        });
 
 
 
@@ -511,6 +589,7 @@
         var up6 =   $("#phoneup").val();
         var up7 =  $("#accountbankup").val();
         var up8 =  $("#accountup").val();
+        console.log(up3)
         if(up1 == null || up1 == ""){
             layer.alert("鍏徃鍚嶇О涓嶈兘涓虹┖")
             return false;
@@ -533,7 +612,7 @@
             layer.alert("璐﹀彿涓嶈兘涓虹┖")
             return false;
         }else {
-            var upp = "companyid="+up0+"&companyname="+up1+"&companyabbname="+up2+"&loginphone="+up3+"&shuinum="+up4+"&address="+up5+"&phone="+up6+"&accountbank="+up7+"&account="+up8
+            var upp = "companyid="+up0+"&companyname="+up1+"&companyabbname="+up2+"&loginphone="+up3+"&shuinum="+up4+"&address="+up5+"&phone="+up6+"&accountbank="+up7+"&account="+up8+"&caozuoname="+getUserName
             console.log(upp)
             $.post("/HxzkFlow/hxzk/UpdateGongSi",upp,function (data){
 
diff --git a/src/webapp/page/KaiPiao.jsp b/src/webapp/page/KaiPiao.jsp
index e45cdf5..42a2f16 100644
--- a/src/webapp/page/KaiPiao.jsp
+++ b/src/webapp/page/KaiPiao.jsp
@@ -41,19 +41,19 @@
                                             <input type="text"  id="fpxx1" style="width: 70%"  value="" class="layui-input" lay-verify="number" disabled >
                                         </div>
                                     </div></p>
-                                        <p><div class="layui-form-item">
-                                        <label class="layui-form-label" style=";width: 120px;text-align: right">鎶ご绫诲瀷:</label>
-                                        <div class="layui-input-block">
-                                            <input type="text"  id="fpxx2"  style="width: 70%" value="" class="layui-input" lay-verify="number" disabled>
-                                        </div>
-                                    </div></p>
+<%--                                        <p><div class="layui-form-item">--%>
+<%--                                        <label class="layui-form-label" style=";width: 120px;text-align: right">鎶ご绫诲瀷:</label>--%>
+<%--                                        <div class="layui-input-block">--%>
+<%--                                            <input type="text"  id="fpxx2"  style="width: 70%" value="" class="layui-input" lay-verify="number" disabled>--%>
+<%--                                        </div>--%>
+<%--                                    </div></p>--%>
                                         <p><div class="layui-form-item">
                                         <label class="layui-form-label" style="width: 120px;text-align: right">榛樿鍙戠エ绫诲瀷:</label>
                                         <div class="layui-input-block">
                                             <form class="layui-form" style="width: 70%;float: left" >
                                             <select class="layui-select"  style="width: 50%;height: 40px;border: 1px solid #ccc"  id="fpxx3" disabled>
-                                                <option  id="fpxx12" value="澧炲�肩◣鏅�氬彂绁�(鐢靛瓙)">澧炲�肩◣鏅�氬彂绁�(鐢靛瓙)</option>
-                                                <option id="fpxx13" value="澧炲�肩◣涓撶敤鍙戠エ(绾歌川)">澧炲�肩◣涓撶敤鍙戠エ(绾歌川)</option>
+                                                <option  id="fpxx12" value="澧炲�肩◣鏅�氬彂绁�">澧炲�肩◣鏅�氬彂绁�</option>
+                                                <option id="fpxx13" value="澧炲�肩◣涓撶敤鍙戠エ">澧炲�肩◣涓撶敤鍙戠エ</option>
                                             </select>
                                             </form>
                                         </div>
@@ -167,7 +167,9 @@
 
     //鏌ヨ鍙戠エ淇℃伅
     var company = "company="+localStorage.getItem("gsmc")
-    $.get("/HxzkFlow/hxzk/Invoicess",company,function (data){
+    console.log(company)
+
+    $.post("/HxzkFlow/hxzk/Invoicess",company,function (data){
         if(data == "" || data == null){
             alert("璇峰厛娣诲姞鍙戠エ淇℃伅")
         }else{
@@ -202,6 +204,7 @@
         var pd2 = $("#fpxx10").val();
         var pd3 = $("#fpxx11").val();
         var regEx = /^\d{11}$/;
+        location.reload();
         if(fp1!= "" && fp2 !="" && fp3 !="" && fp4 !="" && fp5 !="" && fp6 !="" && fp7 !="" && fp8 !="" && pd1 !=""&& pd2 !=""&& pd3 !="") {
             if(regEx.test(pd3)){
                 var company = localStorage.getItem("gsjc");
@@ -376,7 +379,7 @@
                         table.render({
                             elem: '#demo'
                             ,layEvent: 'LAYTABLE_TIPS'
-                            ,height: 695
+                            ,height: 820
                             ,url: '/HxzkFlow/hxzk/findinvoicesjilu' //鏁版嵁鎺ュ彛
                             ,page: true //寮�鍚垎椤�
                             ,toolbar:'#toolbarDemo'
@@ -406,7 +409,7 @@
                             table.render({
                                 elem: '#demo'
                                 ,layEvent: 'LAYTABLE_TIPS'
-                                ,height: 695
+                                ,height: 820
                                 ,url: '/HxzkFlow/hxzk/findinvoicesjilu?company='+jc //鏁版嵁鎺ュ彛
                                 ,page: true //寮�鍚垎椤�
                                 ,limit: 100
diff --git a/src/webapp/page/KaiPiaoJiLu.jsp b/src/webapp/page/KaiPiaoJiLu.jsp
index 125215b..685d8a4 100644
--- a/src/webapp/page/KaiPiaoJiLu.jsp
+++ b/src/webapp/page/KaiPiaoJiLu.jsp
@@ -25,52 +25,186 @@
 
         .layui-field-box p{
             font-size: 22px;
-            margin: 0px 0px;
+        }
+        .layui-table-tool {
+            position: relative;
+            z-index: 890;
+            width: 100%;
+            min-height: 60px;
+            line-height: 30px;
+            padding: 10px 15px;
+            border-width: 0 0 1px;
         }
     </style>
 </head>
 <body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div style="margin-top: -10px;width: 100%;overflow:hidden;">
+<div>
+    <div>
+<%--        <script type="text/html"  >--%>
+<%--    <form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-top:10px;margin-left: 12px;padding-bottom: -60px">--%>
+<%--        <div class="layui-col-md4" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 500px" id="cardnum">--%>
+<%--            <div class="layui-input-wrap">--%>
+<%--                <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�"--%>
+<%--                       class="layui-input" lay-affix="clear">--%>
+<%--            </div>--%>
+<%--        </div>--%>
+<%--        <div class="layui-col-md4" style="margin-left: 20px" id="hide">--%>
+<%--            <div class="layui-input-wrap" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 560px">--%>
+<%--                <input type="text" name="company" style="width: 150px" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear"--%>
+<%--                       class="layui-input">--%>
+<%--            </div>--%>
+<%--        </div>--%>
+
+<%--        <button style="position: relative;top: 25px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal"--%>
+<%--                lay-submit lay-filter="demo-table-search" lay-event="getselect" id="select">鏌ヨ--%>
+<%--        </button>--%>
+<%--    </form>--%>
+    <form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-top: -20px">
+<%--        <div class="layui-col-md4" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 500px" id="cardnum">--%>
+<%--            <div class="layui-input-wrap">--%>
+<%--                <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�"--%>
+<%--                       class="layui-input" lay-affix="clear">--%>
+<%--            </div>--%>
+<%--        </div>--%>
+<%--        <div class="layui-col-md4" style="margin-left: 20px" id="hide">--%>
+<%--            <div class="layui-input-wrap" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 560px">--%>
+<%--                <input type="text" name="company" style="width: 150px" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear"--%>
+<%--                       class="layui-input">--%>
+<%--            </div>--%>
+<%--        </div>--%>
+        <button style="position: relative;top: 35px;z-index: 999;width: 70px;left: 185px" id="relo"
+                class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊
+        </button>
+<%--        <button style="position: relative;top: 25px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal"--%>
+<%--                lay-submit lay-filter="demo-table-search" lay-event="getselect" id="select">鏌ヨ--%>
+<%--        </button>--%>
+    </form>
+                    <div style="margin-left: 35px;display: none" id="toolbarDemo">
+
+        <%--                <button class="layui-btn "  lay-event="getadd">鏂板</button>--%>
+                        <button class="layui-btn   layui-btn-warm"  id="btnup" lay-event="getUpdate" style="display: none">淇敼</button>
+        <button class="layui-btn  layui-btn-danger" id="btnde" lay-event="getDelete" style="display: none">鍒犻櫎</button>
+<%--            <button class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>--%>
+<%--            <button  id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊--%>
+<%--            </button>--%>
+                    </div>
+<%--                </script>--%>
+        <div style="margin-top: -25px;width: 100%;overflow:hidden;">
             <table id="demo" lay-filter="demo"></table>
         </div>
-        <div class="layui-form-item" id="y1">
-            <label class="layui-form-label">鐢宠缂栧彿:</label>
-            <div class="layui-input-block">
-                <input type="text"  id="sqnum" name="sqnum" value="" class="layui-input" lay-verify="number">
+
+<%--        <div class="layui-form-item" id="y1">--%>
+<%--            <label class="layui-form-label">鐢宠缂栧彿:</label>--%>
+<%--            <div class="layui-input-block">--%>
+<%--                <input type="text"  id="sqnum" name="sqnum" value="" class="layui-input" lay-verify="number">--%>
+<%--            </div>--%>
+<%--        </div>--%>
+<%--        <div class="layui-form-item" id="y2" >--%>
+<%--            <label class="layui-form-label">蹇�掑崟鍙�:</label>--%>
+<%--            <div class="layui-input-block">--%>
+<%--                <input type="text"  id="danhao" name="danhao" value="" class="layui-input" lay-verify="number">--%>
+<%--            </div>--%>
+<%--        </div>--%>
+<%--        <div class="layui-input-block" id="y3">--%>
+<%--            <button class="layui-btn" onclick="tijiao()">鎻愪氦淇℃伅</button>--%>
+<%--        </div>--%>
+    </div>
+</div>
+<div class="updateZong2"
+     style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
+    <form action="/HxzkFlow/hxzk/saveDocument" enctype="multipart/form-data" class="layui-form" method="post" id="uploadForm" lay-filter="example"  onsubmit="return checkupdate2()">
+<%--        <input type="text" name="sqnum"  class="sqnumup"/>--%>
+        <div class="layui-form-item">
+            <label class="layui-form-label">缂栧彿锛�</label>
+            <div class="layui-input-block" >
+                <input  name="sqnum" id="sqnumup"
+                       placeholder="璇疯緭鍏ュ簭鍙疯澶嘔D" class="layui-input">
             </div>
         </div>
-        <div class="layui-form-item" id="y2" >
-            <label class="layui-form-label">蹇�掑崟鍙�:</label>
+        <div class="layui-form-item">
+            <label class="layui-form-label">鍙戠エ鐘舵�侊細</label>
             <div class="layui-input-block">
-                <input type="text"  id="danhao" name="danhao" value="" class="layui-input" lay-verify="number">
+                <select name="fpstate" id="fpstateup" lay-filter="ddtt">
+                    <option value="宸插紑鍏�">宸插紑鍏�</option>
+                    <option value="宸蹭綔搴�">宸蹭綔搴�</option>
+                    <option value="宸茬敵璇�">宸茬敵璇�</option>
+                </select>
             </div>
         </div>
-        <div class="layui-input-block" id="y3">
-            <button class="layui-btn" onclick="tijiao()">鎻愪氦淇℃伅</button>
+    <!--涓婁紶鏂囦欢 -->
+    <div class="layui-form-item" style="margin-top: 5px">
+        <label class="layui-form-label" style="width: 110px">璇烽�夋嫨鏂囦欢</label>
+        <div class="layui-input-inline">
+                        <input type="file" name="file" id="danhao" size="10" style="color: white;font-size: 14px;width: 160px" class="file-input" accept="image/*">
+
+<%--            <button type="button" class="btn-success btn" id="upload" name="danhao"><i class="layui-icon">顧�</i>涓婁紶鏂囦欢</button>--%>
         </div>
     </div>
+<%--    <div class="form-group row  mb-4" style="margin-top: 10px">--%>
+<%--        <label  class="col-sm-2 col-form-label col-form-label-sm"--%>
+<%--                style="font-size:12px;">涓婁紶鍙戠エ:</label>--%>
+<%--        <div class="col-sm-3" style="margin-top: 0px;">--%>
+<%--            <input type="file" name="file" id="danhao" size="10" style="color: white;font-size: 14px;width: 160px" class="file-input" accept="image/*">--%>
+<%--        </div>--%>
+<%--&lt;%&ndash;        <label  class="col-sm-2 col-form-label col-form-label-sm"&ndash;%&gt;--%>
+<%--&lt;%&ndash;                style="font-size:14px;margin-top: 3px;margin-left: 40px" id="xsxcd1">琛岀▼鍗�:</label>&ndash;%&gt;--%>
+<%--&lt;%&ndash;        <div class="col-sm-3" style="margin-top: 0px;float: left;" id="xsxcd2">&ndash;%&gt;--%>
+<%--&lt;%&ndash;            <input type="file" name="xcd" id="xcd" size="1" placeholder="涓婁紶琛岀▼鍗�" style="color: white;font-size: 14px;width: 160px;" class="file-input" accept="image/*">&ndash;%&gt;--%>
+<%--&lt;%&ndash;        </div>&ndash;%&gt;--%>
+
+<%--    </div>--%>
+<%--    <div class="layui-form-item">--%>
+<%--        <label class="layui-form-label">涓婁紶鍥剧墖</label>--%>
+<%--        <div class="layui-input-block">--%>
+<%--            <input type="file"  lay-verify="title" name="images" required autocomplete="off" accept="image/*"  class="layui-input">--%>
+<%--        </div>--%>
+<%--    </div>--%>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button type="submit" id="submit" class="layui-btn" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
+                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate2()"
+                        style="margin-left: 200px">鍙栨秷
+                </button>
+            </div>
+        </div>
+    </form>
 </div>
 
 
 <script type="text/html" id="titleTpl">
     {{# if(d.fpstate === '鏈紑绁�') { }}
-    <span class="" style="color: orange">鏈紑绁�</span>
+    <span style="color: orange">鏈紑绁�</span>
+    {{# } else if(d.fpstate === '宸茬敵璇�') { }}
+    <span style="color: green">宸茬敵璇�</span>
+    {{# } else if(d.fpstate === '宸插紑鍏�') { }}
+    <span style="color: green">宸插紑鍏�</span>
+    {{# } else if(d.fpstate === '宸蹭綔搴�') { }}
+    <span style="color: green">宸蹭綔搴�</span>
     {{# } else if(d.fpstate === '宸插紑绁�') { }}
-    <span class="" style="color: #00FF00">宸插紑绁�</span>
+    <span style="color: green">宸插紑绁�</span>
     {{# } }}
-
 </script>
 <script type="text/html" id="copyTpl">
-    <button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="copy">澶嶅埗</button>
+<%--    <button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="show" onclick = "buttonUpdate()">淇敼</button>--%>
+<%--    <button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">澶嶅埗</button>--%>
+    <a  lay-event="edit" onclick = "buttonDelete()"><img class='btn btn-success btn-sm' src='/HxzkFlow/images/download.png' style="width: 30px;height: 30px"/></a>
 </script>
 <script src="/HxzkFlow/js/layui.js" charset="utf-8"></script>
 <script src="/HxzkFlow/js/miniTab.js" charset="utf-8"></script>
 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 <link rel="stylesheet" href="/HxzkFlow/js/step.js" media="all">
 <script>
+    var juese = localStorage.getItem("getjuese")
 
+    if (juese=="瓒呯骇绠$悊鍛�"){
+        var button = document.getElementById('btnde');
+        // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+        button.style.display = '';
+        var button = document.getElementById('btnup');
+        // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+        button.style.display = '';
+    }
     var fapiao = localStorage.getItem("fapiao")
     function reloads(){
         location.reload();
@@ -91,8 +225,9 @@
 
 
 
+
     //鏌ヨ鍙戠エ淇℃伅
-    $.get("/HxzkFlow/hxzk/Invoices",function (data){
+    $.post("/HxzkFlow/hxzk/Invoices",function (data){
         $("#fpxx1").val(data.invoicetitle);
         $("#ffp1").val(data.invoicetitle);
         $("#fpxx2").val(data.titletype);
@@ -149,7 +284,7 @@
             if(data == "" || data == null){
                 alert("璇ョ敵璇风紪鍙蜂笉瀛樺湪")
             }else{
-                var dt1 = "sqnum="+sqnum+"&danhao="+danhao+"&fpstate=宸插紑绁�"
+                var dt1 = "sqnum="+sqnum+"&danhao="+danhao+"&fpstate=宸茬敵璇�"
                 $.post("/HxzkFlow/hxzk/adddanhao",dt1,function (data) {
                     if(data == 1){
                         alert("鎻愪氦鎴愬姛")
@@ -215,7 +350,7 @@
 
         form.on('submit(formStep)', function (data) {
             step.next('#stepForm');
-            var data = "jynum="+localStorage.getItem("fapiaonum")+"&status=宸插紑绁�"
+            var data = "jynum="+localStorage.getItem("fapiaonum")+"&status=宸茬敵璇�"
             $.post("/HxzkFlow/hxzk/upstatus",data,function (data){
 
             })
@@ -238,7 +373,7 @@
             var fptt = $("#ffp1").val();
             var fpmoney = localStorage.getItem("fapiaomoney")
             var fpxz = selectedValue;
-            var fpstate = "宸插紑绁�"
+            var fpstate = "宸茬敵璇�"
             var sqdate = time();
             var company = localStorage.getItem("gsmc");
             var data = "sqdate="+sqdate+"&fptt="+fptt+"&fpmoney="+ze+"&fpxz="+fpxz+"&fpstate="+fpstate+"&company="+company
@@ -264,10 +399,73 @@
             step.next('#stepForm');
         });
     })
+    <%--layui.use(['form', 'layer', 'upload'], function () {--%>
+    <%--    console.log("111111")--%>
+    <%--    var form = layui.form,--%>
+    <%--        layer = layui.layer,--%>
+    <%--        upload = layui.upload;--%>
+    <%--    // form.verify({--%>
+    <%--    //     title: function (value) {--%>
+    <%--    //         if (value.length == 0) {--%>
+    <%--    //             return '鏍囬涓嶈兘涓虹┖鍝�';--%>
+    <%--    //         }--%>
+    <%--    //     }--%>
+    <%--    // });--%>
+    <%--    // $("#sqnumup").val();--%>
+    <%--    // $("#fpstateup").val();--%>
+    <%--    console.log($("#fpstateup").val())--%>
+    <%--    if ($("#fpstateup").val()!="宸茬敵璇�"){--%>
 
+    <%--        var uploadInit = upload.render({--%>
+    <%--            elem: '#upload',--%>
+    <%--            url: '/HxzkFlow/hxzk/saveDocument',--%>
+    <%--            accept: 'file',  //涓庡悗绔� MultipartFile file 涓� file 鍚嶇О涓�鑷�--%>
+    <%--            auto: false,--%>
+    <%--            data: {sqnum:$("#sqnumup").val(),fpstate:$("#fpstateup").val()},--%>
+    <%--            bindAction: '#submit',--%>
+    <%--            before: function () {--%>
+
+    <%--                uploadInit.config.data.sqnum = $("#sqnumup").val();  //--%>
+    <%--                uploadInit.config.data.fpstate = $("#fpstateup").val();--%>
+    <%--                console.log(uploadInit.config.data)--%>
+    <%--                &lt;%&ndash;uploadInit.config.data.uid = ${sessionScope.loginUser.id};&ndash;%&gt;--%>
+    <%--            },--%>
+    <%--            done: function (result) {--%>
+    <%--                console.log(result)--%>
+    <%--                // if (result.code == 200) {--%>
+    <%--                //     layer.msg('涓婁紶鎴愬姛', {icon: 1},function () {--%>
+    <%--                //         window.location.href = "/jsp/doc-doc";--%>
+    <%--                //     });--%>
+    <%--                // }else{--%>
+    <%--                //     layer.msg('涓婁紶澶辫触', {icon: 2});--%>
+    <%--                // }--%>
+    <%--            },--%>
+    <%--            // error: function () {--%>
+    <%--            //     layer.msg('涓婁紶澶辫触', {icon: 2});--%>
+    <%--            // }--%>
+    <%--        });--%>
+    <%--    }else{--%>
+    <%--        // var parts = add2.replace(/\s*/g, "").split(",");--%>
+    <%--            var upp = "sqnum=" + $("#sqnumup").val() + "&fpstate=" + $("#fpstateup").val()--%>
+    <%--            $.ajax({--%>
+    <%--                url: "/HxzkFlow/hxzk/UpdateKaiPiao",--%>
+    <%--                type: "POST",--%>
+    <%--                data: upp,--%>
+    <%--                async: false,--%>
+    <%--                success: function (data) {--%>
+    <%--                    return true;--%>
+    <%--                }--%>
+    <%--            });--%>
+    <%--    }--%>
+
+
+    <%--});--%>
     layui.use(['layer', 'form'], function(){
         var layer = layui.layer
+            // ,upload = layui.upload
             ,form = layui.form;
+
+
 
 
         //浠庢湰鍦板瓨鍌ㄨ幏鍙栫敤鎴风櫥褰曚俊鎭紝濡傛灉鏄瓙璐﹀彿锛屽彧鏄剧ずelse 濡傛灉鏄�昏处鍙锋樉绀篿f
@@ -283,7 +481,7 @@
                         table.render({
                             elem: '#demo'
                             ,layEvent: 'LAYTABLE_TIPS'
-                            ,height: 500
+                            ,height: 680
                             ,url: '/HxzkFlow/hxzk/zongkaipiao' //鏁版嵁鎺ュ彛
                             ,page: true //寮�鍚垎椤�
                             ,toolbar:'#toolbarDemo'
@@ -304,11 +502,28 @@
                                 ,{field: 'fptype', title: '鍙戠エ绫诲瀷',  sort: true}
                                 ,{field: 'sqkpmoney', title: '鐢宠寮�绁ㄩ噾棰�',  sort: true}
                                 ,{field:'shuilv', title: '绋庣巼(%)'}
-                                ,{field: 'danhao', title: '蹇�掑崟鍙�', }
-                                ,{field: 'fzxx',title: '澶嶅埗寮�绁ㄤ俊鎭�', templet: '#copyTpl'}
                                 ,{field: 'fpstate', title: '鍙戠エ鐘舵��',templet: '#titleTpl' }
-                                ,{field: 'youji', title: '閭瘎鍦板潃'}
+                                ,{field: 'youji', title: '閭瘎'}
                                 ,{field: 'lxphone', title: '鑱旂郴鐢佃瘽'}
+                                // ,{field: 'danhao', title: '蹇�掑崟鍙�', }
+                                // ,{field: 'fzxx',title: '鍙戠エ', templet: '#copyTpl'}
+                                ,{
+                                    field: 'fzxx', title: '鍙戠エ', align: 'center',
+                                    templet: function (value, data, index) {
+                                        // console.log(value)
+                                        // console.log(data)
+                                        if (value.fpstate=="宸插紑鍏�"){
+                                            var element = "<a href='/HxzkFlow/hxzk/down?id="+value.sqnum+"'><img class='btn btn-success btn-sm' src='/HxzkFlow/images/download.png' style='width: 30px;height: 30px'/></a>";
+                                            return element;
+                                        }else{
+                                            return "鏈紑绁�";
+                                        }
+
+                                    }
+                                }
+
+
+
                             ]],
                             limit:100,
                             limits:[10,20,30,40,50,60,70,80,90,100],
@@ -326,7 +541,7 @@
                             table.render({
                                 elem: '#demo'
                                 ,layEvent: 'LAYTABLE_TIPS'
-                                ,height: 500
+                                ,height: 830
                                 ,url: '/HxzkFlow/hxzk/zongkaipiaoZi?company='+jc //鏁版嵁鎺ュ彛
                                 ,page: true //寮�鍚垎椤�
                                 ,limit: 100
@@ -352,9 +567,219 @@
                     }
                 })
             }
+            // table.on('toolbar(copyTpl)', function(obj){ // `your-table-id` 鏄綘鐨勮〃鏍煎厓绱營D
+            //     var data = obj.data; // 鑾峰彇褰撳墠琛屾暟鎹�
+            //     var layEvent = obj.event; // 鑾峰彇浜嬩欢鍚�
+            //     console.log("鎵撳嵃鏁版嵁-===============銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��")
+            //     console.log(obj)
+            //     if(layEvent === 'edit'){
+            //
+            //         // 缂栬緫鎿嶄綔
+            //     }
+            // });
+            form.on('submit(demo-table-search1)', function (data) {
+                var field = data.field; // 鑾峰緱琛ㄥ崟瀛楁
+                if (field.company != "") {
+                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶") {
+                        table.reload('demo', {
+                            url: "/HxzkFlow/hxzk/ZonginvoicesSearch",
+                            method: 'post',
+                            page: {
+                                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+                            }
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                        });
+                        layer.msg('鎼滅储鎴愬姛');
+                    } else if (field.company == localStorage.getItem("gsmc")) {
+                        table.reload('demo', {
+                            url: "/HxzkFlow/hxzk/ZonginvoicesSearch",
+                            method: 'post',
+                            page: {
+                                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+                            }
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                        });
+                        layer.msg('鎼滅储鎴愬姛');
+                    } else {
+                        alert("娌℃湁鏉冮檺鏌ヨ鍏朵粬鍏徃")
+                    }
+                } else {
+                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶") {
+                        field.company = "";
+                        table.reload('demo', {
+                            url: "/HxzkFlow/hxzk/ZonginvoicesSearch",
+                            method: 'post',
+                            page: {
+                                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+                            }
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                        });
+                        layer.msg('鎼滅储鎴愬姛');
+                    } else {
+                        field.company = localStorage.getItem("gsmc")
+                        table.reload('demo', {
+                            url: "/HxzkFlow/hxzk/ZonginvoicesSearch",
+                            method: 'post',
+                            page: {
+                                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+                            }
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                        });
+                        layer.msg('鎼滅储鎴愬姛');
+                    }
+                }
+                // 鎵ц鎼滅储閲嶈浇
+
+                return false; // 闃绘榛樿 form 璺宠浆
+            });
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(demo)', function(obj){
+                var checkStatus = table.checkStatus(obj.config.id);
+
+                switch(obj.event) {
+                    case 'getDelete':
+                        var data = checkStatus.data;
+                        if (data.length == 0) {
+                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                        } else {
+                            var nums = [];
+                            for (var i = 0; i < data.length; i++) {
+                                nums.push(JSON.stringify(data[i].sqnum))
+                                var datas = "kaipiaoId=" + JSON.stringify(data[i].sqnum)
+                                $.post("/HxzkFlow/hxzk/DeleteKaiPiao", datas, function (data) {
+
+                                });
+                            }
+                            layer.alert("鍒犻櫎鎴愬姛")
+                        }
+
+                        layui.table.reload('demo')
+                        break;
+                    case 'getUpdate':
+                        console.log("1111111111")
+                        var data = checkStatus.data;
+                            if (data.length > 1) {
+                                layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
+                            } else if (data.length == 0) {
+                                layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                            } else {
+                                $(".updateZong2").show();
+                                console.log(data[0])
+                                // var cnum = []
+                                // var id = []
+                                //
+                                // for (let i = 0; i < data.length; i++) {
+                                //     console.log(data[i].cardnumber)
+                                //     cnum.push(data[i].cardnumber)
+                                //     id.push(data[i].num)
+                                // }
+                                // console.log(cnum)
+                                // // $("#card").val(data[0])
+                                $("#sqnumup").val(data[0].sqnum)
+                                $("#fpstateup").val(data[0].fpstate)
+                                // $(".upnum").val(data[0].num);
+                                // $("#xgkh").val(data[0].cardnumber);
+                                // $("#xggs").val(data[0].company);
+                                // $("#carddateu2").val(data[0].carddate);
+                                // $("#enddateu2").val(data[0].enddate);
+                                // $("#unitpriceu2").val(data[0].unitprice);
+                                // $("#operatoru").val(data[0].operator);
+                                // $("#flowu").val(data[0].flow);
+                                form.render();
+
+                        }
+                        break;
+                    case 'getadd':
+                        if (add1!=2){
+                            layer.alert("鎮ㄦ棤鏉冮檺鎿嶄綔")
+                        }else {
+                            var data = checkStatus.data;
+                            add();
+                        }
+                        break;
+                };
+                layui.table.reload('demo')
             });
         });
+        });
 
+    function canselupdate2() {
+        $(".update2").hide();
+        $(".heimu").hide();
+        $(".updateZong2").hide();
+    }
+    // function showUpdate2() {
+    //     console.log("tijiao2222222222222")
+    //     var gsjc = localStorage.getItem("gsjc");
+    //     if (gsjc == "鍗庢槦鏅烘帶") {
+    //         $(".updateZong2").show();
+    //         $(".heimu").show();
+    //     } else {
+    //         $(".update2").show();
+    //         $(".heimu").show();
+    //     }
+    //
+    // }
+    //鍒犻櫎
+    // function buttonDelete(){
+    //     console.log("鎵撳嵃鏁版嵁=====銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��")
+    //     layui.use(['jquery','table'],function (){
+    //         //寮曠敤layui鏂规硶
+    //         var $ = layui.jquery ;
+    //         var table = layui.table ;
+    //         // 鐩戝惉鎿嶄綔鎸夐挳鐨勭偣鍑讳簨浠�
+    //         table.on('tool(demo)', function(obj){
+    //
+    //             console.log(obj)
+    //             var data = obj.data;  // 鑾峰彇褰撳墠琛岀殑鏁版嵁
+    //             var cid = data.sqnum;
+    //             // var na = data.name;// 鑾峰彇褰撳墠琛岀殑cid鍊�
+    //             console.log(cid);  // 杈撳嚭cid鍊硷紝鍙互鍋氬叾浠栧鐞�
+    //             // alert(cid)
+    //             var datas = "id=" + cid
+    //             $.get("/HxzkFlow/hxzk/downloadDocument", datas, function (data) {
+    //
+    //             });
+    //             // $.ajax({
+    //             //     url:'/HxzkFlow/hxzk/downloadDocument',
+    //             //     type:'get',
+    //             //     data:{
+    //             //         id:cid
+    //             //     }
+    //             //
+    //             // })
+    //         });
+    //     })
+    // }
+
+    function checkupdate2() {
+        var add2 = $("#cardnumber2").val();
+        var add3 = $("#carddateu2").val();
+        var add12 = $("#unitpriceu2").val();
+        var add8 = $("#enddateu2").val();
+        // if (add3 == "" || add3 == null) {
+        //     layer.alert("璇烽�夋嫨寮�濮嬫棩鏈�")
+        //     return false;
+        // } else if (add8 == "" || add8 == null) {
+        //     layer.alert("璇烽�夋嫨缁撴潫鏃ユ湡")
+        //     return false;
+        // } else if (add12 == "" || add12 == null) {
+        //     layer.alert("璇烽�夋嫨鍗曚环")
+        //     return false;
+        // } else {
+        //     var parts = add2.replace(/\s*/g, "").split(",");
+        //     var upp = "cardnumber=" + parts + "&carddate=" + add3 + "&enddate=" + add8 + "&unitprice=" + add12
+        //     $.ajax({
+        //         url: "/HxzkFlow/hxzk/updateBatchById",
+        //         type: "POST",
+        //         data: upp,
+        //         async: false,
+        //         success: function (data) {
+        //             return true;
+        //         }
+        //     });
+        // }
+    }
     function time(){
         // 鑾峰彇褰撳墠鏃堕棿
         var currentDate = new Date();
diff --git a/src/webapp/page/Login.jsp b/src/webapp/page/Login.jsp
index 276e302..df8ee43 100644
--- a/src/webapp/page/Login.jsp
+++ b/src/webapp/page/Login.jsp
@@ -54,7 +54,8 @@
     var codenum = 0;
     var yanzhengma;
     var code ;
-    function huoquyanzhengma(){
+     function huoquyanzhengma(){
+        console.log(111111111111111111)
         var id =$("#huoqu").val();
         if(id == "鑾峰彇楠岃瘉鐮�"){
             shoujihao = document.getElementById("phone").value
@@ -138,21 +139,88 @@
         var login = "companyabbname="+companyabbname+"&loginphone="+loginphone
         var loginip = "logincompany="+companyabbname+"&loginphone="+loginphone
         $.post("/HxzkFlow/hxzk/Login",login,function (data){
-		
+
             if(data == "" || data == null){
                 alert("鐢ㄦ埛涓嶅瓨鍦�")
             }else{
                 var y = $("#yanzhengma").val();
 		
                 if (code == y){
+                    if (data.rudq!=null){
+                        console.log(222222222)
+                        if (data.rudq.split(",")[0]=="鏅�氱鐞嗗憳"){
+                            localStorage.setItem("getjuese",data.rudq.split(",")[0])
+                            localStorage.setItem("getadd",data.rudq.split(",")[1])
+                            localStorage.setItem("getup",data.rudq.split(",")[2])
+                            localStorage.setItem("getde",data.rudq.split(",")[3])
+                            localStorage.setItem("getUserName",data.rudq.split(",")[4])
+                        }else{
+                            localStorage.setItem("getjuese","瓒呯骇绠$悊鍛�")
+                            localStorage.setItem("getadd",data.rudq.split(",")[0])
+                            localStorage.setItem("getup",data.rudq.split(",")[1])
+                            localStorage.setItem("getde",data.rudq.split(",")[2])
+                            localStorage.setItem("getUserName",data.rudq.split(",")[3])
+                        }
+
+
+                    }else if (data.rudq=="璁垮"){
+                        companyabbname="璁垮"
+                        localStorage.setItem("getUserName","")
+                        localStorage.setItem("getjuese","")
+                        localStorage.setItem("fangke",fangke)
+                    } else{
+                        localStorage.setItem("getjuese","")
+                        localStorage.setItem("getadd","")
+                        localStorage.setItem("getup","")
+                        localStorage.setItem("getde","")
+                        localStorage.setItem("getUserName","")
+                    }
                     $.post("/HxzkFlow/hxzk/LoginIp",loginip,function (data){
                         localStorage.setItem("gsjc",companyabbname)
                         localStorage.setItem("gsmc",companyname)
                         location.href="/HxzkFlow/page/index.jsp"
                         sessionStorage.setItem("admin",companyabbname)
+
                     })
                 }else{
-                   alert("褰撳墠杈撳叆楠岃瘉鐮佹湁璇�!璇烽噸鏂拌緭鍏�")
+                    if (data.rudq!=null){
+                        console.log(222222222)
+                        if (data.rudq.split(",")[0]=="鏅�氱鐞嗗憳"){
+                            localStorage.setItem("getjuese",data.rudq.split(",")[0])
+                            localStorage.setItem("getadd",data.rudq.split(",")[1])
+                            localStorage.setItem("getup",data.rudq.split(",")[2])
+                            localStorage.setItem("getde",data.rudq.split(",")[3])
+                            localStorage.setItem("getUserName",data.rudq.split(",")[4])
+                        }else if (data.rudq.split(",")[0]=="瓒呯骇绠$悊鍛�"){
+                            localStorage.setItem("getjuese",data.rudq.split(",")[0])
+                            localStorage.setItem("getadd",data.rudq.split(",")[1])
+                            localStorage.setItem("getup",data.rudq.split(",")[2])
+                            localStorage.setItem("getde",data.rudq.split(",")[3])
+                            localStorage.setItem("getUserName",data.rudq.split(",")[4])
+                        }
+
+
+                    }else if (data.rudq=="璁垮"){
+                        companyabbname="璁垮"
+                        localStorage.setItem("getUserName","")
+                        localStorage.setItem("getjuese","")
+                        localStorage.setItem("fangke",fangke)
+                    } else{
+                        localStorage.setItem("getjuese","")
+                        localStorage.setItem("getadd","")
+                        localStorage.setItem("getup","")
+                        localStorage.setItem("getde","")
+                        localStorage.setItem("getUserName","")
+                    }
+                    $.post("/HxzkFlow/hxzk/LoginIp",loginip,function (data){
+
+                        localStorage.setItem("gsjc",companyabbname)
+                        localStorage.setItem("gsmc",companyname)
+                        location.href="/HxzkFlow/page/index.jsp"
+                        sessionStorage.setItem("admin",companyabbname)
+
+                    })
+                   // alert("褰撳墠杈撳叆楠岃瘉鐮佹湁璇�!璇烽噸鏂拌緭鍏�")
                 }
 
             }
diff --git a/src/webapp/page/OperationLog.jsp b/src/webapp/page/OperationLog.jsp
new file mode 100644
index 0000000..bca4b8e
--- /dev/null
+++ b/src/webapp/page/OperationLog.jsp
@@ -0,0 +1,133 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Dell
+  Date: 2023/6/26
+  Time: 11:41
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+  <link href="/HxzkFlow/images/favicon.ico" rel="icon" type="image/x-icon"/>
+  <title>鎿嶄綔鏃ュ織</title>
+
+</head>
+<link rel="stylesheet" href="/HxzkFlow/css/layui.css" media="all">
+
+<body style="width: 100%;text-align: center;overflow:hidden;">
+<div style="width: 100%;">
+  <div style="margin-top: -10px;width: 100%;overflow:hidden;">
+    <div style="width:55%;display: inline-block" id="userWidth">
+      <table id="demo"  lay-filter="demo"></table>
+    </div>
+    <%--        <div style="width: 40%;height: 600px;display: inline-block;" class="userNo">--%>
+    <%--            <div id="main" style="width: 100%;height: 600px;"></div>--%>
+    <%--        </div>--%>
+  </div>
+</div>
+<h3 style="position: absolute;top: 210px;left: 400px;z-index: 9999;font-weight: bolder;color: black;display:none" class="userNo">鎿嶄綔鏃ュ織淇℃伅</h3>
+</div>
+</body>
+<script src="/HxzkFlow/js/layui.js" charset="utf-8"></script>
+<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
+<script src="/HxzkFlow/js/echarts.min.js"></script>
+<script>
+
+
+  //娴忚鍣ㄥ叧闂簨浠�
+
+  /**
+   * 鍒ゆ柇鐢ㄦ埛鍦ㄨ瀹氱殑鏃堕棿鍐呮病鏈夋搷浣滅郴缁燂紝鍒欏埛鏂版祻瑙堝櫒
+   * 鍙傛暟锛氭椂闂达紙鍗曚綅鍒嗛挓锛�
+   * */
+  function timeUserFun(time){
+    var time = time || 2;
+    var userTime = 3600;
+    var objTime = {
+      init:0,
+      time:function(){
+        objTime.init += 1;
+        if(objTime.init === userTime){// 杈惧埌闄愬埗鏃堕棿鏃讹紝鐢ㄦ埛鏈搷浣滀簨浠讹紝鍒欏埛鏂版暣涓〉闈�
+          localStorage.removeItem("gsjc")
+          sessionStorage.removeItem("admin")
+          alert("鎮ㄩ暱鏃堕棿鏈搷浣滃綋鍓嶉〉闈紝璇烽噸鏂扮櫥褰�")
+          var data = "Zong="+sessionStorage.getItem("admin");
+          //鑾峰彇璇ョ敤鎴锋渶鏂版椂闂�
+          $.post("/HxzkFlow/hxzk/userdate",data,function (data){
+
+          })
+          parent.location.reload()
+          //杈惧埌闄愬埗鏃堕棿娌℃搷浣滐紝鎵�瑕佹墽琛岀殑鍔ㄤ綔
+        }
+      },
+      eventFun:function(){
+        //娓呴櫎涓婃鐩戝惉锛岄噸鏂板紑濮嬫柊鐨勭洃鍚�
+        clearInterval(testUser);
+        objTime.init = 0;
+        testUser = setInterval(objTime.time,1000);
+      }
+    };
+    //鐩戝惉褰撳墠鏃堕棿娴佸姩
+    var testUser = setInterval(objTime.time,1000);
+
+    //鐩戝惉鐩稿簲浜嬩欢
+    var body = document.querySelector('html');
+    body.addEventListener("click",objTime.eventFun);
+    body.addEventListener("keydown",objTime.eventFun);
+    body.addEventListener("mousemove",objTime.eventFun);
+    body.addEventListener("mousewheel",objTime.eventFun);
+  }
+  (function () {
+    timeUserFun(1);
+
+  }(0));
+
+  layui.use('table', function() {
+    var table = layui.table;
+    //绗竴涓疄渚�
+    var Zong = localStorage.getItem("gsjc")
+    var data ="Zong="+Zong
+    if(Zong == null){
+
+    }else{
+      $.post("/HxzkFlow/hxzk/jiemi",data,function (data){
+        if(data == "1"){
+          $(".userNo").hide();
+          $("#userWidth").css("width","100%")
+          table.render({
+            elem: '#demo'
+            , layEvent: 'LAYTABLE_TIPS'
+            , height: 800
+            // ,cellMinWidth: 80
+            , url: '/HxzkFlow/hxzk/findOperationLog' //鏁版嵁鎺ュ彛
+            // , page: true //寮�鍚垎椤�
+            , toolbar: '#toolbarDemo'
+            , defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
+              title: '鎻愮ず'
+              , layEvent: 'LAYTABLE_TIPS'
+              , icon: 'layui-icon-tips'
+            }]
+            , cols: [[ //琛ㄥご
+              {type:'checkbox',sort: true,fixed: "left"}
+              ,{field: 'id', title: '搴忓彿',  sort: true,width:'5%'}
+              ,{field: 'caozuodate', title: '鎿嶄綔鏃堕棿', }
+              ,{field: 'caozuoname', title: '鎿嶄綔鐢ㄦ埛鍚嶇О',  sort: true}
+              ,{field: 'caozuotype', title: '鎿嶄綔绫诲瀷',  sort: true}
+              ,{field: 'caozuocontent', title: '鎿嶄綔鍐呭', sort: true}
+
+            ]],
+            // done: function (res, curr, count) {
+            //     $("table").css("width", "100%")
+            // },
+            limit: 500,
+            // limits: [10, 20, 30, 40, 50, 60, 70, 80, 90,100],
+          });
+
+        }
+      })
+    }
+
+  })
+</script>
+</html>
diff --git a/src/webapp/page/XinXi.jsp b/src/webapp/page/XinXi.jsp
index 8c6b742..3778868 100644
--- a/src/webapp/page/XinXi.jsp
+++ b/src/webapp/page/XinXi.jsp
@@ -58,7 +58,7 @@
     var qb = localStorage.getItem("gsjc")
     var ds = "qb="+localStorage.getItem("gsmc")
     var data = "qb="+qb
-    if(qb == "鍗庢槦鏅烘帶"){
+    if(qb == "鍗庢槦鏅烘帶" || qb == "璁垮"){
         $.get("/HxzkFlow/hxzk/chawu",function (data){
             $(".zk").text(data[0])
             $(".by").text(data[1])
diff --git a/src/webapp/page/index.jsp b/src/webapp/page/index.jsp
index 2c48444..4024aef 100644
--- a/src/webapp/page/index.jsp
+++ b/src/webapp/page/index.jsp
@@ -21,6 +21,10 @@
     <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
     <style id="layuimini-bg-color">
+        .layui-layout-admin .layui-body {
+            position: absolute;
+            padding-bottom: 0;
+        }
     </style>
 </head>
 <body class="layui-layout-body layuimini-all">
@@ -146,6 +150,9 @@
 
 
     var admin = localStorage.getItem("gsjc");
+    var juese = localStorage.getItem("getjuese");
+    var fangke = localStorage.getItem("fangke");
+
     if(admin == null || admin == ""){
         window.location = '/HxzkFlow/page/Login.jsp';
     }
@@ -179,8 +186,37 @@
             pageAnim: true,             // iframe绐楀彛鍔ㄧ敾
             maxTabNum: 20,              // 鏈�澶х殑tab鎵撳紑鏁伴噺
         };
+        var options2 = {
+            iniUrl: "/HxzkFlow/api/init2.json",    // 鍒濆鍖栨帴鍙�
+            clearUrl: "/HxzkFlow/api/clear.json", // 缂撳瓨娓呯悊鎺ュ彛
+            urlHashLocation: false,      // 鏄惁鎵撳紑hash瀹氫綅
+            bgColorDefault: false,      // 涓婚榛樿閰嶇疆
+            multiModule: true,          // 鏄惁寮�鍚妯″潡
+            menuChildOpen: false,       // 鏄惁榛樿灞曞紑鑿滃崟
+            loadingTime: 0,             // 鍒濆鍖栧姞杞芥椂闂�
+            pageAnim: true,             // iframe绐楀彛鍔ㄧ敾
+            maxTabNum: 20,              // 鏈�澶х殑tab鎵撳紑鏁伴噺
+        };
+        var options3 = {
+            iniUrl: "/HxzkFlow/api/init3.json",    // 鍒濆鍖栨帴鍙�
+            clearUrl: "/HxzkFlow/api/clear.json", // 缂撳瓨娓呯悊鎺ュ彛
+            urlHashLocation: false,      // 鏄惁鎵撳紑hash瀹氫綅
+            bgColorDefault: false,      // 涓婚榛樿閰嶇疆
+            multiModule: true,          // 鏄惁寮�鍚妯″潡
+            menuChildOpen: false,       // 鏄惁榛樿灞曞紑鑿滃崟
+            loadingTime: 0,             // 鍒濆鍖栧姞杞芥椂闂�
+            pageAnim: true,             // iframe绐楀彛鍔ㄧ敾
+            maxTabNum: 20,              // 鏈�澶х殑tab鎵撳紑鏁伴噺
+        };
         if (admin=="鍗庢槦鏅烘帶"){
-            miniAdmin.render(options);
+            if (juese=="鏅�氱鐞嗗憳"){
+                miniAdmin.render(options3);
+            }else{
+                miniAdmin.render(options);
+            }
+            // miniAdmin.render(options);
+        }else if (admin=="璁垮"){
+            miniAdmin.render(options2);
         }else{
             miniAdmin.render(options1);
         }
diff --git a/src/webapp/page/index1.jsp b/src/webapp/page/index1.jsp
index 711f4c3..416bddf 100644
--- a/src/webapp/page/index1.jsp
+++ b/src/webapp/page/index1.jsp
@@ -22,8 +22,15 @@
     </style>
     <title>Title</title>
     <style>
-
-        .panbox{
+        .layui-layout-admin .layui-body {
+            position: absolute;
+            padding-bottom: -44px;
+        }
+        .layui-btn-disabled {
+            pointer-events: none; /* 浣挎寜閽笉鍙偣鍑� */
+            opacity: 0.6; /* 闄嶄綆涓嶉�忔槑搴︿互鏄剧ず绂佺敤鐘舵�� */
+        }
+        .panbox {
             width: 540px;
             height: 130px;
             float: left;
@@ -36,54 +43,61 @@
 </head>
 <body>
 
-<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: 10px">
-    <div class="layui-col-md4" style="position: relative;top: 30px;z-index: 999;width: 150px;left: 500px">
+<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: -60px">
+    <div class="layui-col-md4" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 500px" id="cardnum">
         <div class="layui-input-wrap">
-            <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�" class="layui-input" lay-affix="clear">
+            <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�"
+                   class="layui-input" lay-affix="clear">
         </div>
     </div>
-    <div class="layui-col-md4" style="margin-left: 20px">
-        <div class="layui-input-wrap" style="position: relative;top: 30px;z-index: 999;width: 150px;left: 560px">
-            <input type="text" name="company" style="width: 150px"  placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear" class="layui-input">
+    <div class="layui-col-md4" style="margin-left: 20px" id="hide">
+        <div class="layui-input-wrap" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 560px">
+            <input type="text" name="company" style="width: 150px" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear"
+                   class="layui-input">
         </div>
     </div>
-    <%--      <div class="layui-col-md4" style="float: left;width: 551px;margin-left: 4px">--%>
-    <%--          <div class="layui-input-wrap" style="position: relative;top: 89px;z-index: 99999;width: 150px;left: 92px">--%>
-    <%--              <input type="text" name="bindid" style="width: 150px"  placeholder="璇疯緭鍏ョ粦瀹氳澶�" lay-affix="clear" class="layui-input">--%>
-    <%--          </div>--%>
-    <%--      </div>--%>
-    <button style="position: relative;top: 36.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
-    <button style="position: relative;top: 36.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
+    <button style="position: relative;top: 25px;z-index: 999;width: 70px;left: -400px" id="relo"
+            class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊
+    </button>
+    <button style="position: relative;top: 25px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal"
+            lay-submit lay-filter="demo-table-search" lay-event="getselect" id="select">鏌ヨ
+    </button>
 </form>
-<script type="text/html" id="toolbarDemo">
-    <div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block">
-        <button class="layui-btn"  lay-event="getadd">鏂板</button>
-        <button class="layui-btn layui-btn-warm" onclick="update()"  lay-event="getUpdate">淇敼</button>
-        <button class="layui-btn layui-btn-danger" lay-event="getDelete">鍒犻櫎</button>
-        <button class="layui-btn"  lay-event="getchongzhi">鍏呭��</button>
+<%--<script type="text/html" >--%>
+<div style="margin-left: 0px;display: inline-block" id="toolbarDemo">
+    <button class="layui-btn " id="btn-add" lay-event="getadd">鏂板</button>
+    <button class="layui-btn   layui-btn-warm" id="btn-update" lay-event="getUpdate">淇敼</button>
+    <button class="layui-btn  layui-btn-danger" id="btndelete" lay-event="getDelete">鍒犻櫎</button>
+    <button class="layui-btn" lay-event="getchongzhi">鍏呭��</button>
+</div>
+<%--</script>--%>
 
-    </div>
-</script>
+<script type="text/html" id="toolbarDemo1" >
+<div class="layui-btn-container" style="margin-left: 0px;display: inline-block" >
+    <button class="layui-btn" lay-event="getchongzhi">鍏呭��</button>
+</div>
+<div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block" id="toolbarDemo2">
 
-<script type="text/html" id="toolbarDemo1">
-    <div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block">
-        <button class="layui-btn"  lay-event="getchongzhi">鍏呭��</button>
-    </div>
+</div>
 </script>
-<div  style="display: inline-block;width: 100%;margin-top: -60px">
+<div style="display: inline-block;width: 100%;margin-top: -80px">
     <table id="demo" lay-filter="demo"></table>
 </div>
 <%--<div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>--%>
-<div class="add" style="display: none;width: 600px;background-color: white;border: 1px solid #cccccc;padding: 50px;border-radius: 20px;position: fixed;top: 50px;left: 450px;z-index: 99999">
+<div class="add1"
+     style="display: none;width: 600px;background-color: white;border: 1px solid #cccccc;padding: 50px;border-radius: 20px;position: fixed;top: 50px;left: 450px;z-index: 99999">
     <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkadd()">
         <div class="layui-form-item">
             <label class="layui-form-label">鎵�灞炲叕鍙革細</label>
             <div class="layui-input-block">
-                <input type="text" name="company" id="companyadd1" lay-verify="title" autocomplete="off" placeholder="" onkeyup="xzGongSi()" onfocus="xz()"  class="layui-input">
+                <input type="text" name="company" id="companyadd1" lay-verify="title" autocomplete="off" placeholder=""
+                       onkeyup="xzGongSi()" onfocus="xz()" class="layui-input">
             </div>
-            <div style="width:488px;height: 400px;overflow-y: scroll;border: 1px solid #EEEEEE;border-top: none;position: absolute;left: 160px;z-index: 999;background-color: white;display: none" id="ZsGs">
+            <div style="width:488px;height: 400px;overflow-y: scroll;border: 1px solid #EEEEEE;border-top: none;position: absolute;left: 160px;z-index: 999;background-color: white;display: none"
+                 id="ZsGs">
                 <c:forEach items="${suoshu}" var="k">
-                    <p onclick="xzGong('${k.companyname}')" style="cursor: pointer;height: 40px;line-height: 40px;padding-left: 10px;border-bottom: 1px solid #f6f6f6">${k.companyname}</p>
+                    <p onclick="xzGong('${k.companyname}')"
+                       style="cursor: pointer;height: 40px;line-height: 40px;padding-left: 10px;border-bottom: 1px solid #f6f6f6">${k.companyname}</p>
                 </c:forEach>
 
             </div>
@@ -91,34 +105,36 @@
         <div class="layui-form-item">
             <label class="layui-form-label">鍗″彿锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="cardnumber" id="cardnumberadd1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ崱鍙�,N涓崱鍙烽渶瑕� ; 鍒嗛殧" class="layui-input">
+                <input type="text" name="cardnumber" id="cardnumberadd1" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ュ崱鍙�,N涓崱鍙烽渶瑕� ; 鍒嗛殧" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">寮�濮嬫棩鏈燂細</label>
             <div class="layui-input-block">
-                <input type="date" name="carddate" id="carddateadd1" placeholder="璇疯緭鍏ュ瘑鐮�" autocomplete="off" class="layui-input">
+                <input type="date" name="carddate" id="carddateadd1" placeholder="璇疯緭鍏ュ瘑鐮�" autocomplete="off"
+                       class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">閫夋嫨娴侀噺锛�</label>
             <div class="layui-input-block">
-                    <select name="flow" lay-filter="ddtt" id="flowadd1">
+                <select name="flow" lay-filter="ddtt" id="flowadd1">
                     <option value=""></option>
                     <option value="12G/骞�">12G/骞�</option>
                     <option value="24G/骞�">24G/骞�</option>
                     <option value="36G/骞�">36G/骞�</option>
-                        <option value="100G/骞�">100G/骞�</option>
+                    <option value="100G/骞�">100G/骞�</option>
                 </select>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">杩愯惀鍟嗭細</label>
             <div class="layui-input-block">
-                <select name="operator" id="operatoradd1"  lay-filter="aihao"  >
+                <select name="operator" id="operatoradd1" lay-filter="aihao">
                     <option value=""></option>
-                    <option value="绉诲姩" >绉诲姩</option>
-                    <option value="鑱旈��" >鑱旈��</option>
+                    <option value="绉诲姩">绉诲姩</option>
+                    <option value="鑱旈��">鑱旈��</option>
                     <option value="鐢典俊">鐢典俊</option>
                 </select>
             </div>
@@ -130,108 +146,123 @@
                     <%--                    <input type="text"  lay-verify="number" name="nTopAmount" value="0.000" onblur="value=zhzs(this.value)" class="layui-input"/>--%>
 
                     <%--                    <span id="feiyong" style="margin-top: 10px;display: inline-block;margin-left: 10px"></span>--%>
-                    <input type="text" id="feiyongadd" name="unitprice" lay-verify="number" value="0" onblur="value=zhzs(this.value)" autocomplete="off" placeholder="" class="layui-input">
+                    <input type="text" id="feiyongadd" name="unitprice" lay-verify="number" value="0"
+                           onblur="value=zhzs(this.value)" autocomplete="off" placeholder="" class="layui-input">
                 </div>
             </div>
         </div>
 
-        <div class="layui-form-item" >
+        <div class="layui-form-item">
             <label class="layui-form-label" style="width: 20% ;margin-left: -40px">缁戝畾璁惧ID锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="bindid" id="bindidadd1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ粦瀹氳澶嘔D锛孨涓牸寮忓悓浜庡崱鍙�" class="layui-input">
+                <input type="text" name="bindid" id="bindidadd1" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ョ粦瀹氳澶嘔D锛孨涓牸寮忓悓浜庡崱鍙�" class="layui-input">
             </div>
         </div>
-<%--        <div class="layui-form-item">--%>
-<%--            <label class="layui-form-label">鎵�鍦ㄥ湴锛�</label>--%>
-<%--            <div class="layui-input-block">--%>
-<%--                <input type="text" name="location" id="locationadd1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ墍鍦ㄥ湴" class="layui-input">--%>
-<%--            </div>--%>
-<%--        </div>--%>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">鎵�鍦ㄥ湴锛�</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <input type="text" name="location" id="locationadd1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ墍鍦ㄥ湴" class="layui-input">--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
         <div class="layui-form-item">
             <label class="layui-form-label">澶囨敞锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="notes" id="notesadd1" lay-verify="title" autocomplete="off" placeholder="閫夊~" class="layui-input">
+                <input type="text" name="notes" id="notesadd1" lay-verify="title" autocomplete="off" placeholder="閫夊~"
+                       class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">缁撴潫鏃ユ湡锛�</label>
             <div class="layui-input-block">
-                <input type="date" name="enddate" id="enddateadd1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ爣棰�" class="layui-input">
+                <input type="date" name="enddate" id="enddateadd1" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ユ爣棰�" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <div class="layui-input-block">
                 <button type="submit" class="layui-btn" lay-submit="" lay-filter="demoadd">绔嬪嵆鎻愪氦</button>
-                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canseladd()" style="margin-left: 200px">鍙栨秷</button>
+                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canseladd()"
+                        style="margin-left: 200px">鍙栨秷
+                </button>
             </div>
         </div>
     </form>
 </div>
-<div class="chongzhi" style="display: none;width: 500px;background-color: white;border-radius: 20px;border: 1px solid #ccc;padding: 50px;position: fixed;top: 150px;left: 500px;z-index: 99999">
+<div class="chongzhi"
+     style="display: none;width: 500px;background-color: white;border-radius: 20px;border: 1px solid #ccc;padding: 50px;position: fixed;top: 150px;left: 500px;z-index: 99999">
     <form class="layui-form" action="" lay-filter="example">
         <div class="layui-form-item">
             <label class="layui-form-label">鍗″彿锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="username" disabled id="cardnumber" lay-verify="title" autocomplete="off" placeholder="璇烽�夋嫨鍗″彿" class="layui-input">
+                <input type="text" name="username" disabled id="cardnumber" lay-verify="title" autocomplete="off"
+                       placeholder="璇烽�夋嫨鍗″彿" class="layui-input">
                 <span class="hao" style="color: red;margin-top: 9px;display: inline-block"></span>
             </div>
         </div>
-<%--        <div class="layui-form-item">--%>
-<%--            <label class="layui-form-label">閫夋嫨娴侀噺</label>--%>
-<%--            <div class="layui-input-block">--%>
-<%--                <select name="interest" lay-filter="ddtt"  id="flow">--%>
-<%--                    <option value=""></option>--%>
-<%--                    <option value="12">12G/骞�</option>--%>
-<%--                    <option value="24">24G/骞�</option>--%>
-<%--                    <option value="36">36G/骞�</option>--%>
-<%--                </select>--%>
-<%--            </div>--%>
-<%--        </div>--%>
+        <div class="layui-form-item">
+            <label class="layui-form-label">閫夋嫨娴侀噺锛�</label>
+            <div class="layui-input-block">
+                <select name="flow" lay-filter="ddtt" id="flowc">
+                    <option value=""></option>
+                    <option value="12G/骞�">12G/骞�</option>
+                    <option value="24G/骞�">24G/骞�</option>
+                    <option value="36G/骞�">36G/骞�</option>
+                    <option value="100G/骞�">100G/骞�</option>
+                </select>
+            </div>
+        </div>
         <div class="chongzhi">
             <div class="layui-form-item">
                 <label class="layui-form-label">鍗曚环/鍏冿細</label>
                 <div class="layui-input-block">
-                    <span id="feiyong" name = "unitprice" style="margin-top: 10px;display: inline-block;margin-left: 10px"></span>
-<%--                    <input type="text" id="feiyong" name="username" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">--%>
+<%--                    <span id="feiyong" name="unitprice"--%>
+<%--                          style="margin-top: 10px;display: inline-block;margin-left: 10px"></span>--%>
+                    <input type="text" id="feiyong" name="unitprice" lay-verify="title" disabled placeholder="" class="layui-input">
                 </div>
             </div>
         </div>
         <div class="chongzhi">
             <div class="layui-form-item">
-                <label class="layui-form-label">鎬讳环锛�</label>
+                <label class="layui-form-label">鎬讳环/鍏冿細</label>
                 <div class="layui-input-block">
-                    <span id="zongjia" name = "zongjia" style="margin: 10px;display: inline-block"></span>
-<%--                    <input type="text" id="zongjia" name="zongjia" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">--%>
+                    <span id="zongjia" name="zongjia" style="margin: 10px;display: inline-block"></span>
+                    <%--                    <input type="text" id="zongjia" name="zongjia" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">--%>
                 </div>
             </div>
         </div>
         <div class="layui-form-item">
             <div class="layui-input-block">
                 <input type="button" class="layui-btn" value="绔嬪嵆鎻愪氦" onclick="chongzhitj()"></input>
-                <button type="reset" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselchongzhi()" style="margin-left: 200px">鍙栨秷</button>
+                <button type="reset" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselchongzhi()"
+                        style="margin-left: 200px">鍙栨秷
+                </button>
             </div>
         </div>
     </form>
 </div>
-<div class="update" style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
+<div class="update"
+     style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
     <form class="layui-form" action="/HxzkFlow/hxzk/Update" method="post" lay-filter="example">
         <input type="text" name="num" style="display: none" class="upnum"/>
         <div class="layui-form-item">
             <label class="layui-form-label">缁戝畾璁惧ID锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="bindid" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ヨ澶嘔D" class="layui-input">
+                <input type="text" name="bindid" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ヨ澶嘔D"
+                       class="layui-input">
             </div>
         </div>
-<%--        <div class="layui-form-item">--%>
-<%--            <label class="layui-form-label">鎵�鍦ㄥ湴锛�</label>--%>
-<%--            <div class="layui-input-block">--%>
-<%--                <input type="text" name="location" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ墍鍦ㄥ湴" class="layui-input">--%>
-<%--            </div>--%>
-<%--        </div>--%>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">鎵�鍦ㄥ湴锛�</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <input type="text" name="location" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ墍鍦ㄥ湴" class="layui-input">--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
         <div class="layui-form-item">
             <label class="layui-form-label">澶囨敞锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="notes" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+                <input type="text" name="notes" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ娉�"
+                       class="layui-input">
             </div>
         </div>
         <div class="chongzhi">
@@ -239,30 +270,36 @@
         <div class="layui-form-item">
             <div class="layui-input-block">
                 <button type="submit" class="layui-btn" lay-submit="" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
-                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()" style="margin-left: 200px">鍙栨秷</button>
+                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()"
+                        style="margin-left: 200px">鍙栨秷
+                </button>
             </div>
         </div>
     </form>
 </div>
-<div class="updateZong" style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
-    <form class="layui-form"  method="post" lay-filter="example" onsubmit="return checkupdate()">
+<div class="updateZong"
+     style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
+    <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkupdate()">
         <input type="text" name="num" style="display: none" class="upnum"/>
         <div class="layui-form-item">
             <label class="layui-form-label">鍗″彿锛�</label>
             <div class="layui-input-block">
-                <input type="text" name="cardnumber" id="xgkh" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ヨ澶嘔D" class="layui-input">
+                <input type="text" name="cardnumber" id="xgkh" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ヨ澶嘔D" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">鎵�灞炲叕鍙革細</label>
             <div class="layui-input-block">
-                <input type="text" name="company" id="xggs" disabled lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" class="layui-input">
+                <input type="text" name="company" id="xggs" disabled lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">寮�濮嬫棩鏈燂細</label>
             <div class="layui-input-block">
-                <input type="date" id="carddateu" name="carddate" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" class="layui-input">
+                <input type="date" id="carddateu" name="carddate" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" class="layui-input">
             </div>
         </div>
 
@@ -273,14 +310,16 @@
                     <%--                    <input type="text"  lay-verify="number" name="nTopAmount" value="0.000" onblur="value=zhzs(this.value)" class="layui-input"/>--%>
 
                     <%--                    <span id="feiyong" style="margin-top: 10px;display: inline-block;margin-left: 10px"></span>--%>
-                    <input type="text" id="unitpriceu" name="unitprice" lay-verify="number" value="0" onblur="value=zhzs(this.value)" autocomplete="off" placeholder="" class="layui-input">
+                    <input type="text" id="unitpriceu" name="unitprice" lay-verify="number" value="0"
+                           onblur="value=zhzs(this.value)" autocomplete="off" placeholder="" class="layui-input">
                 </div>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">缁撴潫鏃ユ湡锛�</label>
             <div class="layui-input-block">
-                <input type="date" name="enddate" id="enddateu" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ爣棰�" class="layui-input">
+                <input type="date" name="enddate" id="enddateu" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ユ爣棰�" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
@@ -297,25 +336,154 @@
         <div class="layui-form-item">
             <label class="layui-form-label">杩愯惀鍟嗭細</label>
             <div class="layui-input-block">
-                <select name="operator"  id="operatoru" lay-filter="operatoru"  >
-                    <option value="绉诲姩" >绉诲姩</option>
-                    <option value="鑱旈��" >鑱旈��</option>
-                    <option value="鐢典俊" >鐢典俊</option>
+                <select name="operator" id="operatoru" lay-filter="operatoru">
+                    <option value="绉诲姩">绉诲姩</option>
+                    <option value="鑱旈��">鑱旈��</option>
+                    <option value="鐢典俊">鐢典俊</option>
                 </select>
             </div>
         </div>
-<%--        <div class="layui-form-item">--%>
-<%--            <label class="layui-form-label">杩愯惀鍟嗕俊鎭細</label>--%>
-<%--            <div class="layui-input-block">--%>
-<%--                <input type="text" name="operator"  id="operatoru"lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ娉�" class="layui-input" disabled>--%>
-<%--            </div>--%>
-<%--        </div>--%>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">杩愯惀鍟嗕俊鎭細</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <input type="text" name="operator"  id="operatoru"lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ娉�" class="layui-input" disabled>--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
         <div class="chongzhi">
         </div>
         <div class="layui-form-item">
             <div class="layui-input-block">
                 <button type="submit" class="layui-btn" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
-                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()" style="margin-left: 200px">鍙栨秷</button>
+                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()"
+                        style="margin-left: 200px">鍙栨秷
+                </button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div class="update2"
+     style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
+    <form class="layui-form" action="/HxzkFlow/hxzk/Update" method="post" lay-filter="example">
+        <input type="text" name="num" style="display: none" class="upnum"/>
+        <div class="layui-form-item">
+            <label class="layui-form-label">缁戝畾璁惧ID锛�</label>
+            <div class="layui-input-block">
+                <input type="text" name="bindid" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ヨ澶嘔D"
+                       class="layui-input">
+            </div>
+        </div>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">鎵�鍦ㄥ湴锛�</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <input type="text" name="location" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ墍鍦ㄥ湴" class="layui-input">--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
+        <div class="layui-form-item">
+            <label class="layui-form-label">澶囨敞锛�</label>
+            <div class="layui-input-block">
+                <input type="text" name="notes" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ娉�"
+                       class="layui-input">
+            </div>
+        </div>
+        <div class="chongzhi">
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button type="submit" class="layui-btn" lay-submit="" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
+                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()"
+                        style="margin-left: 200px">鍙栨秷
+                </button>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="updateZong2"
+     style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
+    <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkupdate2()">
+        <input type="text" name="num" style="display: none" class="upnum2"/>
+        <div class="layui-form-item" style="display: none">
+            <label class="layui-form-label">鍗″彿锛�</label>
+            <div class="layui-input-block">
+                <input type="text" disabled name="cardnumber" id="cardnumber2" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ヨ澶嘔D" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">搴忓彿锛�</label>
+            <div class="layui-input-block">
+                <input type="text" disabled name="num" id="cardid" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ュ簭鍙疯澶嘔D" class="layui-input">
+            </div>
+        </div>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">鎵�灞炲叕鍙革細</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <input type="text" name="company" id="xggs" disabled lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" class="layui-input">--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
+        <div class="layui-form-item">
+            <label class="layui-form-label">寮�濮嬫棩鏈燂細</label>
+            <div class="layui-input-block">
+                <input type="date" id="carddateu2" name="carddate" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-form-item">
+                <label class="layui-form-label">鍗曚环/鍏冿細</label>
+                <div class="layui-input-block">
+                    <%--                    <input type="text"  lay-verify="number" name="nTopAmount" value="0.000" onblur="value=zhzs(this.value)" class="layui-input"/>--%>
+
+                    <%--                    <span id="feiyong" style="margin-top: 10px;display: inline-block;margin-left: 10px"></span>--%>
+                    <input type="text" id="unitpriceu2" name="unitprice" lay-verify="number" value="0"
+                           onblur="value=zhzs(this.value)" autocomplete="off" placeholder="" class="layui-input">
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">缁撴潫鏃ユ湡锛�</label>
+            <div class="layui-input-block">
+                <input type="date" name="enddate" id="enddateu2" lay-verify="title" autocomplete="off"
+                       placeholder="璇疯緭鍏ユ爣棰�" class="layui-input">
+            </div>
+        </div>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">閫夋嫨娴侀噺锛�</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <select name="flow" id="flowu" lay-filter="ddtt">--%>
+        <%--                    <option value="12G/骞�">12G/骞�</option>--%>
+        <%--                    <option value="24G/骞�">24G/骞�</option>--%>
+        <%--                    <option value="36G/骞�">36G/骞�</option>--%>
+        <%--                    <option value="100G/骞�">100G/骞�</option>--%>
+        <%--                </select>--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">杩愯惀鍟嗭細</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <select name="operator"  id="operatoru" lay-filter="operatoru"  >--%>
+        <%--                    <option value="绉诲姩" >绉诲姩</option>--%>
+        <%--                    <option value="鑱旈��" >鑱旈��</option>--%>
+        <%--                    <option value="鐢典俊" >鐢典俊</option>--%>
+        <%--                </select>--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
+        <%--        <div class="layui-form-item">--%>
+        <%--            <label class="layui-form-label">杩愯惀鍟嗕俊鎭細</label>--%>
+        <%--            <div class="layui-input-block">--%>
+        <%--                <input type="text" name="operator"  id="operatoru"lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ娉�" class="layui-input" disabled>--%>
+        <%--            </div>--%>
+        <%--        </div>--%>
+        <%--        <div class="chongzhi">--%>
+        <%--        </div>--%>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button type="submit" class="layui-btn" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
+                <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate2()"
+                        style="margin-left: 200px">鍙栨秷
+                </button>
             </div>
         </div>
     </form>
@@ -330,11 +498,14 @@
     {{# } else if(d.status === '宸插埌鏈�') { }}
     <button class="layui-btn layui-btn-sm layui-btn-danger">宸插埌鏈�</button>
     {{# } else if(d.status === '棰勯攢鎴�') { }}
-    <button class="layui-btn layui-btn-sm layui-btn-primary layui-btn-primary layui-btn-primary layui-bg-blue">棰勯攢鎴�</button>
+    <button class="layui-btn layui-btn-sm layui-btn-primary layui-btn-primary layui-btn-primary layui-bg-blue">棰勯攢鎴�
+    </button>
     {{# } else if(d.status === '宸查攢鎴�') { }}
-    <button class="layui-btn layui-btn-sm layui-btn layui-bg-cyan" >宸查攢鎴�</button>
+    <button class="layui-btn layui-btn-sm layui-btn layui-bg-cyan">宸查攢鎴�</button>
     {{# } else { }}
-    <button class="layui-btn layui-btn-sm layui-btn-primary layui-btn-primary layui-btn-primary layui-btn-primary">鏈煡</button>
+    <button class="layui-btn layui-btn-sm layui-btn-primary layui-btn-primary layui-btn-primary layui-btn-primary">
+        鏈煡
+    </button>
     {{# } }}
 </script>
 </body>
@@ -342,8 +513,8 @@
 <script src="../js/jquery-3.5.1.js"></script>
 <script>
     var qb = localStorage.getItem("gsjc")
-    var data = "qb="+qb
-
+    var data = "qb=" + qb
+    var getUserName = localStorage.getItem("getUserName")
     var chongzhiCompany = "";
 
     var accessKey = "448c2cedcdce41428a290d144e81ab6e"
@@ -361,7 +532,8 @@
     for (var i = 30; i > 0; --i)
         nonce += str[Math.floor(Math.random() * str.length)];
 
-    var stringSignTemp = accessKey+nonce+formattedTime
+    var stringSignTemp = accessKey + nonce + formattedTime
+
     function zhzs(value) {
         value = value.replace(/[^\d]/g, '').replace(/^0{1,}/g, '');
         if (value != '')
@@ -370,173 +542,79 @@
             value = parseFloat(0).toFixed(0);
         return value;
     }
+
     // layui.use('form', function(){
     //     var form = layui.form;
     //     form.render('select');  // 閲嶆柊娓叉煋select妗�
     // });
-    function xzGongSi(){
+    function xzGongSi() {
         var company = $("#companyadd1").val();
-        var data = "companyname="+company
-        $.post("/HxzkFlow/hxzk/MoHuGongSi",data,function (data){
+        var data = "companyname=" + company
+        $.post("/HxzkFlow/hxzk/MoHuGongSi", data, function (data) {
             var str = [];
-            if(data.length !=0){
-                for(var i = 0; i < data.length;i++){
+            if (data.length != 0) {
+                for (var i = 0; i < data.length; i++) {
                     $("#ZsGs").empty();
-                    data[i].company = "'"+data[i].companyname+"'"
-                    str += '<p onclick="xzGong('+data[i].company+')" style="cursor: pointer;height: 40px;line-height: 40px;padding-left: 10px;border-bottom: 1px solid #f6f6f6">'+data[i].companyname+'</p>'
+                    data[i].company = "'" + data[i].companyname + "'"
+                    str += '<p onclick="xzGong(' + data[i].company + ')" style="cursor: pointer;height: 40px;line-height: 40px;padding-left: 10px;border-bottom: 1px solid #f6f6f6">' + data[i].companyname + '</p>'
                 }
             }
             $("#ZsGs").append(str)
         })
         $("#ZsGs").show()
     }
-    function xz(){
+
+    function xz() {
         $("#ZsGs").show()
     }
-    function xzGong(id){
+
+    function xzGong(id) {
         $("#companyadd1").val(id)
         $("#ZsGs").hide()
     }
 
-    function clasp(){
+    function clasp() {
         var items = new Array();
         items = $("#operatoradd1 option:selected");
         //姝ゅ鍙栧埌浜嗘瘡涓猧tem锛宨tems[i].text鍒欏彇鍒扮殑鏄痮ption涓殑鏂囧瓧锛屼笅闈㈠彇鍒扮殑鏄痸alue灞炴��
-        for(var i = 0;i<items.length;i++){
+        for (var i = 0; i < items.length; i++) {
             itemTitle = items[i].value;
         }
         console.log(itemTitle)
         console.log(items)
     }
-    if(qb === "鍗庢槦鏅烘帶"){
-        // url: 'https://api.spruceiot.cn/api/v1/sim/detail/query',
-        //鏌ユ壘鎵�鏈夊崱鍙�
-        // $.ajax({
-        //     url: '/HxzkFlow/hxzk/proxyfindCard',
-        //     method: 'POST',
-        //     data: {
-        //     },
-        //     success: function (data) {
-        //         var str = "";
-        //         var num = 0;
-        //         for (var i =2880; i<2894; i++){
-        //             num++
-        //            if (num == 90){
-        //                str += data[i].cardnumber
-        //            }else{
-        //                str += data[i].cardnumber+","
-        //            }
-        //         }
-        //         $.ajax({
-        //             url: '/HxzkFlow/hxzk/wlk',
-        //             data: {
-        //                 Nonce: nonce,
-        //                 Timestamp: formattedTime,
-        //                 targetUrl: "https://api.spruceiot.cn/api/v1/sim/detail/batch/query",
-        //                 targetUrl1: "?cNo="+str
-        //             },
-        //             success: function (data) {
-        //                 var zflow ="" //濂楅鎬婚噺
-        //                 var syflow = ""//濂楅宸茬敤
-        //                 var operator = "" //杩愯惀鍟�
-        //                 var carddate = "" // 寮�濮嬫棩鏈� 褰曞叆鏃ユ湡
-        //                 var enddate = "" //缁撴潫鏃ユ湡
-        //              for (var i = 0; i <data.result.length;i++){
-        //                  var sy = parseInt(data.result[i].dataLimit-data.result[i].dataUsage)
-        //                  $.ajax({
-        //                      url: '/HxzkFlow/hxzk/proxyupXinXi',
-        //                      method:'POST',
-        //                      data:{
-        //                          cardnumber:data.result[i].msisdn,
-        //                          zflow:data.result[i].dataLimit,
-        //                          syflow:sy,
-        //                          operator:data.result[i].operators,
-        //                          carddate:data.result[i].serviceStartDate,
-        //                          enddate:data.result[i].serviceEndDate,
-        //                          enterdate:data.result[i].serviceStartDate
-        //                      },
-        //                      success:function (data){
-        //                          console.log(data)
-        //                      }
-        //                  })
-        //              }
-        //             }
-        //         })
-        //     }
-        // })
 
+    if (qb === "鍗庢槦鏅烘帶") {
+        var add = localStorage.getItem("getadd")
+        var up = localStorage.getItem("getup")
+        var getde = localStorage.getItem("getde")
+        console.log(getde)
+        if (add == 1) {
+            var button = document.getElementById('btn-add');
+            // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
+        if (up == 1) {
+            var button = document.getElementById('btn-update');
 
-        //鏌ユ壘娴侀噺姹犲悕绉�
-        // $.ajax({
-        //     url: '/HxzkFlow/hxzk/wlk',
-        //     data: {
-        //         Nonce: nonce,
-        //         Timestamp: formattedTime,
-        //         targetUrl: "https://api.spruceiot.cn/api/v1/pool/list/query",
-        //         targetUrl1: "?queryType=0&pageIndex=1&pageSize=100"
-        //     },
-        //     success: function (data) {
-        //
-        //         for (var i = 0; i<data.result.list.length;i++){
-        //             console.log(data.result.list[i].name)
-        //         }
-        //     }
-        // })
+            // 璁剧疆寮忓睘鎬ф潵闅愯棌鎸夐挳
+            button.classList.add('layui-btn-disabled');
+        }
+        if (getde == 1) {
+            var button = document.getElementById('btndelete');
 
-        //鏇存敼鍗″彿鍏徃鍚嶇О
-        // $.ajax({
-        //     url: '/HxzkFlow/hxzk/wlk',
-        //     data: {
-        //         Nonce: nonce,
-        //         Timestamp: formattedTime,
-        //         targetUrl: "https://api.spruceiot.cn/api/v1/pool/member/query",
-        //         targetUrl1: "?poolID=80&pageIndex=1&pageSize=100"
-        //     },
-        //     success: function (data) {
-        //
-        //      for(var i =0; i<data.result.list.length;i++){
-        //          console.log(data.result.list[i].msisdn)
-        //          $.ajax({
-        //              url: '/HxzkFlow/hxzk/proxyCardcompanyUp',
-        //              method: 'POST',
-        //              data:{
-        //                  card:data.result.list[i].msisdn,
-        //                  name:"鍗庢槦鍖楁枟绉诲姩1G鍏变韩姹�"
-        //              }
-        //          })
-        //      }
-        //     }
-        // })
-
-
-
-        // $.ajax({
-        //     url:'/HxzkFlow/hxzk/proxyCardList',
-        //     method:"post",
-        //     data:{
-        //         Nonce:nonce,
-        //         Timestamp:formattedTime,
-        //         targetUrl:"https://api.spruceiot.cn/api/v1/sim/list/query",
-        //         targetUrl1:"?pageIndex=1&pageSize=100"
-        //     },
-        //     success:function (data) {
-        //         //鎶婃墍鏈夊崱鍙峰瓨鍏ユ暟鎹簱锛�
-        //             console.log(data.result.total)
-        //     }
-        // })
-
-
-
-
-        $.get("/HxzkFlow/hxzk/chawu",function (data){
+// 浣挎寜閽笉鍙偣鍑�
+            button.classList.add('layui-btn-disabled');
+        }
+        $.get("/HxzkFlow/hxzk/chawu", function (data) {
             $(".zk").text(data[0])
             $(".by").text(data[1])
             $(".cy").text(data[2])
             $(".dw").text(data[3])
             $(".jjdl").text(data[4])
         })
-        setInterval(function() {
-            $.get("/HxzkFlow/hxzk/chawu",function (data){
+        setInterval(function () {
+            $.get("/HxzkFlow/hxzk/chawu", function (data) {
                 $(".zk").text(data[0])
                 $(".by").text(data[1])
                 $(".cy").text(data[2])
@@ -544,51 +622,57 @@
                 $(".jjdl").text(data[4])
             })
         }, 60000);
+    } else if (qb === "璁垮"){
+            // document.getElementById('btn-add').style.display = 'none';
+            // document.getElementById('btn-update').style.display = 'none';
+            // document.getElementById('btndelete').style.display = 'none';
+
     }else{
 
-
     }
+
     /**
      * 鍒ゆ柇鐢ㄦ埛鍦ㄨ瀹氱殑鏃堕棿鍐呮病鏈夋搷浣滅郴缁燂紝鍒欏埛鏂版祻瑙堝櫒
      * 鍙傛暟锛氭椂闂达紙鍗曚綅鍒嗛挓锛�
      * */
-    function timeUserFun(time){
+    function timeUserFun(time) {
         var time = time || 2;
         var userTime = 3600;
         var objTime = {
-            init:0,
-            time:function(){
+            init: 0,
+            time: function () {
                 objTime.init += 1;
-                if(objTime.init === userTime){// 杈惧埌闄愬埗鏃堕棿鏃讹紝鐢ㄦ埛鏈搷浣滀簨浠讹紝鍒欏埛鏂版暣涓〉闈�
+                if (objTime.init === userTime) {// 杈惧埌闄愬埗鏃堕棿鏃讹紝鐢ㄦ埛鏈搷浣滀簨浠讹紝鍒欏埛鏂版暣涓〉闈�
                     localStorage.removeItem("gsjc")
                     sessionStorage.removeItem("admin")
                     alert("鎮ㄩ暱鏃堕棿鏈搷浣滃綋鍓嶉〉闈紝璇烽噸鏂扮櫥褰�")
-                    var data = "Zong="+sessionStorage.getItem("admin");
+                    var data = "Zong=" + sessionStorage.getItem("admin");
                     //鑾峰彇璇ョ敤鎴锋渶鏂版椂闂�
-                    $.post("/HxzkFlow/hxzk/userdate",data,function (data){
+                    $.post("/HxzkFlow/hxzk/userdate", data, function (data) {
 
                     })
                     parent.location.reload()
                     //杈惧埌闄愬埗鏃堕棿娌℃搷浣滐紝鎵�瑕佹墽琛岀殑鍔ㄤ綔
                 }
             },
-            eventFun:function(){
+            eventFun: function () {
                 //娓呴櫎涓婃鐩戝惉锛岄噸鏂板紑濮嬫柊鐨勭洃鍚�
                 clearInterval(testUser);
                 objTime.init = 0;
-                testUser = setInterval(objTime.time,1000);
+                testUser = setInterval(objTime.time, 1000);
             }
         };
         //鐩戝惉褰撳墠鏃堕棿娴佸姩
-        var testUser = setInterval(objTime.time,1000);
+        var testUser = setInterval(objTime.time, 1000);
 
         //鐩戝惉鐩稿簲浜嬩欢
         var body = document.querySelector('html');
-        body.addEventListener("click",objTime.eventFun);
-        body.addEventListener("keydown",objTime.eventFun);
-        body.addEventListener("mousemove",objTime.eventFun);
-        body.addEventListener("mousewheel",objTime.eventFun);
+        body.addEventListener("click", objTime.eventFun);
+        body.addEventListener("keydown", objTime.eventFun);
+        body.addEventListener("mousemove", objTime.eventFun);
+        body.addEventListener("mousewheel", objTime.eventFun);
     }
+
     (function () {
         timeUserFun(1);
 
@@ -597,236 +681,342 @@
 
 
 
-    layui.use(['layer', 'form'], function(){
+    layui.use(['layer', 'form'], function () {
         var layer = layui.layer
-            ,form = layui.form;
+            , form = layui.form;
 
 
         //浠庢湰鍦板瓨鍌ㄨ幏鍙栫敤鎴风櫥褰曚俊鎭紝濡傛灉鏄瓙璐﹀彿锛屽彧鏄剧ずelse 濡傛灉鏄�昏处鍙锋樉绀篿f
-        layui.use('table', function(){
+        layui.use('table', function () {
             var table = layui.table;
 
             var Zong = localStorage.getItem("gsjc")
-            var data ="Zong="+Zong
-            if(Zong == null){
-            }else{
-                $.post("/HxzkFlow/hxzk/jiemi",data,function (data){
-                    if(data == "1"){
+            var data = "Zong=" + Zong
+
+            if (Zong == null) {
+            } else {
+
+
+                $.post("/HxzkFlow/hxzk/jiemi", data, function (data) {
+                    if (data == "1") {
+
+                        // form.render();
+                        // $("#hide").hide();
+                        // $("#relo").css("left","-60px")
+                        // $("#select").css("left","620px")
+                        // $("#cardnum").css("left","620px")
                         table.render({
                             elem: '#demo'
-                            ,layEvent: 'LAYTABLE_TIPS'
-                            ,height: 780
-                            ,url: '/HxzkFlow/hxzk/FindCard' //鏁版嵁鎺ュ彛
+                            , layEvent: 'LAYTABLE_TIPS'
+                            , height: 850
+                            , url: '/HxzkFlow/hxzk/FindCard' //鏁版嵁鎺ュ彛
                             // ,cellMinWidth: 80
-                            ,width: 1680
-                            ,autoWidth: true
-                            ,page: true //寮�鍚垎椤�
-                            ,toolbar:'#toolbarDemo'
-                            ,defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
+                            , width: 1680
+                            , autoWidth: true
+                            , page: true //寮�鍚垎椤�
+                            , toolbar: '#toolbarDemo'
+                            , defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
                                 title: '鎻愮ず'
-                                ,layEvent: 'LAYTABLE_TIPS'
-                                ,icon: 'layui-icon-tips'
+                                , layEvent: 'LAYTABLE_TIPS'
+                                , icon: 'layui-icon-tips'
                             }]
-                            ,cols: [[ //琛ㄥご
-                                {type:'checkbox',sort: true,fixed: "left"}
-                                ,{field: 'num', title: '搴忓彿',  sort: true,width:'75'}
-                                ,{field: 'company', title: '鎵�灞炲叕鍙�', width:'250'}
-                                ,{field: 'cardnumber', title: '鍗″彿',  sort: true,width:'200'}
-                                ,{field:'status', title: '鐘舵��',templet: '#titleTpl',width:'90'}
-                                ,{field: 'flow', title: '娴侀噺',  sort: true,width:'80'}
+                            , cols: [[ //琛ㄥご
+                                {type: 'checkbox', sort: true, fixed: "left"}
+                                , {field: 'num', title: '搴忓彿', sort: true, width: '75'}
+                                , {field: 'company', title: '鎵�灞炲叕鍙�', width: '250'}
+                                , {field: 'cardnumber', title: '鍗″彿', sort: true, width: '200'}
+                                , {field: 'status', title: '鐘舵��', templet: '#titleTpl', width: '90'}
+                                , {field: 'flow', title: '娴侀噺', sort: true, width: '80'}
                                 // ,{field: 'zflow', title: '鎬绘祦閲�(MB)', }
                                 // ,{field: 'syflow', title: '宸茬敤娴侀噺(MB)', }
-                                ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', width:'85'}
+                                , {field: 'remainingdays', title: '鍓╀綑澶╂暟', width: '85'}
                                 // ,{field: 'syll', title: '鍓╀綑娴侀噺(MB)', }
-                                ,{field: 'carddate', title: '寮�濮嬫棩鏈�',  sort: true,width:'110'}
-                                ,{field: 'operator', title: '杩愯惀鍟�',  sort: true,width:'110'}
+                                , {field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true, width: '110'}
+                                , {field: 'operator', title: '杩愯惀鍟�', sort: true, width: '110'}
 
-                                ,{field: 'unitprice', title: '鍗曚环',  sort: true,width:'75'}
-                                ,{field: 'bindid', title: '缁戝畾璁惧',width:'90'}
+                                , {field: 'unitprice', title: '鍗曚环', sort: true, width: '75'}
+                                , {field: 'bindid', title: '缁戝畾璁惧', width: '90'}
                                 // ,{field: 'location', title: '鎵�鍦ㄥ湴', sort: true}
                                 // ,{field: 'notes', title: '澶囨敞', sort: true}
-                                ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true,width:'110'}
-                                ,{field: 'enterdate', title: '褰曞叆鏃ユ湡', sort: true,width:'110'}
-                                ,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true,width:'110'}
-                                ,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true,width:'100'}
+                                , {field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true, width: '110'}
+                                , {field: 'enterdate', title: '褰曞叆鏃ユ湡', sort: true, width: '110'}
+                                , {field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true, width: '110'}
+                                , {field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true, width: '100'}
 
 
                             ]],
-                            limit:100,
-                            limits:[10,20,30,40,50,60,70,80,90,100],
+                            limit: 100,
+                            limits: [10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
                         });
-                    }else{
-                        $("#relo").css("left","-620px")
-                        var Zi = localStorage.getItem("gsmc")
-                        var dt ="Zong="+Zi
-                        $.post("/HxzkFlow/hxzk/chaZi",dt,function (data){
-                            var jc = Zi;
+                    } else {
+                        if (Zong=="璁垮"){
+                            // $("#relo").hide();
+                            $("#select").css("left", "160px")
+                            // $("#relo").css("left", "-60px")
                             table.render({
                                 elem: '#demo'
-                                ,layEvent: 'LAYTABLE_TIPS'
-                                ,height: 780
-                                ,url: '/HxzkFlow/hxzk/FindCardZi?Zong='+jc //鏁版嵁鎺ュ彛
-                                ,cellMinWidth: 80
-                                ,page: true //寮�鍚垎椤�
-                                ,limit: 100
-                                ,toolbar:'#toolbarDemo1'
-                                ,defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
+                                , layEvent: 'LAYTABLE_TIPS'
+                                , height: 850
+                                , url: '/HxzkFlow/hxzk/FindCard' //鏁版嵁鎺ュ彛
+                                // ,cellMinWidth: 80
+                                , width: 1680
+                                , autoWidth: true
+                                , page: true //寮�鍚垎椤�
+                                , toolbar: '#toolbarDemo2'
+                                , defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
                                     title: '鎻愮ず'
-                                    ,layEvent: 'LAYTABLE_TIPS'
-                                    ,icon: 'layui-icon-tips'
+                                    , layEvent: 'LAYTABLE_TIPS'
+                                    , icon: 'layui-icon-tips'
                                 }]
-                                ,cols: [[ //琛ㄥご
-                                    {type:'checkbox',sort: true,fixed: "left",top:10}
-                                    ,{field: 'num', title: '搴忓彿', sort: true,width:'5%'}
-                                    ,{field: 'cardnumber', title: '鍗″彿',  sort: true,width: 210}
-                                    ,{field: 'company', title: '鍏徃',  sort: true,width: 220}
-                                    ,{field:'status', title: '鐘舵��',templet: '#titleTpl',width: 100}
-                                    ,{field: 'flow', title: '娴侀噺',  sort: true}
-                                    // ,{field: 'zflow', title: '鎬绘祦閲�(MB)',width: 120 }
-                                    // ,{field: 'syflow', title: '宸茬敤娴侀噺(MB)',sort: true,width: 130 }
-                                    // ,{field: 'syll', title: '鍓╀綑娴侀噺(MB)', width: 120}
-                                    ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', }
-                                    ,{field: 'carddate', title: '寮�濮嬫棩鏈�',  sort: true}
-                                    ,{field: 'operator', title: '杩愯惀鍟�',  sort: true}
-                                    ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
-                                    ,{field: 'unitprice', title: '鍗曚环',  sort: true}
-                                    ,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
-                                    ,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
-
-
+                                , cols: [[ //琛ㄥご
+                                    {type: 'checkbox', sort: true, fixed: "left"}
+                                    , {field: 'num', title: '搴忓彿', sort: true, width: '75'}
+                                    , {field: 'company', title: '鎵�灞炲叕鍙�', width: '250'}
+                                    , {field: 'cardnumber', title: '鍗″彿', sort: true, width: '200'}
+                                    , {field: 'status', title: '鐘舵��', templet: '#titleTpl', width: '90'}
+                                    , {field: 'flow', title: '娴侀噺', sort: true, width: '80'}
+                                    , {field: 'remainingdays', title: '鍓╀綑澶╂暟', width: '85'}
+                                    , {field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true, width: '110'}
+                                    , {field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true, width: '110'}
+                                    , {field: 'enterdate', title: '褰曞叆鏃ユ湡', sort: true, width: '180'}
                                 ]],
-                                limit:100,
-                                limits:[10,20,30,40,50,60,70,80,90,100],
+                                limit: 100,
+                                limits: [10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
                             });
-                        })
+                        }else{
+                            $("#hide").hide();
+                            $("#relo").css("left", "-60px")
+                            $("#select").css("left", "620px")
+                            $("#cardnum").css("left", "620px")
+
+                            var Zi = localStorage.getItem("gsmc")
+                            console.log(Zi)
+                            var dt = "Zong=" + Zi
+                            var field = data.field;
+                            $.post("/HxzkFlow/hxzk/chaZi", dt, function (data) {
+                                var jc = Zi;
+                                table.render({
+                                    elem: '#demo'
+                                    , layEvent: 'LAYTABLE_TIPS'
+                                    , height: 850
+                                    , url: '/HxzkFlow/hxzk/FindCardZi' //鏁版嵁鎺ュ彛
+                                    , method: 'post'
+                                    , cellMinWidth: 80
+                                    , page: true //寮�鍚垎椤�
+                                    , limit: 100
+                                    , where: {company: Zi} // 鎼滅储鐨勫瓧娈�
+                                    , toolbar: '#toolbarDemo1'
+                                    , defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
+                                        title: '鎻愮ず'
+                                        , layEvent: 'LAYTABLE_TIPS'
+                                        , icon: 'layui-icon-tips'
+                                    }]
+                                    , cols: [[ //琛ㄥご
+                                        {type: 'checkbox', sort: true, fixed: "left", top: 10}
+                                        , {field: 'num', title: '搴忓彿', sort: true, width: '5%'}
+                                        , {field: 'cardnumber', title: '鍗″彿', sort: true, width: 210}
+                                        , {field: 'company', title: '鍏徃', sort: true, width: 220}
+                                        , {field: 'status', title: '鐘舵��', templet: '#titleTpl', width: 100}
+                                        , {field: 'flow', title: '娴侀噺', sort: true}
+                                        // ,{field: 'zflow', title: '鎬绘祦閲�(MB)',width: 120 }
+                                        // ,{field: 'syflow', title: '宸茬敤娴侀噺(MB)',sort: true,width: 130 }
+                                        // ,{field: 'syll', title: '鍓╀綑娴侀噺(MB)', width: 120}
+                                        , {field: 'remainingdays', title: '鍓╀綑澶╂暟',}
+                                        , {field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true}
+                                        , {field: 'operator', title: '杩愯惀鍟�', sort: true}
+                                        , {field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
+                                        , {field: 'unitprice', title: '鍗曚环', sort: true}
+                                        , {field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
+                                        , {field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
+
+
+                                    ]],
+                                    limit: 100,
+                                    limits: [10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
+                                });
+                            })
+                        }
+
                     }
                 })
             }
-
-
-
+        // }, 500);
 
             //澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(demo)', function(obj){
+            table.on('toolbar(demo)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
-                switch(obj.event) {
+                var add = localStorage.getItem("getadd")
+                var up = localStorage.getItem("getup")
+                var getde = localStorage.getItem("getde")
+                switch (obj.event) {
                     case 'getDelete':
                         var data = checkStatus.data;
-                        if(data.length == 0){
-                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
-                        }else{
-                            var nums = [];
-                            for (var i = 0; i < data.length; i++) {
-                                nums.push(JSON.stringify(data[i].num))
-                                var datas = "num="+JSON.stringify(data[i].num)
-                                $.post("/HxzkFlow/hxzk/DeleteCard",datas,function (data){
+//                         if (getde==1){
+//                             // 鑾峰彇鎸夐挳鍏冪礌
+//                             var button = document.getElementById('myButton');
+//
+// // 鏀瑰彉鎸夐挳棰滆壊
+// //                             button.classList.add('layui-btn-custom');
+//
+// // 浣挎寜閽笉鍙偣鍑�
+//                             button.classList.add('layui-btn-disabled');
+//                             layer.alert("鎮ㄦ棤鏉冮檺鎿嶄綔")
+//                         }else{
+                            if (data.length == 0) {
+                                layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                            } else {
+                                var nums = [];
+                                for (var i = 0; i < data.length; i++) {
+                                    nums.push(JSON.stringify(data[i].num))
+                                    var datas = "num=" + JSON.stringify(data[i].num)+"&caozuoname="+getUserName
+                                    $.post("/HxzkFlow/hxzk/DeleteCard", datas, function (data) {
 
-                                });
+                                    });
+                                }
+                                layer.alert("鍒犻櫎鎴愬姛")
                             }
-                            layer.alert("鍒犻櫎鎴愬姛")
-                        }
+                        // }
+
                         layui.table.reload('demo')
                         break;
                     case 'getUpdate':
                         var data = checkStatus.data;
-                        if(data.length>1){
-                            layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
-                        }else if(data.length == 0){
-                            layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
-                        }else{
-                            showUpdate();
-                            console.log(data[0])
-                            var o = data[0].operator
-                            console.log("tijiao11111111111")
-                            $("#card").val(data[0])
-                            $("#cardnumber").val(data[0].cardnumber)
-                            $(".upnum").val(data[0].num);
-                            $("#xgkh").val(data[0].cardnumber);
-                            $("#xggs").val(data[0].company);
-                            $("#carddateu").val(data[0].carddate);
-                            $("#enddateu").val(data[0].enddate);
-                            $("#unitpriceu").val(data[0].unitprice);
-                            $("#operatoru").val(data[0].operator);
-                            $("#flowu").val(data[0].flow);
-                            form.render();
-                        }
+
+                            if (data.length > 1) {
+                                // layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
+                                showUpdate2();
+                                var cnum = []
+                                var id = []
+
+                                for (let i = 0; i < data.length; i++) {
+                                    console.log(data[i].cardnumber)
+                                    cnum.push(data[i].cardnumber)
+                                    id.push(data[i].num)
+                                }
+                                console.log(cnum)
+                                // $("#card").val(data[0])
+                                $("#cardnumber2").val(cnum)
+                                $("#cardid").val(id)
+                                // $(".upnum").val(data[0].num);
+                                // $("#xgkh").val(data[0].cardnumber);
+                                // $("#xggs").val(data[0].company);
+                                // $("#carddateu2").val(data[0].carddate);
+                                // $("#enddateu2").val(data[0].enddate);
+                                // $("#unitpriceu2").val(data[0].unitprice);
+                                // $("#operatoru").val(data[0].operator);
+                                // $("#flowu").val(data[0].flow);
+                                form.render();
+                            } else if (data.length == 0) {
+                                layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+                            } else {
+                                showUpdate();
+                                console.log(data[0])
+                                var o = data[0].operator
+                                console.log("tijiao11111111111")
+                                $("#card").val(data[0])
+
+
+                                $("#cardnumber").val(data[0].cardnumber)
+                                $(".upnum").val(data[0].num);
+                                $("#xgkh").val(data[0].cardnumber);
+                                $("#xggs").val(data[0].company);
+                                $("#carddateu").val(data[0].carddate);
+                                $("#enddateu").val(data[0].enddate);
+                                $("#unitpriceu").val(data[0].unitprice);
+                                $("#operatoru").val(data[0].operator);
+                                $("#flowu").val(data[0].flow);
+                                form.render();
+                            }
+                        // }
                         break;
                     case 'getadd':
                         var data = checkStatus.data;
-                        add();
-                        form.on('select(ddtt)', function(data){
+                        // if (add==1){
+                        //     layer.alert("鎮ㄦ棤鏉冮檺鎿嶄綔")
+                        // }else {
+                            add1();
+                            form.on('select(ddtt)', function (data) {
 
-                            // console.log(data,11111111)
-                            // if(data.value == "12G/骞�"){
-                            //     money = 80;
-                            //     // Zmoney = 80*num
-                            //     // $("#feiyong").text(money)
-                            //     $("#feiyongadd").text(money)
-                            //     // $("#zongjia").text(Zmoney)
-                            // }else if(data.value == ("24G/骞�")){
-                            //     money = 150;
-                            //     // Zmoney = 150*num
-                            //     $("#feiyongadd").text(money)
-                            //     // $("#zongjia").text(Zmoney)
-                            // }else if(data.value == "36G/骞�"){
-                            //     money = 200;
-                            //     // Zmoney = 200*num
-                            //     $("#feiyongadd").text(money)
-                            //     // $("#zongjia").text(Zmoney)
-                            // }else if(data.value == "100G/骞�"){
-                            //     money = 300;
-                            //     // Zmoney = 200*num
-                            //     $("#feiyongadd").text(money)
-                            //     // $("#zongjia").text(Zmoney)
-                            // }else{
-                            //     $("#feiyongadd").text("")
-                            //     $("#zongjia").text("")
-                            // }
-                        });
+                                // console.log(data,11111111)
+                                // if(data.value == "12G/骞�"){
+                                //     money = 80;
+                                //     // Zmoney = 80*num
+                                //     // $("#feiyong").text(money)
+                                //     $("#feiyongadd").text(money)
+                                //     // $("#zongjia").text(Zmoney)
+                                // }else if(data.value == ("24G/骞�")){
+                                //     money = 150;
+                                //     // Zmoney = 150*num
+                                //     $("#feiyongadd").text(money)
+                                //     // $("#zongjia").text(Zmoney)
+                                // }else if(data.value == "36G/骞�"){
+                                //     money = 200;
+                                //     // Zmoney = 200*num
+                                //     $("#feiyongadd").text(money)
+                                //     // $("#zongjia").text(Zmoney)
+                                // }else if(data.value == "100G/骞�"){
+                                //     money = 300;
+                                //     // Zmoney = 200*num
+                                //     $("#feiyongadd").text(money)
+                                //     // $("#zongjia").text(Zmoney)
+                                // }else{
+                                //     $("#feiyongadd").text("")
+                                //     $("#zongjia").text("")
+                                // }
+                            });
+                        // }
                         break;
                     case 'getchongzhi':
                         var data = checkStatus.data;
-                        $("#feiyong").text("")
+                        $("#feiyong").val("")
                         $("#zongjia").text("")
+
                         //閫夋嫨鍗$殑鏁伴噺
                         var num = data.length;
                         var cardNum = [];
                         var card = [];
                         var zong = 0;
                         var feiyong = [];
+                        var cardid = [];
                         for (var i = 0; i < data.length; i++) {
-                            if(i == data.length-1){
+                            if (i == data.length - 1) {
                                 chongzhiCompany += data[i].company;
                             }
                             card.push(data[i].cardnumber)
-                            zong = zong+data[i].unitprice
-                            feiyong.push(data[i].unitprice.toString())
+                            zong = zong + data[i].unitprice
+                            feiyong.push(data[i].unitprice)
                             cardNum.push(JSON.stringify(data[i].cardnumber))
-                            var datas = "num="+JSON.stringify(data[i].cardnumber)
+                            cardid.push(data[i].num)
+                            var datas = "num=" + JSON.stringify(data[i].cardnumber)
                         }
+                        $("#cardid").val(cardid);
                         $("#cardnumber").val(card)
-                        $(".hao").text("褰撳墠宸查�夋嫨"+num+"涓崱鍙�")
+                        $(".hao").text("褰撳墠宸查�夋嫨" + num + "涓崱鍙�")
+                        $("#flowc").val(data[0].flow);
                         chongzhi()
-                        var money=0;
-                            //     Zmoney = 80*num
-                                $("#feiyong").text(feiyong)
-                                $("#zongjia").text(zong)
+                        console.log($("#zongjia").text())
+                        var money = 0;
+                        //     Zmoney = 80*num
+                        $("#feiyong").val(feiyong)
+                        $("#zongjia").text(zong)
+                        form.render();
                         break;
-                };
+                }
+                ;
             });
             // 鎼滅储鎻愪氦
-            form.on('submit(demo-table-search)', function(data){
+            form.on('submit(demo-table-search)', function (data) {
                 var field = data.field; // 鑾峰緱琛ㄥ崟瀛楁
-                if(field.company != ""){
-                    if(localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+                if (field.company != "") {
+                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶") {
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
-                            ,done: function(res, curr, count) {
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                            , done: function (res, curr, count) {
                                 // res涓烘帴鍙h繑鍥炵殑鏁版嵁
                                 if (res.data.length > 0) {
 
@@ -836,15 +1026,15 @@
                             }
                         });
                         layer.msg('鎼滅储鎴愬姛');
-                    }else if(field.company == localStorage.getItem("gsmc")){
+                    } else if (field.company == localStorage.getItem("gsjc") || field.company == localStorage.getItem("gsmc")) {
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
-                            ,done: function(res, curr, count) {
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                            , done: function (res, curr, count) {
                                 // res涓烘帴鍙h繑鍥炵殑鏁版嵁
                                 if (res.data.length > 0) {
 
@@ -854,30 +1044,59 @@
                             }
                         });
                         layer.msg('鎼滅储鎴愬姛');
-                    }else{
+                    } else if (localStorage.getItem("gsjc") == "璁垮"){
+                        table.reload('demo', {
+                            url: "/HxzkFlow/hxzk/tableSearch",
+                            method: 'post',
+                            page: {
+                                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+                            }
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                            , done: function (res, curr, count) {
+                                // res涓烘帴鍙h繑鍥炵殑鏁版嵁
+                                if (res.data.length > 0) {
+
+                                } else {
+                                    alert("鎼滅储鐨勫唴瀹逛笉瀛樺湪")
+                                }
+                            }
+                        });
+                        layer.msg('鎼滅储鎴愬姛');
+                    } else {
                         alert("娌℃湁鏉冮檺鏌ヨ鍏朵粬鍏徃")
                     }
-                }else{
-                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+                } else {
+                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶") {
                         field.company = localStorage.getItem("gsjc");
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
+                            , where: field // 鎼滅储鐨勫瓧娈�
                         });
                         layer.msg('鎼滅储鎴愬姛');
-                    }else{
+                    } else if(localStorage.getItem("gsjc") == "璁垮"){
+                        field.company = localStorage.getItem("gsjc");
+                        table.reload('demo', {
+                            url: "/HxzkFlow/hxzk/tableSearch",
+                            method: 'post',
+                            page: {
+                                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+                            }
+                            , where: field // 鎼滅储鐨勫瓧娈�
+                        });
+                        layer.msg('鎼滅储鎴愬姛');
+                    }else {
                         field.company = localStorage.getItem("gsmc")
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
+                            , where: field // 鎼滅储鐨勫瓧娈�
                         });
                         layer.msg('鎼滅储鎴愬姛');
                     }
@@ -887,53 +1106,53 @@
                 return false; // 闃绘榛樿 form 璺宠浆
             });
             //
-            form.on('submit(demo-table-search1)', function(data){
+            form.on('submit(demo-table-search1)', function (data) {
                 var field = data.field; // 鑾峰緱琛ㄥ崟瀛楁
-                if(field.company != ""){
-                    if(localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+                if (field.company != "") {
+                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶") {
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
+                            , where: field // 鎼滅储鐨勫瓧娈�
                         });
                         layer.msg('鎼滅储鎴愬姛');
-                    }else if(field.company == localStorage.getItem("gsmc")){
+                    } else if (field.company == localStorage.getItem("gsmc")) {
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
+                            , where: field // 鎼滅储鐨勫瓧娈�
                         });
                         layer.msg('鎼滅储鎴愬姛');
-                    }else{
+                    } else {
                         alert("娌℃湁鏉冮檺鏌ヨ鍏朵粬鍏徃")
                     }
-                }else{
-                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+                } else {
+                    if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶") {
                         field.company = "";
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
+                            , where: field // 鎼滅储鐨勫瓧娈�
                         });
                         layer.msg('鎼滅储鎴愬姛');
-                    }else{
+                    } else {
                         field.company = localStorage.getItem("gsmc")
                         table.reload('demo', {
                             url: "/HxzkFlow/hxzk/tableSearch",
-                            method:'post',
+                            method: 'post',
                             page: {
                                 curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
                             }
-                            ,where: field // 鎼滅储鐨勫瓧娈�
+                            , where: field // 鎼滅储鐨勫瓧娈�
                         });
                         layer.msg('鎼滅储鎴愬姛');
                     }
@@ -948,168 +1167,208 @@
 
 
     //鏂板
-    function add(){
-        $(".add").show();
+    function add1() {
+        $(".add1").show();
         $(".heimu").show();
     }
-    function canseladd(){
-        $(".add").hide();
+
+    function canseladd() {
+        $(".add1").hide();
         $(".heimu").hide();
     }
+
     //鍏呭��
-    function chongzhi(){
+    function chongzhi() {
         $(".chongzhi").show();
         $(".heimu").show();
     }
-    function canselchongzhi(){
+
+    function canselchongzhi() {
         $(".chongzhi").hide();
         $(".heimu").hide();
     }
+
     //淇敼
-    function canselupdate(){
+    function canselupdate() {
         $(".update").hide();
         $(".heimu").hide();
         $(".updateZong").hide();
     }
-    function showUpdate(){
+
+    function showUpdate() {
         console.log("tijiao2222222222222")
         var gsjc = localStorage.getItem("gsjc");
-        if(gsjc == "鍗庢槦鏅烘帶"){
+        if (gsjc == "鍗庢槦鏅烘帶") {
             $(".updateZong").show();
             $(".heimu").show();
-        }else{
+        } else {
             $(".update").show();
             $(".heimu").show();
         }
 
     }
 
-    function checkupdate() {
-        console.log("11111111111111111")
-        console.log($("#card").val())
-        console.log($("#cardnumber").val())
-        var add1 = $("#xggs").val();
-        var add2 =  $("#cardnumber").val();
-        var add3 =  $("#carddateu").val();
-        var add4 =  $("#operatoru").val();
-        // var add4 =  $("#flowadd1").val();
-        var add12 =  $("#unitpriceu").val();
-        // var add5 =  $("#bindidadd1").val();
-        // var add6 =  $("#locationadd1").val();
-        // var add7 =  $("#notesadd1").val();
-        var add8 = $("#enddateu").val();
-        var add9 = "0";
-        var add10 =  $("#flowu").val();
-        // var add11 =  $("#feiyongadd").val();
-        if(add1 == "" || add1 == null){
-            layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
-            return false;
-        }else if(add2 == "" || add2 == null){
-            layer.alert("璇疯緭鍏ュ崱鍙�")
-            return false;
-        }else if(add3 == "" || add3 == null){
+    function canselupdate2() {
+        $(".update2").hide();
+        $(".heimu").hide();
+        $(".updateZong2").hide();
+    }
+
+    function showUpdate2() {
+        console.log("tijiao2222222222222")
+        var gsjc = localStorage.getItem("gsjc");
+        if (gsjc == "鍗庢槦鏅烘帶") {
+            $(".updateZong2").show();
+            $(".heimu").show();
+        } else {
+            $(".update2").show();
+            $(".heimu").show();
+        }
+
+    }
+
+    function checkupdate2() {
+        var add2 = $("#cardnumber2").val();
+        var add3 = $("#carddateu2").val();
+        var add12 = $("#unitpriceu2").val();
+        var add8 = $("#enddateu2").val();
+        if (add3 == "" || add3 == null) {
             layer.alert("璇烽�夋嫨寮�濮嬫棩鏈�")
             return false;
-        }else if(add8 == "" || add8 == null){
+        } else if (add8 == "" || add8 == null) {
             layer.alert("璇烽�夋嫨缁撴潫鏃ユ湡")
             return false;
-        }else if(add4 == "" || add4 == null){
-            layer.alert("璇烽�夋嫨杩愯惀鍟�")
-            return false;
-        }else if(add10 == "" || add10 == null){
-            layer.alert("璇烽�夋嫨娴侀噺")
-            return false;
-        }else if(add12 == "" || add12 == null){
+        } else if (add12 == "" || add12 == null) {
             layer.alert("璇烽�夋嫨鍗曚环")
             return false;
-        }else{
-            // if(parts.length>1){
-            //     for (var i = 0 ; i<parts.length;i++){
+        } else {
+            var parts = add2.replace(/\s*/g, "").split(",");
+            var upp = "cardnumber=" + parts + "&carddate=" + add3 + "&enddate=" + add8 + "&unitprice=" + add12+"&caozuoname="+getUserName
+            $.ajax({
+                url: "/HxzkFlow/hxzk/updateBatchById",
+                type: "POST",
+                data: upp,
+                async: false,
+                success: function (data) {
+                    return true;
+                }
+            });
+        }
+    }
 
-            var upp = "company="+add1+"&cardnumber="+add2+"&carddate="+add3+"&operator="+add4+"&enddate="+add8+"&flow="+add10+"&unitprice="+add12
+    function checkupdate() {
+        var add1 = $("#xggs").val();
+        var add2 = $("#cardnumber").val();
+        var add3 = $("#carddateu").val();
+        var add4 = $("#operatoru").val();
+        var add12 = $("#unitpriceu").val();
+        var add8 = $("#enddateu").val();
+        var add9 = "0";
+        var add10 = $("#flowu").val();
+        // var add11 =  $("#feiyongadd").val();
+        if (add1 == "" || add1 == null) {
+            layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
+            return false;
+        } else if (add2 == "" || add2 == null) {
+            layer.alert("璇疯緭鍏ュ崱鍙�")
+            return false;
+        } else if (add3 == "" || add3 == null) {
+            layer.alert("璇烽�夋嫨寮�濮嬫棩鏈�")
+            return false;
+        } else if (add8 == "" || add8 == null) {
+            layer.alert("璇烽�夋嫨缁撴潫鏃ユ湡")
+            return false;
+        } else if (add4 == "" || add4 == null) {
+            layer.alert("璇烽�夋嫨杩愯惀鍟�")
+            return false;
+        } else if (add10 == "" || add10 == null) {
+            layer.alert("璇烽�夋嫨娴侀噺")
+            return false;
+        } else if (add12 == "" || add12 == null) {
+            layer.alert("璇烽�夋嫨鍗曚环")
+            return false;
+        } else {
+            var upp = "company=" + add1 + "&cardnumber=" + add2 + "&carddate=" + add3 + "&operator=" + add4 + "&enddate=" + add8 + "&flow=" + add10 + "&unitprice=" + add12+"&caozuoname="+getUserName
             console.log(upp)
-            $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
+            $.post("/HxzkFlow/hxzk/UpdateChong", upp, function (data) {
 
             })
             console.log(66666666)
+
             return true;
         }
-        // var parts = add2.replace(/\s*/g,"").split(";");
-        // var parts;
-        // var parts1 = add5.split(";");
-
-
     }
+
     //鏂板鎴愬姛
     function checkadd() {
         console.log("11111111111111111")
-        console.log( $("#cardnumberadd1").val())
+        console.log($("#cardnumberadd1").val())
         var add1 = $("#companyadd1").val();
-        var add2 =  $("#cardnumberadd1").val();
-        var add3 =  $("#carddateadd1").val();
-        var add4 =  $("#operatoradd1").val();
+        var add2 = $("#cardnumberadd1").val();
+        var add3 = $("#carddateadd1").val();
+        var add4 = $("#operatoradd1").val();
         // var add4 =  $("#flowadd1").val();
-        var add12 =  $("#unitprice").val();
-        var add5 =  $("#bindidadd1").val();
-        var add6 =  $("#locationadd1").val();
-        var add7 =  $("#notesadd1").val();
+        var add12 = $("#unitprice").val();
+        var add5 = $("#bindidadd1").val();
+        var add6 = $("#locationadd1").val();
+        var add7 = $("#notesadd1").val();
         var add8 = $("#enddateadd1").val();
         var add9 = "0";
-        var add10 =  $("#flowadd1").val();
-        var add11 =  $("#feiyongadd").val();
-        if(add1 == "" || add1 == null){
+        var add10 = $("#flowadd1").val();
+        var add11 = $("#feiyongadd").val();
+        if (add1 == "" || add1 == null) {
             layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
             return false;
-        }else if(add2 == "" || add2 == null){
+        } else if (add2 == "" || add2 == null) {
             layer.alert("璇疯緭鍏ュ崱鍙�")
             return false;
-        }else if(add3 == "" || add3 == null){
+        } else if (add3 == "" || add3 == null) {
             layer.alert("璇烽�夋嫨寮�濮嬫棩鏈�")
             return false;
-        }else if(add4 == "" || add4 == null){
+        } else if (add4 == "" || add4 == null) {
             layer.alert("璇烽�夋嫨杩愯惀鍟�")
             return false;
-        }else if(add10 == "" || add10 == null){
+        } else if (add10 == "" || add10 == null) {
             layer.alert("璇烽�夋嫨娴侀噺")
             return false;
-        }else if(add8 == "" || add8 == null){
+        } else if (add8 == "" || add8 == null) {
             layer.alert("璇烽�夋嫨缁撴潫鏃ユ湡")
             return false;
-        }else if(add11 == "" || add11 == 0){
+        } else if (add11 == "" || add11 == 0) {
             layer.alert("璇烽�夋嫨鍗曚环")
             return false;
-        }else if (add9 == "1"){
+        } else if (add9 == "1") {
             return false;
         }
-        var parts = add2.replace(/\s*/g,"").split(";");
+        var parts = add2.replace(/\s*/g, "").split(";");
         // var parts;
         var parts1 = add5.split(";");
         console.log(parts)
         console.log(parts.length)
-        if(parts.length>1){
-            for (var i = 0 ; i<parts.length;i++){
+        if (parts.length > 1) {
+            for (var i = 0; i < parts.length; i++) {
 
                 console.log("=================")
-                var data = "cardnumber="+parts[i]
+                var data = "cardnumber=" + parts[i]
                 $.ajax({
                     url: "/HxzkFlow/hxzk/ifCard",
                     type: "POST",
                     data: data,
                     async: false,
-                    success: function(data) {
-                        if(data != ""){
+                    success: function (data) {
+                        if (data != "") {
                             //宸茬粡瀛樺湪锛� 鏍规嵁鍗″彿淇敼淇℃伅
-                            var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"&notes="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
+                            var upp = "company=" + add1 + "&cardnumber=" + parts[i] + "&carddate=" + add3 + "&operator=" + add4 + "&bindid=" + add5 + "&location=" + add6 + "&notes=" + add7 + "&enddate=" + add8 + "&flow=" + add10 + "&unitprice=" + add11+"&caozuoname="+getUserName
                             console.log(upp)
-                            $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
+                            $.post("/HxzkFlow/hxzk/UpdateChong", upp, function (data) {
 
                             })
                             // parts.splice(i,2)
                             // $("#cardnumberadd1").val(parts)
-                        }else{
+                        } else {
                             console.log("33333332")
-                            var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"&notes="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
-                            $.post("/HxzkFlow/hxzk/addCard",upp,function (data){
+                            var upp = "company=" + add1 + "&cardnumber=" + parts[i] + "&carddate=" + add3 + "&operator=" + add4 + "&bindid=" + add5 + "&location=" + add6 + "&notes=" + add7 + "&enddate=" + add8 + "&flow=" + add10 + "&unitprice=" + add11+"&caozuoname="+getUserName
+                            $.post("/HxzkFlow/hxzk/addCard", upp, function (data) {
 
                             })
                         }
@@ -1119,23 +1378,23 @@
                 });
 
             }
-            if(add9 == "1"){
+            if (add9 == "1") {
                 alert("璇ュ崱鍙蜂腑鍙兘鏈夊凡缁忓瓨鍦ㄨ繃鐨�")
             }
-        }else{
-            var data = "cardnumber="+add2
+        } else {
+            var data = "cardnumber=" + add2
             $.ajax({
                 url: "/HxzkFlow/hxzk/ifCard",
                 type: "POST",
                 data: data,
                 async: false,
-                success: function(data) {
-                    if(data != ""){
+                success: function (data) {
+                    if (data != "") {
                         alert("璇ュ崱鍙峰凡瀛樺湪锛�")
                         add9 = "1";
-                    }else{
-                        var upp = "company="+add1+"&cardnumber="+add2+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"&notes="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
-                        $.post("/HxzkFlow/hxzk/addCard",upp,function (data){
+                    } else {
+                        var upp = "company=" + add1 + "&cardnumber=" + add2 + "&carddate=" + add3 + "&operator=" + add4 + "&bindid=" + add5 + "&location=" + add6 + "&notes=" + add7 + "&enddate=" + add8 + "&flow=" + add10 + "&unitprice=" + add11+"&caozuoname="+getUserName
+                        $.post("/HxzkFlow/hxzk/addCard", upp, function (data) {
 
                         })
                     }
@@ -1144,31 +1403,39 @@
         }
 
     }
+
     //閫夋嫨娴侀噺
     //鐩戝惉閫変腑浜嬩欢
 
     //
 
-    function chongzhitj(){
-        var kh = $("#cardnumber").val();
-        var unitprice ;
-        if ($("#unitpriceu").val()!=0){
-             unitprice =$("#unitpriceu").val();
-        }else if ($("#zongjia").text()!=0){
-             unitprice =$("#zongjia").text();
-        }else{
-             unitprice ="";
-        }
-        if (kh == ""){
+    function chongzhitj() {
+        console.log($("#zongjia").text())
+        var kh = ''
+        kh = $("#cardnumber").val();
+        num =  $("#cardid").val();
+        var unitprice = '';
+        // if ($("#unitpriceu").val()!=0){
+        //      unitprice =$("#unitpriceu").val();
+        // }else if ($("#zongjia").text()!=0){
+        unitprice = $("#zongjia").text();
+        console.log(unitprice)
+        // }else{
+        //      unitprice ="";
+        // }
+        if (kh == "") {
             alert("璇烽�夋嫨鍗″彿")
             return false;
         }
-        if(unitprice == "" || unitprice == 0){
+        if (unitprice == "" || unitprice == 0) {
             alert("璐圭敤涓嶆纭�")
-            return false;;
+            return false;
+
         }
-        var dt = "card="+kh+"&type=娴侀噺"+"&feiyong="+unitprice+"&chongzhiCompany="+chongzhiCompany
-        $.post("/HxzkFlow/hxzk/buy",dt,function (data){
+
+        var dt = "card=" + num + "&type=娴侀噺" + "&feiyong=" + unitprice + "&chongzhiCompany=" + chongzhiCompany
+        console.log(dt)
+        $.post("/HxzkFlow/hxzk/buy", dt, function (data) {
             const div = document.createElement('divform');
             div.innerHTML = data;
             document.body.appendChild(div);
@@ -1177,6 +1444,13 @@
         })
         $(".chongzhi").hide();
         $(".heimu").hide();
+        // setTimeout({
+        //     location.reload();
+        // }500)
+        setTimeout(function () {
+            location.reload();
+        }, 500);
+        // $("#zongjia").text("")
     }
 </script>
 </html>
diff --git a/src/webapp/page/loginJiLu.jsp b/src/webapp/page/loginJiLu.jsp
index 3c3158d..2b48954 100644
--- a/src/webapp/page/loginJiLu.jsp
+++ b/src/webapp/page/loginJiLu.jsp
@@ -149,10 +149,10 @@
                     table.render({
                         elem: '#demo'
                         , layEvent: 'LAYTABLE_TIPS'
-                        , height: 780
+                        , height: 830
                         ,cellMinWidth: 80
                         , url: '/HxzkFlow/hxzk/FindLoginJiLu' //鏁版嵁鎺ュ彛
-                        , page: true //寮�鍚垎椤�
+                        // , page: true //寮�鍚垎椤�
                         , toolbar: '#toolbarDemo'
                         , defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
                             title: '鎻愮ず'
@@ -172,8 +172,8 @@
                         // done: function (res, curr, count) {
                         //     $("table").css("width", "100%")
                         // },
-                        limit: 10,
-                        limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
+                        limit: 500,
+                        // limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
                     });
                 }else{
                     $(".userNo").hide();
@@ -184,10 +184,12 @@
                         table.render({
                             elem: '#demo'
                             , layEvent: 'LAYTABLE_TIPS'
-                            , height: 700
+                            , height: 830
                             ,cellMinWidth: 80
-                            , url: '/HxzkFlow/hxzk/FindLoginJiLuZi?Zong='+jc //鏁版嵁鎺ュ彛
-                            , page: true //寮�鍚垎椤�
+                            , url: '/HxzkFlow/hxzk/FindLoginJiLuZi' //鏁版嵁鎺ュ彛
+                            // , page: true //寮�鍚垎椤�
+                            ,method: 'post'
+                            ,where: { logincompany: Zong } // 鎼滅储鐨勫瓧娈�
                             , toolbar: '#toolbarDemo'
                             , defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
                                 title: '鎻愮ず'
@@ -197,14 +199,15 @@
                             , cols: [[ //琛ㄥご
                                 {type: 'checkbox', sort: true, fixed: "left"}
                                 , {field: 'num', title: '搴忓彿', sort: true,width:'5%'}
+                                , {field: 'logincompany', title: '鐧诲綍鍏徃',}
                                 , {field: 'loginphone', title: '鐧诲綍鐢佃瘽', sort: true}
                                 , {field: 'ip', title: 'IP鍦板潃',}
                                 , {field: 'logindate', title: '鐧诲綍鏃堕棿',}
                                 , {field: 'loginoutdate', title: '閫�鍑烘椂闂�', sort: true}
 
                             ]],
-                            limit: 10,
-                            limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
+                            limit: 500,
+                            // limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
                         });
                     })
 
diff --git a/src/webapp/page/manager.jsp b/src/webapp/page/manager.jsp
new file mode 100644
index 0000000..8938c57
--- /dev/null
+++ b/src/webapp/page/manager.jsp
@@ -0,0 +1,895 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Dell
+  Date: 2023/6/20
+  Time: 14:33
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/HxzkFlow/images/favicon.ico" rel="icon" type="image/x-icon"/>
+  <link rel="stylesheet" href="/HxzkFlow/css/layui.css" media="all">
+  <style>
+    /* 灏忓瀷鎵嬫満 */
+    @media (max-width: 360px) {
+
+    }
+  </style>
+  <title>Title</title>
+  <style>
+    .panbox{
+      width: 540px;
+      height: 130px;
+      float: left;
+      margin-left: 20px;
+      margin-top: 10px;
+      color: white;
+      font-size: 22px;
+    }
+  </style>
+</head>
+<body>
+
+<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: -60px">
+  <div class="layui-col-md4" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 500px" id="cardnum">
+    <div class="layui-input-wrap">
+      <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
+             class="layui-input" lay-affix="clear">
+    </div>
+  </div>
+<%--  <div class="layui-col-md4" style="margin-left: 20px" id="hide">--%>
+<%--    <div class="layui-input-wrap" style="position: relative;top: 18px;z-index: 999;width: 150px;left: 560px">--%>
+<%--      <input type="text" name="company" style="width: 150px" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear"--%>
+<%--             class="layui-input">--%>
+<%--    </div>--%>
+<%--  </div>--%>
+  <button style="position: relative;top: 25px;z-index: 999;width: 70px;left: 95px" id="relo"
+          class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊
+  </button>
+  <button style="position: relative;top: 25px;z-index: 999;width: 80px;left: 500px" class="layui-btn layui-btn-normal"
+          lay-submit lay-filter="demo-table-search" lay-event="getselect" id="select">鏌ヨ
+  </button>
+</form>
+<%--<script type="text/html" >--%>
+<div style="margin-left: 0px;display: inline-block" id="toolbarDemo">
+  <button class="layui-btn " id="btn-add" lay-event="getadd1">鏂板</button>
+  <button class="layui-btn   layui-btn-warm" id="btn-update" lay-event="getUpdate">淇敼</button>
+  <button class="layui-btn  layui-btn-danger" id="btndelete" lay-event="getDelete">鍒犻櫎</button>
+</div>
+  <%--    </script>--%>
+<%--  <script type="text/html" >--%>
+
+<%--  </script>--%>
+
+<div style="display: inline-block ;margin-top: -80px">
+  <table id="demo" lay-filter="demo"></table>
+</div>
+<div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>
+<div class="add"  style="display: none;width: 600px;background-color: white;border: 1px solid #cccccc;padding: 50px;border-radius: 20px;position: fixed;top: 50px;left: 450px;z-index: 99999">
+  <form class="layui-form"  method="post" lay-filter="example" onsubmit="return checkadd()">
+
+    <div class="layui-form-item">
+      <label class="layui-form-label" style="width: 20% ;margin-left: -40px">鐢ㄦ埛鍚嶏細</label>
+      <div class="layui-input-block">
+        <input lay-verify="required|name" type="text" name="name" id="nameadd1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ敤鎴峰悕" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label" style="width: 20% ;margin-left: -40px">鐢佃瘽锛�</label>
+      <div class="layui-input-block">
+        <input lay-verify="required|phone" type="text" name="phone" id="phoneadd1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ數璇濈敤鎴峰悕" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label">瑙掕壊锛�</label>
+      <div class="layui-input-block">
+        <select name="juese" id="jueseadd1"  lay-filter="aihao"  >
+          <option value=""></option>
+          <option value="瓒呯骇绠$悊鍛�" >瓒呯骇绠$悊鍛�</option>
+          <option value="鏅�氱鐞嗗憳" >鏅�氱鐞嗗憳</option>
+          <option value="璁垮" >璁垮</option>
+        </select>
+      </div>
+    </div>
+    <div class="layui-form-item" id="addxinz">
+      <label class="layui-form-label">鏂板:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="uadd" value="2" title="鏀寔" id="uadd1">
+        <input type="radio" name="uadd" value="1" title="涓嶆敮鎸�" id="uadd2">
+      </div>
+    </div>
+    <div class="layui-form-item" id="addxiug">
+      <label class="layui-form-label">淇敼:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="uupdate" value="2" title="鏀寔" id="uupdate1">
+        <input type="radio" name="uupdate" value="1" title="涓嶆敮鎸�" id="uupdate2">
+      </div>
+    </div>
+    <div class="layui-form-item" id="addshanc">
+      <label class="layui-form-label">鍒犻櫎:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="udelete" value="2" title="鏀寔" id="udelete1">
+        <input type="radio" name="udelete" value="1" title="涓嶆敮鎸�" id="udelete2">
+      </div>
+    </div>
+    <div class="layui-form-item" id="addsms">
+      <label class="layui-form-label">鐭俊鎺ユ敹:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="smsreception" value="1" title="寮�鍚�" id="sms1">
+        <input type="radio" name="smsreception" value="0" title="鍏抽棴" id="sms2">
+      </div>
+    </div>
+
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn" lay-submit="" lay-filter="demoadd">绔嬪嵆鎻愪氦</button>
+        <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canseladd()" style="margin-left: 200px">鍙栨秷</button>
+      </div>
+    </div>
+  </form>
+</div>
+<div class="updateZong" style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
+  <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkupdate()">
+    <input type="text" id="id" name="id" style="display: none" class="upnum"/>
+    <div class="layui-form-item">
+      <label class="layui-form-label" style="width: 20% ;margin-left: -40px">鐢ㄦ埛鍚嶏細</label>
+      <div class="layui-input-block">
+        <input lay-verify="required|name" type="text" name="name" id="nameup1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ敤鎴峰悕" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label" style="width: 20% ;margin-left: -40px">鐢佃瘽锛�</label>
+      <div class="layui-input-block">
+        <input lay-verify="required|phone" type="text" name="phone" id="phoneup1" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ數璇濈敤鎴峰悕" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label">瑙掕壊锛�</label>
+      <div class="layui-input-block">
+        <select name="juese" id="jueseup1"  lay-filter="aihao"  >
+          <option value=""></option>
+          <option value="瓒呯骇绠$悊鍛�" >瓒呯骇绠$悊鍛�</option>
+          <option value="鏅�氱鐞嗗憳" >鏅�氱鐞嗗憳</option>
+          <option value="璁垮" >璁垮</option>
+        </select>
+      </div>
+    </div>
+    <div class="layui-form-item" id="upxinz">
+      <label class="layui-form-label">鏂板:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="uadd" value="2" title="鏀寔" id="uaddup1">
+        <input type="radio" name="uadd" value="1" title="涓嶆敮鎸�" id="uaddup2">
+      </div>
+    </div>
+    <div class="layui-form-item" id="upxiug">
+      <label class="layui-form-label">淇敼:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="uupdate" value="2" title="鏀寔" id="uupdateup1">
+        <input type="radio" name="uupdate" value="1" title="涓嶆敮鎸�" id="uupdateup2">
+      </div>
+    </div>
+    <div class="layui-form-item" id="upshanc">
+      <label class="layui-form-label">鍒犻櫎:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="udelete" value="2" title="鏀寔" id="udeleteup1">
+        <input type="radio" name="udelete" value="1" title="涓嶆敮鎸�" id="udeleteup2">
+      </div>
+    </div>
+    <div class="layui-form-item" id="upsms">
+      <label class="layui-form-label">鐭俊鎺ユ敹:</label>
+      <div class="layui-input-block">
+        <input type="radio" name="smsreception" value="1" title="寮�鍚�" id="upsms1">
+        <input type="radio" name="smsreception" value="0" title="鍏抽棴" id="upsms2">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn" lay-submit="" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
+        <button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()" style="margin-left: 200px">鍙栨秷</button>
+      </div>
+    </div>
+  </form>
+</div>
+<div id="fhfrom"></div>
+
+</body>
+<script src="/HxzkFlow/js/layui.js" charset="utf-8"></script>
+<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
+<script>
+  var qb = localStorage.getItem("gsjc")
+  var data = "qb="+qb
+  var getUserName = localStorage.getItem("getUserName")
+  var chongzhiCompany = "";
+
+  var accessKey = "448c2cedcdce41428a290d144e81ab6e"
+  var accessSecret = "RgoIWycMYGmQfrLwLuT2VWawAhwMO8w7P9zh2dZp"
+  var str = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  var nonce = '';
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const day = String(now.getDate()).padStart(2, '0');
+  const hours = String(now.getHours()).padStart(2, '0');
+  const minutes = String(now.getMinutes()).padStart(2, '0');
+  const seconds = String(now.getSeconds()).padStart(2, '0');
+  const formattedTime = year + month + day + hours + minutes + seconds;
+  for (var i = 30; i > 0; --i)
+    nonce += str[Math.floor(Math.random() * str.length)];
+
+  var stringSignTemp = accessKey+nonce+formattedTime
+  /*鑷畾涔夊鐞嗘暟瀛�*/
+  function zhzs(value) {
+    value = value.replace(/[^\d]/g, '').replace(/^0{1,}/g, '');
+    if (value != '')
+      value = parseFloat(value).toFixed(0);
+    else
+      value = parseFloat(0).toFixed(0);
+    return value;
+  }
+
+
+  function xzGongSi(){
+    var company = $("#companyadd1").val();
+    var data = "companyname="+company
+    $.post("/HxzkFlow/hxzk/MoHuGongSi",data,function (data){
+      var str = [];
+      if(data.length !=0){
+        for(var i = 0; i < data.length;i++){
+          $("#ZsGs").empty();
+          data[i].company = "'"+data[i].companyname+"'"
+          str += '<p onclick="xzGong('+data[i].company+')" style="cursor: pointer;height: 40px;line-height: 40px;padding-left: 10px;border-bottom: 1px solid #f6f6f6">'+data[i].companyname+'</p>'
+        }
+      }
+      $("#ZsGs").append(str)
+    })
+    $("#ZsGs").show()
+  }
+  function xz(){
+    $("#ZsGs").show()
+  }
+  function xzGong(id){
+    $("#companyadd1").val(id)
+    $("#ZsGs").hide()
+  }
+
+  if(qb === "鍗庢槦鏅烘帶"){
+
+    $.get("/HxzkFlow/hxzk/chawu",function (data){
+      $(".zk").text(data[0])
+      $(".by").text(data[1])
+      $(".cy").text(data[2])
+      $(".dw").text(data[3])
+      $(".jjdl").text(data[4])
+    })
+    setInterval(function() {
+      $.get("/HxzkFlow/hxzk/chawu",function (data){
+        $(".zk").text(data[0])
+        $(".by").text(data[1])
+        $(".cy").text(data[2])
+        $(".dw").text(data[3])
+        $(".jjdl").text(data[4])
+      })
+    }, 60000);
+  }else{
+
+
+  }
+
+
+  /**
+   * 鍒ゆ柇鐢ㄦ埛鍦ㄨ瀹氱殑鏃堕棿鍐呮病鏈夋搷浣滅郴缁燂紝鍒欏埛鏂版祻瑙堝櫒
+   * 鍙傛暟锛氭椂闂达紙鍗曚綅鍒嗛挓锛�
+   * */
+  function timeUserFun(time){
+    var time = time || 2;
+    var userTime = 3600;
+    var objTime = {
+      init:0,
+      time:function(){
+        objTime.init += 1;
+        if(objTime.init === userTime){// 杈惧埌闄愬埗鏃堕棿鏃讹紝鐢ㄦ埛鏈搷浣滀簨浠讹紝鍒欏埛鏂版暣涓〉闈�
+          localStorage.removeItem("gsjc")
+          sessionStorage.removeItem("admin")
+          alert("鎮ㄩ暱鏃堕棿鏈搷浣滃綋鍓嶉〉闈紝璇烽噸鏂扮櫥褰�")
+          var data = "Zong="+sessionStorage.getItem("admin");
+          //鑾峰彇璇ョ敤鎴锋渶鏂版椂闂�
+          $.post("/HxzkFlow/hxzk/userdate",data,function (data){
+
+          })
+          parent.location.reload()
+          //杈惧埌闄愬埗鏃堕棿娌℃搷浣滐紝鎵�瑕佹墽琛岀殑鍔ㄤ綔
+        }
+      },
+      eventFun:function(){
+        //娓呴櫎涓婃鐩戝惉锛岄噸鏂板紑濮嬫柊鐨勭洃鍚�
+        clearInterval(testUser);
+        objTime.init = 0;
+        testUser = setInterval(objTime.time,1000);
+      }
+    };
+    //鐩戝惉褰撳墠鏃堕棿娴佸姩
+    var testUser = setInterval(objTime.time,1000);
+
+    //鐩戝惉鐩稿簲浜嬩欢
+    var body = document.querySelector('html');
+    body.addEventListener("click",objTime.eventFun);
+    body.addEventListener("keydown",objTime.eventFun);
+    body.addEventListener("mousemove",objTime.eventFun);
+    body.addEventListener("mousewheel",objTime.eventFun);
+  }
+  (function () {
+    timeUserFun(1);
+
+  }(0));
+
+
+
+
+  layui.use(['layer', 'form'], function(){
+    var layer = layui.layer
+            ,form = layui.form;
+    form.on('select(aihao)', function(data){
+      console.log(data)
+      console.log(data.value); // 琚�変腑鐨勫��
+      console.log(data.elem); // 琚�変腑鐨勫厓绱燚OM瀵硅薄
+      console.log(data.field); // 琚�変腑鐨勫厓绱犵殑灞炴�у�硷紝閫氬父鏄痠nput鐨刵ame灞炴�у��
+      if (data.value=="璁垮"){
+        $("#addxinz").hide();
+        $("#addxiug").hide();
+        $("#addshanc").hide();
+        $("#upxinz").hide();
+        $("#upxiug").hide();
+        $("#upshanc").hide();
+      }else{
+        $("#addxinz").show();
+        $("#addxiug").show();
+        $("#addshanc").show();
+        $("#upxinz").show();
+        $("#upxiug").show();
+        $("#upshanc").show();
+      }
+      // 鍦ㄨ繖閲屽彲浠ユ墽琛屼綘闇�瑕佺殑鎿嶄綔
+    });
+    //浠庢湰鍦板瓨鍌ㄨ幏鍙栫敤鎴风櫥褰曚俊鎭紝濡傛灉鏄瓙璐﹀彿锛屽彧鏄剧ずelse 濡傛灉鏄�昏处鍙锋樉绀篿f
+    layui.use('table', function(){
+      var table = layui.table;
+      var add1 = localStorage.getItem("getadd")
+      var up = localStorage.getItem("getup")
+      var getde = localStorage.getItem("getde")
+
+      console.log(getde)
+
+      if (add1==1){
+        $("#btn-add").hide();
+
+      }
+      if (up==1){
+        $("#btn-update").hide();
+
+      }
+      if (getde==1){
+        $("#btn-delete").hide();
+
+      }
+      var Zong = localStorage.getItem("gsjc")
+      var data ="Zong="+Zong
+      if(Zong == null){
+      }else{
+        $.post("/HxzkFlow/hxzk/jiemi",data,function (data){
+            table.render({
+              elem: '#demo'
+              ,layEvent: 'LAYTABLE_TIPS'
+              ,height: 820
+              ,url: '/HxzkFlow/hxzk/findManager' //鏁版嵁鎺ュ彛
+              // ,cellMinWidth: 80
+              ,width: 1680
+              // ,page: true //寮�鍚垎椤�
+              ,toolbar:'#toolbarDemo'
+              ,defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
+                title: '鎻愮ず'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+              }]
+              , cols: [[ //琛ㄥご
+                {type: 'checkbox', sort: true, fixed: "left"}
+                ,{field: 'id', title: '搴忓彿',  sort: true,width:'5%'}
+                ,{field: 'name', title: '鐢ㄦ埛鍚嶇О', width:'10%'}
+                ,{field: 'phone', title: '鐢佃瘽', width:'10%'}
+                ,{field: 'juese', title: '瑙掕壊',  sort: true}
+                ,{field: 'uadd', title: '鏂板', sort: true}
+                ,{field: 'uupdate', title: '淇敼', sort: true,}
+                ,{field: 'udelete', title: '鍒犻櫎',  sort: true}
+                ,{field: 'smsreception', title: '鐭俊鎺ユ敹',  sort: true}
+                ,{field: 'addtime', title: '娣诲姞鏃堕棿',  sort: true}
+              ]],
+              done: function(res, curr, count){
+                //濡傛灉鏄紓姝ヨ姹傛暟鎹柟寮忥紝res鍗充负浣犳帴鍙h繑鍥炵殑淇℃伅銆�
+                //濡傛灉鏄洿鎺ヨ祴鍊肩殑鏂瑰紡锛宺es鍗充负锛歿data: [], count: 99} data涓哄綋鍓嶉〉鏁版嵁銆乧ount涓烘暟鎹�婚暱搴�
+                //console.log(res);
+                //寰楀埌褰撳墠椤电爜
+                //console.log(curr);
+                //寰楀埌鏁版嵁鎬婚噺
+                //console.log(count);
+                $(".layui-table-box").find("[data-field='id']").css("display","none");
+
+                $("[data-field='uadd']").children().each(function(){
+                  if($(this).text()=='2'){
+                    $(this).text("鏀寔")
+                  }else if($(this).text()=='1'){
+                    $(this).text("涓嶆敮鎸�")
+                  }
+                });
+                $("[data-field='uupdate']").children().each(function(){
+                  if($(this).text()=='2'){
+                    $(this).text("鏀寔")
+                  }else if($(this).text()=='1'){
+                    $(this).text("涓嶆敮鎸�")
+                  }
+                });
+                $("[data-field='smsreception']").children().each(function(){
+                  if($(this).text()=='1'){
+                    $(this).text("寮�鍚�")
+                  }else if($(this).text()=='0'){
+                    $(this).text("鍏抽棴")
+                  }
+                });
+                $("[data-field='udelete']").children().each(function(){
+                  if($(this).text()=='2'){
+                    $(this).text("鏀寔")
+                  }else if($(this).text()=='1'){
+                    $(this).text("涓嶆敮鎸�")
+                  }
+                });
+
+                pageCurr=curr;
+              },
+
+              limit:100,
+              limits:[10,20,30,40,50,60,70,80,90,100],
+            });
+
+        })
+      }
+
+      //澶村伐鍏锋爮浜嬩欢
+      table.on('toolbar(demo)', function(obj){
+        var checkStatus = table.checkStatus(obj.config.id);
+        switch(obj.event) {
+          case 'getDelete':
+            var data = checkStatus.data;
+            if(data.length == 0){
+              layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+            }else{
+              var nums = [];
+              for (var i = 0; i < data.length; i++) {
+                nums.push(JSON.stringify(data[i].id))
+                var datas = "num="+JSON.stringify(data[i].id)+"&caozuoname="+getUserName
+                $.post("/HxzkFlow/hxzk/DeleteManager",datas,function (data){
+
+                });
+              }
+              layer.alert("鍒犻櫎鎴愬姛")
+              // layui.table.reload('demo')
+            }
+            location.reload();
+            break;
+          case 'getUpdate':
+            var data = checkStatus.data;
+            if(data.length>1){
+              layer.alert("涓�娆″彧鑳介�変腑涓�涓繘琛屼慨鏀�")
+            }else if(data.length == 0){
+              layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
+            }else{
+              showUpdate();
+              $("#id").val(data[0].id);
+              $("#nameup1").val(data[0].name);
+              $("#phoneup1").val(data[0].phone);
+              $("#jueseup1").val(data[0].juese);
+              if (data[0].uadd==2){
+                $("#uaddup1").prop("checked",true);
+              }else{
+                $("#uaddup2").prop("checked",true);
+              }
+              if (data[0].uupdate==2){
+                $("#uupdateup1").prop("checked",true);
+              }else{
+                $("#uupdateup2").prop("checked",true);
+              }
+              if (data[0].udelete==2){
+                $("#udeleteup1").prop("checked",true);
+              }else{
+                $("#udeleteup2").prop("checked",true);
+              }
+
+              // $("#uaddup").val(data[0].enddate);
+              // $("#expense").val(data[0].expense);
+              form.render();
+            }
+            break;
+          case 'getadd1':
+            var data = checkStatus.data;
+            add();
+            break;
+        };
+      });
+      form.verify({
+        //telnumber楠岃瘉瑙勫垯鐨勫畾涔�
+        name: function(value, item){ //value锛氳〃鍗曠殑鍊笺�乮tem锛氳〃鍗曠殑DOM瀵硅薄
+          console.log(value.length)
+          if (value.length>3){
+            return '鐢ㄦ埛鍚嶉暱搴﹀紓甯�';
+          }
+          // if(!new RegExp("^[\u4e00-\u9fa5\]+$").test(value)){
+          //   return '濮撳悕鍙兘鏄腑鏂�';
+          // }
+
+        }
+      });
+      // 鎼滅储鎻愪氦
+      form.on('submit(demo-table-search)', function(data){
+        var field = data.field; // 鑾峰緱琛ㄥ崟瀛楁
+        if(field.company != ""){
+          if(localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+              ,done: function(res, curr, count) {
+                // res涓烘帴鍙h繑鍥炵殑鏁版嵁
+                if (res.data.length > 0) {
+
+                } else {
+                  alert("鎼滅储鐨勫唴瀹逛笉瀛樺湪")
+                }
+              }
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }else if(field.company == localStorage.getItem("gsmc")){
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+              ,done: function(res, curr, count) {
+                // res涓烘帴鍙h繑鍥炵殑鏁版嵁
+                if (res.data.length > 0) {
+
+                } else {
+                  alert("鎼滅储鐨勫唴瀹逛笉瀛樺湪")
+                }
+              }
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }else{
+            alert("娌℃湁鏉冮檺鏌ヨ鍏朵粬鍏徃")
+          }
+        }else{
+          if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+            field.company = localStorage.getItem("gsjc");
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }else{
+            field.company = localStorage.getItem("gsmc")
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }
+        }
+        // 鎵ц鎼滅储閲嶈浇
+
+        return false; // 闃绘榛樿 form 璺宠浆
+      });
+      //
+      form.on('submit(demo-table-search1)', function(data){
+        var field = data.field; // 鑾峰緱琛ㄥ崟瀛楁
+        if(field.company != ""){
+          if(localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }else if(field.company == localStorage.getItem("gsmc")){
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }else{
+            alert("娌℃湁鏉冮檺鏌ヨ鍏朵粬鍏徃")
+          }
+        }else{
+          if (localStorage.getItem("gsjc") == "鍗庢槦鏅烘帶"){
+            field.company = "";
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }else{
+            field.company = localStorage.getItem("gsmc")
+            table.reload('demo', {
+              url: "/HxzkFlow/hxzk/ManagerSearch",
+              method:'post',
+              page: {
+                curr: 1 // 閲嶆柊浠庣 1 椤靛紑濮�
+              }
+              ,where: field // 鎼滅储鐨勫瓧娈�
+            });
+            layer.msg('鎼滅储鎴愬姛');
+          }
+        }
+        // 鎵ц鎼滅储閲嶈浇
+
+        return false; // 闃绘榛樿 form 璺宠浆
+      });
+    });
+
+  });
+
+
+  //鏂板
+  function add(){
+    $(".add").show();
+    $(".heimu").show();
+  }
+  function canseladd(){
+    $(".add").hide();
+    $(".heimu").hide();
+  }
+  //鍏呭��
+  function chongzhi(){
+    $(".chongzhi").show();
+    $(".heimu").show();
+  }
+  function canselchongzhi(){
+    $(".chongzhi").hide();
+    $(".heimu").hide();
+  }
+  //淇敼
+  function canselupdate(){
+    $(".update").hide();
+    $(".heimu").hide();
+    $(".updateZong").hide();
+  }
+  function showUpdate(){
+    var gsjc = localStorage.getItem("gsjc");
+    if(gsjc == "鍗庢槦鏅烘帶"){
+      $(".updateZong").show();
+      $(".heimu").show();
+    }else{
+      $(".update").show();
+      $(".heimu").show();
+    }
+
+  }
+
+  function checkupdate() {
+
+    console.log("11111111111111111")
+    var add1 = $("#nameup1").val();
+    var add2 =  $("#phoneup1").val();
+    var add3 =  $("#jueseup1").val();
+    if (add3!="璁垮"){
+      if(!add5 ){
+        layer.alert("璇烽�夋嫨鏂板鏉冮檺")
+        return false;
+      }else if(!add6){
+        layer.alert("璇烽�夋嫨淇敼鏉冮檺")
+        return false;
+      }else if(!add7){
+        layer.alert("璇烽�夋嫨鍒犻櫎鏉冮檺")
+        return false;
+      }
+    }
+    // var add4 =  $("#enddateg").val();
+    var add4 =  $("#id").val();
+    var PassOrNotadd =$('input[name="uadd"]:checked').val();
+    var PassOrNotup =$('input[name="uupdate"]:checked').val();
+    var PassOrNotde =$('input[name="udelete"]:checked').val();
+    var add5 = PassOrNotadd
+    var add6 = PassOrNotup
+    var add7 = PassOrNotde
+    // var add12 =  $("#expense").val();
+    // var add5 =  $("#bindidadd1").val();
+    // var add6 =  $("#locationadd1").val();
+    // var add7 =  $("#notesadd1").val();
+    // var add8 = $("#enddateg").val();
+    // var add9 = "0";
+    // var add10 =  $("#flowu").val();
+    // var add11 =  $("#feiyongadd").val();
+    if(add1 == "" || add1 == null){
+      layer.alert("璇疯緭鍏ョ敤鎴峰悕绉�")
+      return false;
+    }else if(add2 == "" || add2 == null){
+      layer.alert("璇疯緭鍏ョ數璇�")
+      return false;
+    }else if(add3 == "" || add3 == null){
+      layer.alert("璇烽�夋嫨瑙掕壊")
+      return false;
+    }else{
+      // if(parts.length>1){
+      //     for (var i = 0 ; i<parts.length;i++){
+      var data
+      if (add3==="瓒呯骇绠$悊鍛�"){
+        data = "juese="+add3
+      }
+      // var data = "name="+add1+"&juese="+add3
+      $.ajax({
+        url: "/HxzkFlow/hxzk/ifManager",
+        type: "POST",
+        data: data,
+        async: false,
+        success: function(data) {
+          console.log(add4)
+          console.log(data)
+          console.log(data.id)
+          if(data!=""){
+            if (data[0].id!=add4){
+              alert("绯荤粺鍙厑璁稿瓨鍦ㄤ竴涓秴绾х鐞嗗憳锛�")
+            }else{
+              var upp = "id="+add4+"&name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+              console.log(upp)
+              $.post("/HxzkFlow/hxzk/UpdateManager",upp,function (data){
+
+              })
+              console.log(66666666)
+            }
+          }else{
+            var upp = "id="+add4+"&name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+            console.log(upp)
+            $.post("/HxzkFlow/hxzk/UpdateManager",upp,function (data){
+
+            })
+            console.log(66666666)
+          }
+        }
+      });
+      return true;
+
+    }
+    // var parts = add2.replace(/\s*/g,"").split(";");
+    // var parts;
+    // var parts1 = add5.split(";");
+
+
+  }
+  //鏂板鎴愬姛
+  function checkadd() {
+    var add1 = $("#nameadd1").val();
+    // var add2 =  $("#cardnumberadd1").val();
+    var add2 =  $("#phoneadd1").val();
+    // var add4 =  $("#operatoradd1").val();
+    // var add4 =  $("#flowadd1").val();
+    var add3 =  $("#jueseadd1").val();
+
+    var PassOrNotadd =$('input[name="uadd"]:checked').val();
+    var PassOrNotup =$('input[name="uupdate"]:checked').val();
+    var PassOrNotde =$('input[name="udelete"]:checked').val();
+    // console.log(PassOrNotadd)
+    // console.log(PassOrNotup)
+    // console.log(PassOrNotde)
+    // var add5 = PassOrNotadd
+    // var add6 = PassOrNotup
+    // var add7 = PassOrNotde
+    // var add5 =  $("#uadd1").val();
+    // var add6 =  $("#locationadd1").val();
+    // var add7 =  $("#notesadd1").val();
+    // var add3 = $("#enddateadd1").val();
+    if (add3!="璁垮"){
+      var add5 = PassOrNotadd
+      var add6 = PassOrNotup
+      var add7 = PassOrNotde
+      if(!add5 ){
+        layer.alert("璇烽�夋嫨鏂板鏉冮檺")
+        return false;
+      }else if(!add6){
+        layer.alert("璇烽�夋嫨淇敼鏉冮檺")
+        return false;
+      }else if(!add7){
+        layer.alert("璇烽�夋嫨鍒犻櫎鏉冮檺")
+        return false;
+      }
+
+    }else{
+      var add5 = '1'
+      var add6 = '1'
+      var add7 = '1'
+
+    }
+    var add9 = "0";
+    if(add1 == "" || add1 == null){
+      layer.alert("璇疯緭鍏ョ敤鎴峰悕绉�")
+      return false;
+    }else if(add2 == "" || add2 == null){
+      layer.alert("璇疯緭鍏ョ數璇�")
+      return false;
+    }else if(add3 == "" || add3 == null){
+      layer.alert("璇烽�夋嫨瑙掕壊")
+      return false;
+    }else if (add9 == "1"){
+      return false
+    }else{
+      var data
+      if (add3==="瓒呯骇绠$悊鍛�"){
+         data = "name="+add1+"&juese="+add3
+      }else{
+         data = "name="+add1
+      }
+      // var data = "name="+add1+"&juese="+add3
+      $.ajax({
+        url: "/HxzkFlow/hxzk/ifManager",
+        type: "POST",
+        data: data,
+        async: false,
+        success: function(data) {
+          console.log(data)
+          if (data.length>0){
+            console.log(111111)
+            for (let i = 0; i < data.length; i++) {
+              if(data[i].juese=="瓒呯骇绠$悊鍛�"){
+                console.log(222222222)
+                alert("绯荤粺鍙厑璁稿瓨鍦ㄤ竴涓秴绾х鐞嗗憳锛�")
+                break;
+              }else if (data[i].name==add1){
+                alert("璇ョ敤鎴峰凡瀛樺湪锛�")
+                break;
+              }else {
+                console.log("33333332")
+                var upp = "name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+                $.post("/HxzkFlow/hxzk/addManager",upp,function (data){
+
+                })
+                add9 = "0";
+              }
+            }
+          }else{
+            console.log("33333332")
+            var upp = "name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+            $.post("/HxzkFlow/hxzk/addManager",upp,function (data){
+
+            })
+            add9 = "0";
+          }
+        }
+      });
+      return true;
+    }
+  }
+</script>
+</html>
diff --git a/src/webapp/page/setting.jsp b/src/webapp/page/setting.jsp
index b933012..8f19294 100644
--- a/src/webapp/page/setting.jsp
+++ b/src/webapp/page/setting.jsp
@@ -17,7 +17,9 @@
 <div></div>
 <div style="width: 100%;height: 100%;">
     <div class="layui-card" style="width: 100%;height: 100%;">
-        <div class="layui-card-header">涓汉淇℃伅</div>
+        <div class="layui-card-header">涓汉淇℃伅
+            <button style="margin-left: 50px" id="cancelBtn" class="layui-btn" onclick="enableInputs()">淇敼</button>
+        </div>
         <div class="layui-card-body">
             <form class="layui-form" method="post" action="/HxzkFlow/hxzk/upUser" style="margin-top: 20px" onsubmit="return checkadd()">
                 <input type="text" name="companyabbname" id="gs1" style="display: none">
@@ -33,14 +35,14 @@
                         <input type="text" name="" disabled  style="width: 260px" id="phone" required lay-verify="required" placeholder="璇疯緭鍏ョ數璇�" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" id="sock1" style="display: none">
                     <label class="layui-form-label">鏂扮櫥褰曠數璇�</label>
                     <div class="layui-input-inline">
                         <input type="text" name="loginphone" style="width: 260px" id="" required lay-verify="required" placeholder="璇疯緭鍏ョ數璇�" autocomplete="off" class="layui-input">
                     </div>
                 </div>
 
-                <div class="layui-form-item">
+                <div class="layui-form-item" id="sock2" style="display: none">
                     <label class="layui-form-label">楠岃瘉鐮�</label>
                     <div class="layui-input-inline">
                         <input type="text" style="width: 120px" id="yzm"  required lay-verify="required" placeholder="璇疯緭鍏ラ獙璇佺爜" autocomplete="off" class="layui-input">
@@ -48,7 +50,7 @@
                     </div>
                 </div>
 
-                <div class="layui-form-item">
+                <div class="layui-form-item" id="sock3" style="display: none">
                     <div class="layui-input-block">
                         <button class="layui-btn" lay-submit lay-filter="formDemo">绔嬪嵆鎻愪氦</button>
 
@@ -72,6 +74,17 @@
         $("#phone").val(data.loginphone)
     })
 
+    function enableInputs(){
+        document.getElementById('sock1').style.display = '';
+        document.getElementById('sock2').style.display = '';
+        document.getElementById('sock3').style.display = '';
+        // var inputBoxes = document.getElementById("sock1"); // 鑾峰彇鎵�鏈夌殑杈撳叆妗嗗厓绱�
+        // console.log(inputBoxes.length)
+        // for(var i=0;i<inputBoxes.length;i++){
+        //     inputBoxes[i].disabled = false; // 鍙栨秷绂佺敤鐘舵��
+        // }
+
+    }
     function YanZhengMa() {
         var phone = $("#phone").val();
         if (phone == "") {

--
Gitblit v1.9.3