提交代码

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java

@@ -262,6 +262,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         proProjectInfoSubdeptsUsers.setUserId(userId);
         int res = addProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
         uniService.syncUniUser(proProjectInfoSubdeptsUsers,true);
+        // 增加人员入场信息
+        iProUserInoutRecordService.addRecord(proProjectInfoSubdeptsUsers);
         String userPost = proProjectInfoSubdeptsUsers.getUserPost();
         if(res>0 && (Objects.equals(UserPostEnums.WTDL.getCode(),userPost) || Objects.equals(UserPostEnums.XMJL.getCode(),userPost) || Objects.equals(UserPostEnums.BZZ.getCode(),userPost))){
             // 生成二维码
@@ -343,6 +345,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
             proProjectInfoSubdeptsUsers.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName());
             addProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
             uniService.syncUniUser(proProjectInfoSubdeptsUsers,true);
+            // 增加人员入场信息
+            iProUserInoutRecordService.addRecord(proProjectInfoSubdeptsUsers);
         }else {
             ProProjectInfoSubdeptsUsers deptUser = users.get(0);
             deptUser.setUserName(proProjectInfoSubdeptsUsers.getUserName());
@@ -591,6 +595,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
                 }
             }
             uniService.syncUniUser(proProjectInfoSubdeptsUsers,true);
+            // 增加人员入场信息
+            iProUserInoutRecordService.addRecord(proProjectInfoSubdeptsUsers);
         }
         return proProjectInfoSubdeptsUsers;
     }
@@ -1299,6 +1305,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         updateProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
         // 人员入场信息
         uniService.syncUniUser(proProjectInfoSubdeptsUsers,true);
+        // 增加人员入场信息
+        iProUserInoutRecordService.addRecord(proProjectInfoSubdeptsUsers);
     }
 
     /**

yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue

@@ -25,9 +25,14 @@
                 />
             </el-form-item>
             <el-form-item label="创建时间" style="width: 308px">
-                <el-date-picker v-model="daterangeCreateTime" value-format="yyyy-MM-dd"
+                <el-date-picker
-                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                v-model="daterangeCreateTime"
-                    end-placeholder="结束日期"></el-date-picker>
+                value-format="YYYY-MM-DD"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                ></el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>

yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue

@@ -25,9 +25,14 @@
                 />
             </el-form-item>
             <el-form-item label="创建时间" style="width: 308px">
-                <el-date-picker v-model="daterangeCreateTime" value-format="yyyy-MM-dd"
+                <el-date-picker
-                    type="daterange" range-separator="-" start-placeholder="开始日期"
+          v-model="daterangeCreateTime"
-                    end-placeholder="结束日期"></el-date-picker>
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>

yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue

@@ -24,10 +24,16 @@
                 @keyup.enter="handleQuery"
                 />
             </el-form-item>
+            
             <el-form-item label="循环时间" style="width: 308px">
-                <el-date-picker v-model="daterangeCreateTime" value-format="yyyy-MM-dd"
+                <el-date-picker
-                    type="daterange" range-separator="-" start-placeholder="开始日期"
+          v-model="daterangeCreateTime"
-                    end-placeholder="结束日期"></el-date-picker>
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>

yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue

@@ -25,10 +25,15 @@
                 />
             </el-form-item>
             <el-form-item label="运行时间" style="width: 308px">
-                <el-date-picker v-model="daterangeCreateTime" value-format="yyyy-MM-dd"
+        <el-date-picker
-                    type="daterange" range-separator="-" start-placeholder="开始日期"
+          v-model="daterangeCreateTime"
-                    end-placeholder="结束日期"></el-date-picker>
+          value-format="YYYY-MM-DD"
-            </el-form-item>
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>

yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue

@@ -79,8 +79,8 @@
             <el-table-column label="操作" fixed="right" width="150" align="center" class-name="small-padding fixed-width">
                 <template #default="scope">
                     <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:proProjectInfoSubdepts:edit']">修改</el-button>
-                    <el-button v-if="scope.row.useStatus == '0'" link type="primary" icon="Setting" @click="handleUseStatus(scope.row)" v-hasPermi="['manage:proProjectInfoSubdepts:edit']">离场</el-button>
+                    <el-button v-if="scope.row.source == 'SYSTEM' && scope.row.useStatus == '0'" link type="primary" icon="Setting" @click="handleUseStatus(scope.row)" v-hasPermi="['manage:proProjectInfoSubdepts:edit']">离场</el-button>
-                    <el-button v-if="scope.row.useStatus == '1'" link type="primary" icon="Setting" @click="handleUseStatus(scope.row)" v-hasPermi="['manage:proProjectInfoSubdepts:edit']">进场</el-button>
+                    <el-button v-if="scope.row.source == 'SYSTEM' && scope.row.useStatus == '1'" link type="primary" icon="Setting" @click="handleUseStatus(scope.row)" v-hasPermi="['manage:proProjectInfoSubdepts:edit']">进场</el-button>
                 </template>
             </el-table-column>
         </el-table>

yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsGroup/index.vue

@@ -104,9 +104,9 @@
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-if="scope.row.craftType!=3"
             v-hasPermi="['manage:proProjectInfoSubdeptsGroup:edit']">修改</el-button>
-          <el-button v-if="scope.row.useStatus == '1'" link type="primary" icon="Setting"
+          <el-button v-if="scope.row.source == 'SYSTEM' && scope.row.useStatus == 0" link type="primary" icon="Setting"
             @click="handleUseStatus(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsGroup:edit']">离场</el-button>
-          <el-button v-if="scope.row.useStatus == '2'" link type="primary" icon="Setting"
+          <el-button v-if="scope.row.source == 'SYSTEM' && scope.row.useStatus == 1" link type="primary" icon="Setting"
             @click="handleUseStatus(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsGroup:edit']">进场</el-button>  
         </template>
       </el-table-column>

yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue

@@ -134,8 +134,8 @@
                 <template #default="scope">
                     <el-button link type="primary" icon="Edit" v-if="scope.row.userPost!=66" @click="handleUpdate(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsUsers:edit']">修改</el-button>
                     <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']" v-if="1 == 2">删除</el-button>
-                    <el-button link type="primary" icon="Delete" @click="handleEnter(scope.row)" v-if="scope.row.useStatus == 0" v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">离场</el-button>
+                    <el-button v-if="scope.row.source == 'SYSTEM' && scope.row.useStatus == 0" link type="primary" icon="Delete" @click="handleEnter(scope.row)"  v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">离场</el-button>
-                    <el-button link type="primary" icon="Delete" @click="handleEnter(scope.row)" v-else v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">进场</el-button>
+                    <el-button v-if="scope.row.source == 'SYSTEM' && scope.row.useStatus == 1" link type="primary" icon="Delete" @click="handleEnter(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">进场</el-button>
                     <el-button v-if="isRefresh(scope.row)" link type="primary" icon="Refresh" @click="handleFileRefresh(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsUsers:edit']">重新生成文件</el-button>
                     <el-button v-if="isSign(scope.row)" link type="primary" icon="StarFilled" @click="handleFileSign(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsUsers:edit']">文件重新签名</el-button>
                     <el-button link type="primary" icon="WarnTriangleFilled" @click="handleUpdatePhone(scope.row)" v-hasPermi="['manage:proProjectInfoSubdeptsUsers:editPhone']">手机号变更</el-button>
@@ -448,11 +448,13 @@ function handleEnter(row) {
     let ids = [row.id]
     if (row.useStatus == 0) {
         updateEnterState(ids, 1).then((d) => {
-            row.useStatus = 1
+            row.useStatus = 1;
+            proxy.$modal.msgSuccess("修改成功");
         })
     } else {
         updateEnterState(ids, 0).then((d) => {
-            row.useStatus = 0
+            row.useStatus = 0;
+            proxy.$modal.msgSuccess("修改成功");
         })
     }
 }