格克

src/mixins/JeecgListMixin.js

@@ -21,7 +21,7 @@ export const JeecgListMixin = {
       ipagination:{
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['10', '20', '30'],
+        pageSizeOptions: ['10', '20', '30','50'],
         showTotal: (total, range) => {
           return range[0] + "-" + range[1] + " 共" + total + "条"
         },

src/views/system/AttendanceRuleList.vue

@@ -46,7 +46,7 @@
       <a-tabs default-active-key="2" @change="callback">
         <a-tab-pane key="2" tab="按班次上下班">
           <a-table bordered rowKey="id" :loading="loading" :data-source="dataSource" :columns="columns"
-            :scroll="{ x:300,y:550}" :pagination="ipagination" @change="handleTableChange"
+            :scroll="{ x:300,y:700}" :pagination="ipagination" @change="handleTableChange"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
               <div style="height: 35px;">
@@ -74,7 +74,7 @@
             </span>
           </a-table>
 
-          <a-table bordered :data-source="dataSources" :loading="loading" :columns="columnst" :scroll="{ x:300 }"
+          <!-- <a-table bordered :data-source="dataSources" :loading="loading" :columns="columnst" :scroll="{ x:300 }"
             :pagination="ipaginations" @change="handleTableChanges">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
               <div style="height: 35px;">
@@ -92,7 +92,7 @@
                 </div>
               </div>
             </template>
-          </a-table>
+          </a-table> -->
         </a-tab-pane>
         <a-tab-pane key="1" tab="固定时间上下班">
           <a-table bordered rowKey="id" :loading="loading" :data-source="dataSource" :columns="columns"
@@ -239,7 +239,7 @@
         ipaginations: {
           current: 1,
           pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
+          pageSizeOptions: ['10', '20', '30','50'],
           showTotal: (total, range) => {
             return range[0] + "-" + range[1] + " 共" + total + "条"
           },
@@ -390,7 +390,8 @@
           title: '名称',
           dataIndex: 'realname',
           width: '80px',
-          fixed: 'left'
+          fixed: 'left',
+          sorter: true
         })
         this.columnst.push({
           title: '班次名称',
@@ -402,7 +403,8 @@
           title: '部门',
           dataIndex: 'deptName',
           width: '120px',
-          fixed: 'left'
+          fixed: 'left',
+          sorter: true
         })
         if (this.queryParam.type == "1" || this.queryParam.type == "2" || this.queryParam.type == "3") {
           // this.columns.push({

src/views/system/RoleUserList.vue

@@ -100,7 +100,7 @@
             <a-row :gutter="24">
 
               <a-col :md="8" :sm="8">
-                <a-form-item label="工号">
+                <a-form-item label="工号/姓名">
                   <a-input placeholder="" v-model="queryParam2.workNo"></a-input>
                 </a-form-item>
               </a-col>

src/views/system/UserChange.vue

@@ -421,7 +421,7 @@
         ipaginations:{
           current: 1,
           pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
+          pageSizeOptions: ['10', '20', '30','50'],
           showTotal: (total, range) => {
             return range[0] + "-" + range[1] + " 共" + total + "条"
           },

src/views/system/UserList.vue

@@ -114,7 +114,7 @@
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrls" @change="handleImportExcels" >
         <a-button type="primary" icon="import">薪资导入</a-button>
       </a-upload>
-      <a-button type="primary" icon="download" @click="handleExportXlst('员工假期')" v-has='"user:vation"'>假期导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXlst('员工假期')" >假期导出</a-button>
       <a-button type="primary" icon="hdd" @click="recycleBinVisible=true" v-has='"user:recovery"'>回收站</a-button>
      
       <a-dropdown v-if="selectedRowKeys.length > 0&&selectionRows[0].employmentStatus==40">

src/views/system/modules/UserModal.vue

@@ -186,7 +186,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="试用期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input style="width: 70%"  :maxLength="5" placeholder="请输入试用期" suffix="月"
+              <a-input style="width: 70%"   :maxLength="5" placeholder="请输入试用期" suffix="月"
                 v-decorator="['trialMoth',{initialValue:6,rules: [{ required: true, message: '请输入试用期'},{validator: this.validatetrialMoth}]}]" />
             </a-form-item>
           </a-col>
@@ -1159,7 +1159,8 @@
               trialMoth: value.replace(/[^0-9]/ig,"")
             })
           } else {
-            var moth=value - 0;
+            this.wkMoth = value - 0;
+            /* var moth=value - 0;
             if(moth<1){
               this.wkMoth=1;
               this.form.setFieldsValue({
@@ -1167,14 +1168,17 @@
               })
             }else{
               this.wkMoth = value - 0;
-            }
+            } */
             //console.log(this.wkDate)
             
             if (this.wkDate != null && this.wkDate != "") {
               var date = new Date(this.wkDate)
               var num = this.wkMoth;
-              date.setMonth(date.getMonth() + num)
-              var d = moment(date).subtract(1, "days");
+              var d =moment(new Date());
+              if(num!=0&&num!='0'){
+                date.setMonth(date.getMonth() + num)
+                 d=moment(date).subtract(1, "days");
+              }
               this.form.setFieldsValue({
                 trialEndDate: d
               })

src/views/system/schedulingInformation/BdWorkOverTimeList.vue

@@ -220,7 +220,7 @@ import moment from "moment"
         ipaginations:{
           current: 1,
           pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
+          pageSizeOptions: ['10', '20', '30','50'],
           showTotal: (total, range) => {
             return range[0] + "-" + range[1] + " 共" + total + "条"
           },