格克

src/components/tools/UserMenu.vue

@@ -50,18 +50,18 @@
             <span>账户设置</span>
           </router-link>
         </a-menu-item>-->
-        <a-menu-item key="3"  @click="systemSetting">
+        <!-- <a-menu-item key="3"  @click="systemSetting">
            <a-icon type="tool"/>
            <span>系统设置</span>
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-        <a-menu-item key="5" @click="updateCurrentDepart">
+        <!-- <a-menu-item key="5" @click="updateCurrentDepart">
           <a-icon type="cluster"/>
           <span>切换部门</span>
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item key="6" @click="clearCache">
           <a-icon type="sync"/>
           <span>清理缓存</span>

src/views/system/MakeUpCardList.vue

@@ -146,11 +146,11 @@
             align: "center",
             dataIndex: 'deptName2'
           },
-          {
-            title: '三级部门',
-            align: "center",
-            dataIndex: 'deptName3'
-          },
+          // {
+          //   title: '三级部门',
+          //   align: "center",
+          //   dataIndex: 'deptName3'
+          // },
           {
             title: '补卡时间',
             align: "center",

src/views/system/Shift.vue

@@ -75,10 +75,10 @@
 
           <a-divider type="vertical" />
           <a-dropdown>
-            <a class="ant-dropdown-link">更多
+            <a class="ant-dropdown-link" v-has="'shift:delete'">更多
               <a-icon type="down" />
             </a>
-            <a-menu slot="overlay" v-has="'shift:delete'">
+            <a-menu slot="overlay" >
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
@@ -190,7 +190,7 @@
           {
             title: '创建人',
             align: "center",
-            dataIndex: 'createBy'
+            dataIndex: 'createBy_dictText'
           },
           {
             title: '操作',

src/views/system/UserContractList.vue

@@ -153,11 +153,11 @@
             align: "center",
             dataIndex: 'deptName1'
           },
-          {
-            title: '三级部门',
-            align: "center",
-            dataIndex: 'deptName2'
-          },
+          // {
+          //   title: '三级部门',
+          //   align: "center",
+          //   dataIndex: 'deptName2'
+          // },
           {
             title: '合同类型',
             align: "center",

src/views/system/UserList.vue

@@ -310,12 +310,12 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
             width: 120,
             dataIndex: 'del3'
           },
-          {
-            title: '三级部门',
-            align: "center",
-            width: 120,
-            dataIndex: 'del4'
-          },
+          // {
+          //   title: '三级部门',
+          //   align: "center",
+          //   width: 120,
+          //   dataIndex: 'del4'
+          // },
           {
             title: '职位',
             align: "center",

src/views/system/UserPrizeList.vue

@@ -163,11 +163,11 @@
             align: "center",
             dataIndex: 'deptName1'
           },
-          {
-            title: '三级部门',
-            align: "center",
-            dataIndex: 'deptName2'
-          },
+          // {
+          //   title: '三级部门',
+          //   align: "center",
+          //   dataIndex: 'deptName2'
+          // },
           {
             title: '类型',
             align: "center",

src/views/system/modules/AttendanceRuleModal.vue

@@ -1074,7 +1074,7 @@
         if (this.id != null && this.id != "") {
           url = this.url.edit;
           typet = "put";
-        }if(data!=null&&data.length>0){
+        }
         this.confirmLoading = true;
         httpAction(url, {
             id: this.id,
@@ -1083,7 +1083,8 @@
             endDate: endDate,
             userId: userid,
             workDay: workDay,
-            ruleType: obj
+            ruleType: obj,
+            name:this.currentYear+"-"+this.currentMonth
           },
           typet).then((res) => {
           if (res.success) {
@@ -1099,7 +1100,7 @@
           }
           this.savef=true;
         })
-        }if(this.savef){
+        if(this.savef){
           this.close();
         }
       },

src/views/system/modules/SelectUserModal.vue

@@ -187,6 +187,7 @@
         this.visible = true;
       },
       loadData(arg) {
+        this.onClearSelected();
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
           this.ipagination.current = 1;

src/views/system/modules/UserDetailModal.vue

@@ -16,14 +16,14 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-             <a-upload disabled style="width: 70%"  :action="url.fileUpload" list-type="picture-card" :fileList="fileListt" :showUploadList="{
+             <a-upload disabled style="height: 50px;"  :action="url.fileUpload" list-type="picture-card" :fileList="fileListt" :showUploadList="{
                          showRemoveIcon: false,
                          showDownloadIcon: true
                        }" @download="handleDownload" 
                        
                        @preview="handlePreview" >
                 <div v-if="fileListt.length<1">
-                  <a-icon type="plus" />
+                  
                   <div class="ant-upload-text">
                     上传
                   </div>
@@ -88,6 +88,12 @@
               <a-input style="width: 70%" disabled v-decorator="['age', {}]" />
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8" :lg="8">
+            <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+              <a-input-search disabled style="width: 70%" v-model="checkedDepartNameString" readOnly @search="onSearch">
+              </a-input-search>
+            </a-form-item>
+          </a-col>
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
@@ -121,10 +127,10 @@
           </a-col>
 
           <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-              <a-input-search disabled style="width: 70%" v-model="checkedDepartNameString" readOnly @search="onSearch">
-              </a-input-search>
+            <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag style="width: 70%" v-decorator="['type']" disabled :triggerChange="true" dictCode="type" />
             </a-form-item>
+          
           </a-col>
 
 
@@ -259,21 +265,13 @@
             </a-form-item>
 
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag style="width: 70%" v-decorator="['type']" disabled :triggerChange="true" dictCode="type" />
-            </a-form-item>
-
-          </a-col>
+         
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag disabled style="width: 70%" v-decorator="[ 'employmentStatus']" dictCode="employmentStatus"
                 :triggerChange="true" />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
-
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-badge :count="count" show-zero :number-style="{ backgroundColor: '#52c41a' }">
@@ -281,6 +279,9 @@
               </a-badge>
             </a-form-item>
           </a-col>
+        </a-row>
+        <a-row>
+          
           <a-col :md="6" :sm="8" :lg="8" v-if="isQuit">
             <a-form-item label="预计离职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-date-picker style="width: 70%" disabled v-decorator="['endDate']"

src/views/system/modules/UserModal.vue

@@ -13,10 +13,10 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form" style="overflow-y: auto;height: 650px;">
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
+       <a-row>
+         <a-col :md="4" :sm="4" :lg="8">
             <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-image-upload style="width: 70%" class="avatar-uploader" text="上传" v-model="model.avatar"></j-image-upload>
+              <j-image-upload style="width: 70%;height: 50px;" class="avatar-uploader" text="上传" v-model="model.avatar"></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -39,8 +39,6 @@
             <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag style="width: 70%"  v-decorator="[ 'category', {initialValue:101,rules: [{ required: true, message: '请选择人员类别'}]}]" placeholder="请选择人员类别"
                 :triggerChange="true" @change="handleChangeStatus" dictCode="category"/>
-               
-              
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -51,14 +49,12 @@
               </a-select>
             </a-form-item>
           </a-col>
+          
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width: 70%"  :maxLength="40" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
             </a-form-item>
           </a-col>
-        </a-row>
-
-        <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-select style="width: 70%"  v-decorator="[ 'sex',validatorRules.sex]" placeholder="请选择性别"
@@ -68,6 +64,10 @@
               </a-select>
             </a-form-item>
           </a-col>
+        </a-row>
+
+        <a-row>
+         
 
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -81,6 +81,14 @@
               <a-input style="width: 70%"  :maxLength="3" placeholder="请输入年龄" v-model="age" />
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8" :lg="8">
+            <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+              <a-input-search style="width: 70%"  placeholder="点击选择部门" v-decorator="['checkedDepartNameString', validatorRules.deptName]"
+                readOnly @search="onSearch">
+                <a-button slot="enterButton" icon="search">选择</a-button>
+              </a-input-search>
+            </a-form-item>
+          </a-col>
         </a-row>
 
         <a-row>
@@ -115,13 +123,12 @@
               <a-input style="width: 70%"  :maxLength="30" placeholder="请输入开户行" v-decorator="['bankAddr', {initialValue:'招商银行'}]" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-              <a-input-search style="width: 70%"  placeholder="点击选择部门" v-decorator="['checkedDepartNameString', validatorRules.deptName]"
-                readOnly @search="onSearch">
-                <a-button slot="enterButton" icon="search">选择</a-button>
-              </a-input-search>
+          <a-col :md="6" :sm="8" :lg="8" v-if="isAttendance=='0'||isAttendance==0">
+            <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag style="width: 70%"  v-decorator="['type', {initialValue:2,rules: [{ required: true, message: '请选择类型'}]}]" :triggerChange="true" placeholder="请选择上班类型"
+                dictCode="type" />
             </a-form-item>
+          
           </a-col>
         </a-row>
 
@@ -243,13 +250,7 @@
             </a-form-item>
 
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8" v-if="isAttendance=='0'||isAttendance==0">
-            <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag style="width: 70%"  v-decorator="['type', {initialValue:2,rules: [{ required: true, message: '请选择类型'}]}]" :triggerChange="true" placeholder="请选择上班类型"
-                dictCode="type" />
-            </a-form-item>
-
-          </a-col>
+          
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag style="width: 70%"  v-decorator="[ 'employmentStatus', {initialValue:40,rules: [{ required: true, message: '请选择状态'}]}]" placeholder="请选择人员类别"
@@ -257,8 +258,6 @@
               
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-badge  :count="fileLists.length" show-zero :number-style="{ backgroundColor: '#52c41a' }">
@@ -266,6 +265,9 @@
              </a-badge>
             </a-form-item>
           </a-col>
+        </a-row>
+        <a-row>
+          
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item v-if="!isEdit" label="合同类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag  :disabled="isEdit" style="width: 70%" v-decorator="['contractType',validatorRules.contractType]" :triggerChange="true" placeholder="请选择合同类型"

src/views/system/schedulingInformation/BdWorkOverTimeList.vue

@@ -126,11 +126,11 @@
             align: 'center',
             dataIndex: 'deptName2'
           },
-          {
-            title: '三级部门',
-            align: 'center',
-            dataIndex: 'deptName3'
-          },
+          // {
+          //   title: '三级部门',
+          //   align: 'center',
+          //   dataIndex: 'deptName3'
+          // },
           {
             title: '加班事由',
             align: 'center',