Merge branch 'master' of http://139.196.39.194:9021/yuansh/GEKE_VIEW

src/views/system/StatutoryLeaveList.vue

@@ -0,0 +1,191 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="假期名称">
+              <a-input placeholder="请输入假期名称" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="日薪资倍数">
+              <a-input placeholder="请输入日薪资倍数" v-model="queryParam.sum"></a-input>
+            </a-form-item>
+          </a-col>
+         <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="假期开始时间">
+              <a-input placeholder="请输入假期开始时间" v-model="queryParam.startDate"></a-input>
+            </a-form-item>
+          </a-col> -->
+      <!--  <template v-if="toggleSearchStatus">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="假期结束时间">
+              <a-input placeholder="请输入假期结束时间" v-model="queryParam.endDate"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="日薪资倍数">
+              <a-input placeholder="请输入日薪资倍数" v-model="queryParam.sum"></a-input>
+            </a-form-item>
+          </a-col>
+          </template> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+     <!-- <a-button type="primary" icon="download" @click="handleExportXls('法定假期')">导出</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-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"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <statutoryLeave-modal ref="modalForm" @ok="modalFormOk"></statutoryLeave-modal>
+  </a-card>
+</template>
+
+<script>
+  import '@/assets/less/TableExpand.less'
+  import StatutoryLeaveModal from './modules/StatutoryLeaveModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import moment from "moment"
+  export default {
+    name: "StatutoryLeaveList",
+    mixins:[JeecgListMixin],
+    components: {
+      StatutoryLeaveModal
+    },
+    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: 'name'
+           },
+		   {
+            title: '假期开始时间',
+            align:"center",
+            dataIndex: 'startDate',
+            customRender:function(t,r,index){
+              return moment(t).format('YYYY-MM-DD');
+            }
+           },
+		   {
+            title: '假期结束时间',
+            align:"center",
+            dataIndex: 'endDate',
+            customRender:function(t,r,index){
+              return moment(t).format('YYYY-MM-DD');
+            }
+           },
+		   {
+            title: '日薪资倍数',
+            align:"center",
+            dataIndex: 'sum'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/statutoryleave/statutoryLeave/list",
+          delete: "/statutoryleave/statutoryLeave/delete",
+          deleteBatch: "/statutoryleave/statutoryLeave/deleteBatch",
+          exportXlsUrl: "statutoryleave/statutoryLeave/exportXls",
+          importExcelUrl: "statutoryleave/statutoryLeave/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/system/modules/StatutoryLeaveModal.vue

@@ -0,0 +1,167 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="假期名称">
+          <a-input placeholder="请输入假期名称" v-decorator="['name', validatorRules.name]" style="width: 180px;"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="假期开始时间">
+          <a-date-picker  format='YYYY-MM-DD' v-decorator="[ 'startDate', validatorRules.startDate]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="假期结束时间">
+          <a-date-picker  format='YYYY-MM-DD' v-decorator="[ 'endDate',validatorRules.endDate]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="日薪资倍数">
+          <a-input placeholder="请输入日薪资倍数" v-decorator="['sum', validatorRules.sum]" style="width: 180px;"/>
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "StatutoryLeaveModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [{
+              required: true, message: '请输入假期名称!'
+            }]
+          },
+          startDate:{
+            rules: [{
+              required: true, message: '请选择开始时间!'
+            }]
+          },
+          endDate:{
+            rules: [{
+              required: true, message: '请选择结束时间!'
+            }]
+          },
+          sum:{
+            rules: [{
+              required: true, message: '请输入日薪资倍数!'
+            }]
+          }
+        },
+        url: {
+          add: "/statutoryleave/statutoryLeave/add",
+          edit: "/statutoryleave/statutoryLeave/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name','sum'))
+		  //时间格式化
+          this.form.setFieldsValue({startDate:this.model.startDate?moment(this.model.startDate):null})
+          this.form.setFieldsValue({endDate:this.model.endDate?moment(this.model.endDate):null})
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.startDate = formData.startDate?formData.startDate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.endDate = formData.endDate?formData.endDate.format('YYYY-MM-DD HH:mm:ss'):null;
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/system/modules/UserShiftModal.vue

@@ -14,15 +14,16 @@
         </ul>
         <br>
       </div>
-      <hr>
+      
       <div>
-        <a-table bordered :data-source="dataSource" :columns="columns" :scroll="{ y: 440,x:1000 }"
+        <a-table bordered :data-source="dataSource" :columns="columns" :scroll="{ y: 440,x:1100 }"
           :pagination="ipagination" @change="handleTableChange">
 
           <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
-            <div style="margin-left: 14px;">
-              <p>{{dayobject.day.getDate()}}</p>
-              <div style="margin-left: -1px;">
+            <div style="height: 35px;">
+              <div style="text-align: center;margin-top: -10px;">
+                <p>{{dayobject.day.getDate()}}</p>
+                <div style="margin-top: -10px;">
                 <p v-if='dayobject.day.getDay()==0'>日</p>
                 <p v-else-if='dayobject.day.getDay()==1'>一</p>
                 <p v-else-if='dayobject.day.getDay()==2'>二</p>
@@ -30,6 +31,7 @@
                 <p v-else-if='dayobject.day.getDay()==4'>四</p>
                 <p v-else-if='dayobject.day.getDay()==5'>五</p>
                 <p v-else-if='dayobject.day.getDay()==6'>六</p>
+                </div>
               </div>
             </div>
           </template>
@@ -216,13 +218,14 @@
         moth.setDate(0);
         this.columns.push({
           title: '名称',
+          fixed: 'left',
           dataIndex: 'realname',
-          width: '120px'
+          width: '80px'
         })
         for (var i = 1; i <= moth.getDate(); i++) {
           var d = new Date(this.formatDate(this.currentYear, this.currentMonth, i))
           var dayobjectSelf = {
-            width: '70px',
+            width: '49px',
             slots: {
               title: d.getDate()
             },
@@ -280,66 +283,97 @@
           var shiftid="";
           if (this.key == 1) {
             shiftid=this.dataSource[this.index].a1;
+            this.dataSource[this.index].a1="";
           } else if (this.key == 2) {
             shiftid=this.dataSource[this.index].a2;
+            this.dataSource[this.index].a2="";
           } else if (this.key == 3) {
            shiftid= this.dataSource[this.index].a3;
+           this.dataSource[this.index].a3="";
           } else if (this.key == 4) {
            shiftid= this.dataSource[this.index].a4;
+           this.dataSource[this.index].a4="";
           } else if (this.key == 5) {
            shiftid= this.dataSource[this.index].a5;
+           this.dataSource[this.index].a5="";
           } else if (this.key == 6) {
            shiftid= this.dataSource[this.index].a6;
+           this.dataSource[this.index].a6="";
           } else if (this.key == 7) {
            shiftid= this.dataSource[this.index].a7;
+           this.dataSource[this.index].a7="";
           } else if (this.key == 8) {
             shiftid=this.dataSource[this.index].a8;
+            this.dataSource[this.index].a8="";
           } else if (this.key == 9) {
            shiftid= this.dataSource[this.index].a9;
+            this.dataSource[this.index].a9="";
           } else if (this.key == 10) {
             shiftid=this.dataSource[this.index].a10;
+            this.dataSource[this.index].a10="";
           } else if (this.key == 11) {
            shiftid= this.dataSource[this.index].a11;
+            this.dataSource[this.index].a11="";
           } else if (this.key == 12) {
             shiftid=this.dataSource[this.index].a12;
+           this.dataSource[this.index].a12="";
           } else if (this.key == 13) {
             shiftid=this.dataSource[this.index].a13;
+            this.dataSource[this.index].a13="";
           } else if (this.key == 14) {
             shiftid=this.dataSource[this.index].a14;
+           this.dataSource[this.index].a14="";
           } else if (this.key == 15) {
             shiftid=this.dataSource[this.index].a15;
+            this.dataSource[this.index].a15="";
           } else if (this.key == 16) {
             shiftid=this.dataSource[this.index].a16;
+            this.dataSource[this.index].a16="";
           } else if (this.key == 17) {
             shiftid=this.dataSource[this.index].a17;
+            this.dataSource[this.index].a17="";
           } else if (this.key == 18) {
             shiftid=this.dataSource[this.index].a18;
+            this.dataSource[this.index].a18="";
           } else if (this.key == 19) {
             shiftid=this.dataSource[this.index].a19;
+            this.dataSource[this.index].a19="";
           } else if (this.key == 20) {
            shiftid= this.dataSource[this.index].a20;
+           this.dataSource[this.index].a20="";
           } else if (this.key == 21) {
             shiftid=this.dataSource[this.index].a21;
+            this.dataSource[this.index].a21="";
           } else if (this.key == 22) {
             shiftid=this.dataSource[this.index].a22;
+            this.dataSource[this.index].a22="";
           } else if (this.key == 23) {
             shiftid=this.dataSource[this.index].a23;
+            this.dataSource[this.index].a23="";
           } else if (this.key == 24) {
            shiftid= this.dataSource[this.index].a24;
+           this.dataSource[this.index].a24="";
           } else if (this.key == 25) {
             shiftid=this.dataSource[this.index].a25;
+            this.dataSource[this.index].a25="";
           } else if (this.key == 26) {
             shiftid=this.dataSource[this.index].a26;
+            this.dataSource[this.index].a26="";
           } else if (this.key == 27) {
             shiftid=this.dataSource[this.index].a27;
+            this.dataSource[this.index].a27="";
           } else if (this.key == 28) {
             shiftid=this.dataSource[this.index].a28;
+            this.dataSource[this.index].a28="";
           } else if (this.key == 29) {
             shiftid=this.dataSource[this.index].a29;
+            this.dataSource[this.index].a29="";
           } else if (this.key == 30) {
            shiftid= this.dataSource[this.index].a30;
+           this.dataSource[this.index].a30="";
           } else if (this.key == 31) {
             shiftid=this.dataSource[this.index].a31;
+            this.dataSource[this.index].a31="";
           }
           
           if(shiftid!=null &&shiftid!=""){
@@ -348,20 +382,83 @@
               date:this.shiftDate
             }).then((res) => {
              if(res.success){
-               this.$options.methods.searchQuery.call(this)
+               
              }
             })
           }
         }else{
         for (var i = 0; i < this.shiftlist.length; i++) {
           if (this.shiftname == this.shiftlist[i].id) {
+            if (this.key == 1) {
+              this.dataSource[this.index].a1=this.shiftlist[i].name;
+            } else if (this.key == 2) {             
+              this.dataSource[this.index].a2=this.shiftlist[i].name;
+            } else if (this.key == 3) {             
+             this.dataSource[this.index].a3=this.shiftlist[i].name;
+            } else if (this.key == 4) {             
+             this.dataSource[this.index].a4=this.shiftlist[i].name;
+            } else if (this.key == 5) {             
+             this.dataSource[this.index].a5=this.shiftlist[i].name;
+            } else if (this.key == 6) {           
+             this.dataSource[this.index].a6=this.shiftlist[i].name;
+            } else if (this.key == 7) {             
+             this.dataSource[this.index].a7=this.shiftlist[i].name;
+            } else if (this.key == 8) {             
+              this.dataSource[this.index].a8=this.shiftlist[i].name;
+            } else if (this.key == 9) {            
+              this.dataSource[this.index].a9="";
+            } else if (this.key == 10) {             
+              this.dataSource[this.index].a10=this.shiftlist[i].name;
+            } else if (this.key == 11) {            
+              this.dataSource[this.index].a11=this.shiftlist[i].name;
+            } else if (this.key == 12) {            
+             this.dataSource[this.index].a12=this.shiftlist[i].name;
+            } else if (this.key == 13) {              
+              this.dataSource[this.index].a13=this.shiftlist[i].name;
+            } else if (this.key == 14) {              
+             this.dataSource[this.index].a14=this.shiftlist[i].name;
+            } else if (this.key == 15) {              
+              this.dataSource[this.index].a15=this.shiftlist[i].name;
+            } else if (this.key == 16) {             
+              this.dataSource[this.index].a16=this.shiftlist[i].name;
+            } else if (this.key == 17) {              
+              this.dataSource[this.index].a17=this.shiftlist[i].name;
+            } else if (this.key == 18) {              
+              this.dataSource[this.index].a18=this.shiftlist[i].name;
+            } else if (this.key == 19) {             
+              this.dataSource[this.index].a19=this.shiftlist[i].name;
+            } else if (this.key == 20) {             
+             this.dataSource[this.index].a20=this.shiftlist[i].name;
+            } else if (this.key == 21) {              
+              this.dataSource[this.index].a21=this.shiftlist[i].name;
+            } else if (this.key == 22) {             
+              this.dataSource[this.index].a22=this.shiftlist[i].name;
+            } else if (this.key == 23) {             
+              this.dataSource[this.index].a23=this.shiftlist[i].name;
+            } else if (this.key == 24) {            
+             this.dataSource[this.index].a24=this.shiftlist[i].name;
+            } else if (this.key == 25) {              
+              this.dataSource[this.index].a25=this.shiftlist[i].name;
+            } else if (this.key == 26) {              
+              this.dataSource[this.index].a26=this.shiftlist[i].name;
+            } else if (this.key == 27) {             
+              this.dataSource[this.index].a27=this.shiftlist[i].name;
+            } else if (this.key == 28) {              
+              this.dataSource[this.index].a28=this.shiftlist[i].name;
+            } else if (this.key == 29) {              
+              this.dataSource[this.index].a29=this.shiftlist[i].name;
+            } else if (this.key == 30) {             
+             this.dataSource[this.index].a30=this.shiftlist[i].name;
+            } else if (this.key == 31) {
+              this.dataSource[this.index].a31=this.shiftlist[i].name;
+            }
             httpAction(this.url.add, {
               userId: this.dataSource[this.index].id,
               shiftId: this.shiftname,
               shiftDate: this.shiftDate
             }, "post").then((res) => {
               if (res.success) {
-                this.$options.methods.searchQuery.call(this)
+               
               }
             })
           }
@@ -403,6 +500,7 @@
     width: 100%;
     color: #333333;
     background: #ffffff;
+    margin-top: -20px;
   }
 
   .month ul {
@@ -410,7 +508,7 @@
     padding: 0;
     display: flex;
     justify-content: space-between;
-    height: 35px;
+    height: 30px;
     list-style-type: none;
   }