格克

src/views/system/AttendanceRuleList.vue

@@ -354,7 +354,7 @@
         this.columns.push({
           title: '部门',
           dataIndex: 'deptName',
-          width: '120px',
+          width: '140px',
           fixed: 'left'
         })
         if (this.queryParam.type == "1" || this.queryParam.type == "2" || this.queryParam.type == "3") {

src/views/system/modules/AttendanceRuleModal.vue

@@ -97,7 +97,7 @@
                   <a-menu-item key="0">
                     <a @click="shiftOks(0,d,record,index)">休息</a>
                   </a-menu-item>
-                  <a-menu-item v-for="(item,index) in shiftlist" :key="item.id">
+                  <a-menu-item v-if="isShow" v-for="(item,index) in shiftlist" :key="item.id">
                     <a @click="shiftOks(item,d,record,index)">{{item.name}} ({{item.startDate}} - {{item.endDate}})</a>
                   </a-menu-item>
 

src/views/system/modules/StatutoryLeaveModal.vue

@@ -33,16 +33,11 @@
           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="日薪资倍数">
+          label="日薪资倍数" v-if="type=='1'">
           <a-input-number id="inputNumber" :min="1" placeholder="请输入日薪资倍数" v-decorator="['sum',{}]" style="width: 180px;"/>
         </a-form-item>
 		
@@ -107,7 +102,9 @@
       },
       edit (record) {
         this.form.resetFields();
-        this.type=record.type;
+        if(record.type!=null&&record.type!=""){
+          this.type=record.type;
+        }
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {

src/views/system/modules/UserModal.vue

@@ -33,7 +33,7 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="12">
             <a-form-item label="身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
+              <a-input maxLength="18" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -66,7 +66,7 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="12">
             <a-form-item label="公积金账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入公积金账号" v-decorator="['syFund', {}]" />
+              <a-input-number placeholder="请输入公积金账号" style="width: 320px;" v-decorator="['syFund', {}]" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -74,7 +74,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="12">
             <a-form-item label="银行账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入银行账号" v-decorator="['bankCard', validatorRules.bankCard]" />
+              <a-input-number placeholder="请输入银行账号" style="width: 320px;" v-decorator="['bankCard', validatorRules.bankCard]" />
             </a-form-item>
 
           </a-col>
@@ -104,26 +104,26 @@
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="12">
-            <a-form-item label="基本工资一" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入基本工资" v-decorator="['wagesOne', {}]" />
+            <a-form-item label="基本工资一" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+              <a-input-number id="inputNumber" placeholder="请输入基本工资" style="width: 320px;" v-decorator="['wagesOne', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="12">
             <a-form-item label="基本工资二" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入基本工资" v-decorator="['wagesTwo', {}]" />
+              <a-input-number placeholder="请输入基本工资" style="width: 320px;" v-decorator="['wagesTwo', {}]" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="12">
             <a-form-item label="社保基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入社保基数" v-decorator="['security', {}]" />
+              <a-input-number placeholder="请输入社保基数" style="width: 320px;" v-decorator="['security', {}]" />
             </a-form-item>
           </a-col>
 
           <a-col :md="6" :sm="8" :lg="12">
             <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入缴交基数" v-decorator="['wagesBase', {}]" />
+              <a-input-number controls="false" placeholder="请输入缴交基数" style="width: 320px;" v-decorator="['wagesBase', {}]" />
             </a-form-item>
 
           </a-col>
@@ -189,35 +189,53 @@
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="12">
-            <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]" />
+            <a-form-item label="是否免打卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="[ 'isAttendance', {initialValue:'0'}]" placeholder="请选择"
+                :getPopupContainer="(target) => target.parentNode">
+                <a-select-option value="0">否</a-select-option>
+                <a-select-option value="1">是</a-select-option>
+              </a-select>
             </a-form-item>
+            
           </a-col>
           <a-col :md="6" :sm="8" :lg="12">
-            <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-button icon="search" @click="uploads()">选择</a-button>
+            <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]" />
             </a-form-item>
+            
           </a-col>
         </a-row>
         <a-row>
-          <a-col :lg="15">
+          <a-col :lg="12">
             <a-form-item label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag v-decorator="['infoSy', {initialValue:3}]" placeholder="请选择同步" :type="'radio'"
                 :triggerChange="true" dictCode="info_sy" />
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8" :lg="12">
+           <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
+             <a-button icon="search" @click="uploads()">选择</a-button>
+           </a-form-item>
+          </a-col>
+          
+        </a-row>
+        <a-row>
+         
           
         </a-row>
       </a-form>
     </a-spin>
     <depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
 
-    <a-modal title="附件" :visible="visiblet" @ok="saveUpload()" @cancel="handleCancelts()">
-      <a-upload action="http://localhost:8080/jeecg-boot/sys/common/upload" list-type="picture" :file-list="fileList"
+    <a-modal title="附件" :visible="visiblet" @ok="saveUpload()" @cancel="handleCancelts()" footer="">
+      <a-upload action="http://58.34.141.138:8085/jeecg-boot/sys/common/upload" list-type="picture" :file-list="fileList"
         @change="t" method="post" @download="handleDownload" :showUploadList="{
               showRemoveIcon: true,
               showDownloadIcon: true
-            }">
+            }"
+            :remove="handleRemove"
+            >
+            
         <a-button>
           <a-icon type="upload" />上传
         </a-button>
@@ -238,7 +256,8 @@
   } from "@/store/mutation-types"
   import {
     getAction,
-    httpAction
+    httpAction,
+    deleteAction
   } from '@/api/manage'
   import {
     addUser,
@@ -385,7 +404,8 @@
           syncUserByUserName: "/act/process/extActProcess/doSyncUserByUserName", //同步用户到工作流
           queryTenantList: '/sys/tenant/queryList',
           xzupload: '/sys/common/static',
-          sysFile: '/sysFile/sysFile/queryByUserId'
+          sysFile: '/sysFile/sysFile/queryByUserId',
+          delSysFile:'/sysFile/sysFile/deleteById'
         },
         identity: "1",
         fileList: [],
@@ -408,14 +428,23 @@
       }
     },
     methods: {
+      handleRemove(file){
+        if(this.userId!=null&&this.userId!=""){
+        deleteAction(this.url.delSysFile, {userid:this.userId,name:file.name}).then((res) => {
+          if (res.success) {
+          } 
+        }).finally(() => {
+        });
+        }
+      },
       handleCancelts() {
-        this.fileList = [];
+       // this.fileList = [];
         this.visiblet = false;
       },
       // 文件下载
       handleDownload(file) {
         console.log(file.response.message)
-        window.location.href = "http://localhost:8080/jeecg-boot/sys/common/static/" + file.response.message;
+        window.location.href = "http://58.34.141.138:8085/jeecg-boot/sys/common/static/" + file.response.message;
       },
       t(info) {
         // this.files = [];
@@ -439,9 +468,6 @@
       },
       uploads() {
         this.visiblet = true;
-        if (this.userId != null && this.userId != "") {
-          this.queryFiles(this.userId)
-        }
       },
       isDisabledAuth(code) {
         return disabledAuthFilter(code);
@@ -492,15 +518,13 @@
                   name: res.result[i].txtName,
                   status: "done",
                   response: rs,
-                  url: "http://localhost:8080/jeecg-boot/" + res.result[i].txtName,
+                  url: "http://58.34.141.138:8085/jeecg-boot/" + res.result[i].txtName,
                 };
                 this.fileList.push(fileInfo)
               }
             }
           }
         })
-
-        console.log("==========" + this.fileList)
       },
       initTenantList() {
         getAction(this.url.queryTenantList).then(res => {
@@ -589,7 +613,7 @@
         that.model = Object.assign({}, record);
         that.$nextTick(() => {
           that.form.setFieldsValue(pick(this.model, 'sex', 'email', 'phone', 'post', 'urgentName', 'urgentPhone',
-            'bankAddr', 'bankCard', 'realname', 'egName', 'sfzCode',
+            'bankAddr', 'bankCard', 'realname', 'egName', 'sfzCode','isAttendance',
             'infoSy', 'syFund', 'category', 'employmentStatus', 'wagesOne', 'wagesTwo', 'security','wagesBase'))
         });
         //身份为上级显示负责部门，否则不显示
@@ -616,6 +640,9 @@
         // 调用查询用户对应的部门信息的方法
         that.checkedDepartKeys = [];
         that.loadCheckedDeparts();
+        if (this.userId != null && this.userId != "") {
+          this.queryFiles(this.userId)
+        }
       },
       //
       loadCheckedDeparts() {
@@ -671,8 +698,8 @@
         this.resultDepartOptions = [];
         this.departIds = [];
         this.departIdShow = false;
+        this.fileList=[];
         this.identity = "1";
-        this.fileList = [];
         this.bankAddr = "";
         this.bankCard = "";
         this.syFund = "";