最新代码提交

admin-hanhai-vue/src/views/xcx/ClockInConfList.vue

@@ -17,7 +17,7 @@
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
 <!--        <a-menu slot="overlay">-->
 <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->

admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue

@@ -17,7 +17,7 @@
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

admin-hanhai-vue/src/views/xcx/ClockInProjectList.vue

@@ -19,7 +19,7 @@
 <!--            <a-button type="primary" icon="import">导入</a-button>-->
 <!--          </a-upload>-->
           <!-- 高级查询区域 -->
-          <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--          <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
           <a-dropdown v-if="selectedRowKeys.length > 0">
             <a-menu slot="overlay">
               <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -101,7 +101,9 @@
     </a-col>
     <a-col :md="rightColMd" :sm="24" v-if="this.rightcolval == 1">
       <a-card :bordered="false">
-
+        <div style="text-align: right;">
+          <a-icon type="close-circle" @click="hideUserList" />
+        </div>
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <a-form layout="inline">
@@ -171,11 +173,11 @@
                           <a-menu-item>
                 <a @click="handleDetail2(record)">详情</a>
               </a-menu-item>
-            <!--              <a-menu-item>-->
-            <!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">-->
-            <!--                  <a>删除</a>-->
-            <!--                </a-popconfirm>-->
-            <!--              </a-menu-item>-->
+                          <a-menu-item>
+                            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
+                              <a>删除</a>
+                            </a-popconfirm>
+                          </a-menu-item>
                         </a-menu>
           </a-dropdown>
         </span>
@@ -197,7 +199,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ClockInProjectModal from './modules/ClockInProjectModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import {getAction, httpAction} from "@api/manage";
+  import {deleteAction, getAction, httpAction} from "@api/manage";
   import ClockInProjectItemModal from './modules/ClockInProjectItemModal'
 
   export default {
@@ -269,6 +271,7 @@
           exportXlsUrl: "/clockInproject/clockInProject/exportXls",
           importExcelUrl: "clockInproject/clockInProject/importExcel",
           detailList: "/clockInprojectitem/clockInProjectItem/list",
+          delete2: "/clockInprojectitem/clockInProjectItem/delete"
         },
         dictOptions:{},
         superFieldList:[],
@@ -365,7 +368,7 @@
       },
       hideUserList(){
         //this.rightcolval = 0
-        this.selectedRowKeys1 = []
+        this.selectedRowKeys = []
       },
       handlePerssion(roleId){
         this.$refs.modalUserRole.show(roleId);
@@ -448,6 +451,23 @@
         this.$refs.modalForm2.title="详情";
         this.$refs.modalForm2.disableSubmit = true;
       },
+      handleDelete2: function (id) {
+        if(!this.url.delete){
+          this.$message.error("请设置url.delete属性!")
+          return
+        }
+        var that = this;
+        deleteAction(that.url.delete2, {id: id}).then((res) => {
+          if (res.success) {
+            //重新计算分页问题
+            that.reCalculatePage(1)
+            that.$message.success(res.message);
+            that.loadData2();
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
     }
   }
 </script>

admin-hanhai-vue/src/views/xcx/ClockinTeamLogList.vue

@@ -0,0 +1,196 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('clockin_team_log')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <clockin-team-log-modal ref="modalForm" @ok="modalFormOk"></clockin-team-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ClockinTeamLogModal from './modules/ClockinTeamLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'ClockinTeamLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ClockinTeamLogModal
+    },
+    data () {
+      return {
+        description: '团队绑定管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户编号',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'团队编号',
+            align:"center",
+            dataIndex: 'teamId_dictText'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'审核状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'delFlag_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/clockinteamlog/clockinTeamLog/list",
+          delete: "/clockinteamlog/clockinTeamLog/delete",
+          deleteBatch: "/clockinteamlog/clockinTeamLog/deleteBatch",
+          exportXlsUrl: "/clockinteamlog/clockinTeamLog/exportXls",
+          importExcelUrl: "clockinteamlog/clockinTeamLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''})
+        fieldList.push({type:'string',value:'teamId',text:'团队编号',dictCode:"clockin_team,name,id"})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'int',value:'status',text:'审核状态 0待审核 1审核通过 2审核未通过',dictCode:'clockin_team_log_status'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-hanhai-vue/src/views/xcx/modules/ClockInConfForm.vue

@@ -18,11 +18,11 @@
               <a-textarea v-model="model.info" rows="4" placeholder="请输入说明" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

admin-hanhai-vue/src/views/xcx/modules/ClockInProjectForm.vue

@@ -48,11 +48,11 @@
               <j-dict-select-tag type="list" v-model="model.teamId" dictCode="clockin_team,name,id,del_flag=0" placeholder="请选择团队编号" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

admin-hanhai-vue/src/views/xcx/modules/ClockInProjectItemForm.vue

@@ -23,11 +23,11 @@
               <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

admin-hanhai-vue/src/views/xcx/modules/ClockinAuthForm.vue

@@ -23,11 +23,11 @@
               <j-dict-select-tag type="radio" v-model="model.status" dictCode="clockin_auth_status" placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

admin-hanhai-vue/src/views/xcx/modules/ClockinLogForm.vue

@@ -28,11 +28,11 @@
               <a-input v-model="model.lat" placeholder="请输入纬度"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

admin-hanhai-vue/src/views/xcx/modules/ClockinTeamForm.vue

@@ -13,11 +13,11 @@
               <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogForm.vue

@@ -0,0 +1,127 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="团队编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamId">
+              <j-dict-select-tag type="list" v-model="model.teamId" dictCode="clockin_team,name,id,del_flag=0" placeholder="请选择团队编号" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="clockin_team_log_status" placeholder="请选择审核状态" />
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ClockinTeamLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            status:0,
+            delFlag:0,
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+
+        },
+        url: {
+          add: "/clockinteamlog/clockinTeamLog/add",
+          edit: "/clockinteamlog/clockinTeamLog/edit",
+          queryById: "/clockinteamlog/clockinTeamLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <clockin-team-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clockin-team-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ClockinTeamLogForm from './ClockinTeamLogForm'
+
+  export default {
+    name: 'ClockinTeamLogModal',
+    components: {
+      ClockinTeamLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <clockin-team-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clockin-team-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ClockinTeamLogForm from './ClockinTeamLogForm'
+  export default {
+    name: 'ClockinTeamLogModal',
+    components: {
+      ClockinTeamLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

admin-hanhai-vue/src/views/xcx/modules/TencentMapPicker.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
-      <div class="map-box">
+      <div class="map-box2">
           <div class="map" ref="map" style="height: 400px" ></div>
-          <div class="map-search">
+          <div class="map-search2">
               <div>
                   <a-input-search id="place" v-model="searchValue" placeholder="请输入详细地址" enter-button @search="searchAddress(searchValue)" />
               </div>
               <div>
-                  <ul v-if="kwData.length">
-                      <li v-for="(item, index) in kwData" :key="index" @click="selectKeyword(item)">{{ item.address }}</li>
+                  <ul v-if="kwData.length" class="ul2">
+                      <li class="li2" v-for="(item, index) in kwData" :key="index" @click="selectKeyword(item)">{{ item.address }}</li>
                   </ul>
               </div>
           </div>
@@ -180,11 +180,11 @@ export default {
 }
 </script>
 <style>
-.map-box {
+.map-box2 {
   position: relative;
 
 }
-.map-search {
+.map-search2 {
   z-index: 1000;
   display: flex;
   flex-direction: column;
@@ -195,7 +195,7 @@ export default {
 
 }
 
-button {
+button2 {
   border-radius: 0;
 }
 
@@ -212,14 +212,14 @@ button {
   flex-wrap: wrap;
   height: 70%;
 }
-ul{
+.ul2{
   background: white;
   list-style-type: none;
   padding-left: 0px;
   height: 280px;
   overflow: scroll;
 }
-li{
+.li2{
   padding-left: 6px;
   font-size: 10px;
   text-align: left;
@@ -228,7 +228,7 @@ li{
   display: flex;
   align-items: center;
 }
-li:hover{
+.li2:hover{
   cursor: pointer;
   background: #f5f5f5;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteamlog/vue/ClockinTeamLogList.vue

@@ -11,13 +11,13 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('clockin_team_log')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('clockin_team_log')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -109,7 +109,7 @@
     },
     data () {
       return {
-        description: 'clockin_team_log管理页面',
+        description: '团队绑定管理页面',
         // 表头
         columns: [
           {
@@ -138,7 +138,7 @@
             dataIndex: 'name'
           },
           {
-            title:'审核状态 0待审核 1审核通过 2审核未通过',
+            title:'审核状态',
             align:"center",
             dataIndex: 'status_dictText'
           },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteamlog/vue/modules/ClockinTeamLogForm.vue

@@ -19,15 +19,15 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="审核状态 0待审核 1审核通过 2审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <j-dict-select-tag type="list" v-model="model.status" dictCode="clockin_team_log_status" placeholder="请选择审核状态 0待审核 1审核通过 2审核未通过" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="clockin_team_log_status" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
+<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -67,12 +67,7 @@
         },
         confirmLoading: false,
         validatorRules: {
-           status: [
-              { required: true, message: '请输入审核状态 0待审核 1审核通过 2审核未通过!'},
-           ],
-           delFlag: [
-              { required: true, message: '请输入是否删除!'},
-           ],
+
         },
         url: {
           add: "/clockinteamlog/clockinTeamLog/add",

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/service/impl/ClockinServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.xcx.clockin.service.impl;
 
 import com.tencentcloudapi.iai.v20180301.models.VerifyFaceResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
@@ -30,7 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
-
+@Slf4j
 @Service
 public class ClockinServiceImpl implements IClockinService {
     @Resource
@@ -74,6 +75,8 @@ public class ClockinServiceImpl implements IClockinService {
         }
         Integer distance = clockInProjectService.getDistance(clockInReq.getLon(), clockInProject.getLat(), clockInProject.getId());
         if(distance > clockInProject.getDistance()){
+            log.info("用户经度:"+clockInReq.getLon()+"纬度："+clockInProject.getLat());
+            log.info("距离:"+distance);
             throw new JeecgBootException("不在有效打卡距离内");
         }
         ClockInProjectItem validClockInTime = clockInProjectItemService.getValidClockInTime(DateUtils2.getNowDateTimeStrings(), clockInProject.getId());