Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueController.java

@@ -212,35 +212,36 @@ public class ClueController {
 
     // 批量放入回收站
     @RequestMapping("delete")
-    public Object delete(Clue clue) {
+    public Object delete(Clue clue,HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         String ids1 = clue.getIds();
         List<Integer> ids = new ArrayList<>();
+        User user = userMapper.selectById(request.getHeader("Token"));
         if (!ids1.isEmpty()) {
             for (String id : ids1.split(",")) {
                 ids.add(Integer.parseInt(id));
             }
-            clueService.isDelete(ids);
+            clueService.isDelete(ids,user.getId());
             msg.setMsg("操作成功");
         } else {
             msg.setError("请选择线索");
-
         }
         return msg;
     }
 
     // 批量恢复
     @RequestMapping("rollback")
-    public Object rollback(Clue clue) {
+    public Object rollback(Clue clue,HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         msg.setMsg("操作成功");
+        User user = userMapper.selectById(request.getHeader("Token"));
         String ids1 = clue.getIds();
         List<Integer> ids = new ArrayList<>();
         if (!ids1.isEmpty()) {
             for (String id : ids1.split(",")) {
                 ids.add(Integer.parseInt(id));
             }
-            clueService.isRollback(ids);
+            clueService.isRollback(ids,user.getId());
             msg.setMsg("操作成功");
         } else {
             msg.setError("请选择线索");

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ClueService.java

@@ -25,7 +25,7 @@ public interface ClueService extends IService<Clue> {
     void insert(Clue clue);
     void update(Clue clue);
 
-    void isDelete(List<Integer> ids);
+    void isDelete(List<Integer> ids,String userId);
 
     List<Clue> getList(Clue clue);
     List<Clue> getList1(Clue clue, User user);
@@ -35,7 +35,7 @@ public interface ClueService extends IService<Clue> {
 
     Clue getInfo(Clue clue);
 
-    void isRollback(List<Integer> ids);
+    void isRollback(List<Integer> ids,String userId);
 
     void deleterDelete(List<Integer> ids);
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -144,7 +144,15 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void isDelete(List<Integer> ids) {
+    public void isDelete(List<Integer> ids,String userId) {
+        for (Integer id : ids) {
+            ActionLog log = new ActionLog();
+            log.setItemId(id);
+            log.setName("删除了线索");
+            log.setCode("clue");
+            log.setUserId(userId);
+            log.setCreatTime(new Date());
+        }
         UpdateWrapper<Clue> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("id", ids);
         Clue clue = new Clue();
@@ -204,7 +212,16 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void isRollback(List<Integer> ids) {
+    public void isRollback(List<Integer> ids,String userId) {
+        for (Integer id : ids) {
+            ActionLog log = new ActionLog();
+            log.setItemId(id);
+            log.setName("恢复了线索");
+            log.setCode("clue");
+            log.setUserId(userId);
+            log.setCreatTime(new Date());
+        }
+
         UpdateWrapper<Clue> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("id", ids);
         Clue clue = new Clue();
@@ -287,7 +304,6 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
                 File uploadDir = new File(filePath);
                 if (!uploadDir.exists()) {
                     uploadDir.mkdirs();
-
                 }
                 UploadFile uf = new UploadFile();
                 uf.setName(originalFilename);
@@ -330,7 +346,7 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
                 e.printStackTrace();
                 // 文件上传失败的响应消息
                 HttpRespMsg msg = new HttpRespMsg();
-                msg.setError("上传成功失败");
+                msg.setError("上传失败");
                 return msg;
             }
         } else {

fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue

@@ -6,7 +6,7 @@
         <!-- 合同编号/名称 -->
         <el-form-item>
           <div style="display: flex;align-items: center;height: 40px;">
-            <el-input v-model="keyword" class="input-with-select" :placeholder="keyword == 1 ? $t('qing-shu-ru-he-tong-bian-hao') : $t('qing-shu-ru-he-tong-ming-cheng')" clearable size="small">
+            <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchFilter" :placeholder="keyword == 1 ? $t('qing-shu-ru-he-tong-bian-hao') : $t('qing-shu-ru-he-tong-ming-cheng')" clearable size="small">
               <el-select slot="prepend" v-model="searchField" :placeholder="$t('defaultText.pleaseChoose')" style="width:120px">
                 <el-option :label="$t('he-tong-ming-cheng')" :value="0"></el-option>
                 <el-option :label="$t('contractno')" :value="1"></el-option>

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -9,7 +9,7 @@
                 <el-form-item >
                     <!-- <div style="display: flex;align-items: center;height: 40px;"> -->
                     <div v-if="true" style="display: flex;align-items: center;height: 40px;">
-                    <el-input v-model="keyword" class="input-with-select" :placeholder="searchField == '1' ? $t('peaseenterthe') : $t('peaseenterthe')" clearable="true" size="small">
+                    <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchList()" :placeholder="searchField == '1' ? $t('peaseenterthe') : $t('peaseenterthe')" clearable="true" size="small">
                         <el-select v-model="searchField" style="width:120px;"  slot="prepend" :placeholder="$t('defaultText.pleaseChoose')">
                             <el-option :label="$t('headerTop.projectName')" value=1 ></el-option>
                             <el-option :label="$t('Itemno')" value=2 ></el-option>

fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -6,7 +6,7 @@
                 <el-form-item >
                     <!-- <div style="display: flex;align-items: center;height: 40px;"> -->
                     <div v-if="true" style="display: flex;align-items: center;height: 40px;">
-                    <el-input v-model="keyword" class="input-with-select" :placeholder="searchField == '1' ? $t('peaseenterthe') : $t('peaseenterthe')" clearable="true" size="small">
+                    <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchList" :placeholder="searchField == '1' ? $t('peaseenterthe') : $t('peaseenterthe')" clearable="true" size="small">
                         <el-select v-model="searchField" style="width:120px;"  slot="prepend" :placeholder="$t('defaultText.pleaseChoose')">
                             <el-option :label="$t('headerTop.projectName')" value=1 ></el-option>
                             <el-option :label="$t('Itemno')" value=2 ></el-option>