LiGuang 2 年之前
父节点
当前提交
3b187b436e
共有 3 个文件被更改,包括 1 次插入5 次删除
  1. 0 1
      src/views/system/AttendanceRuleList.vue
  2. 1 1
      src/views/system/UserList.vue
  3. 0 3
      src/views/system/modules/UserModal.vue

+ 0 - 1
src/views/system/AttendanceRuleList.vue

@@ -113,7 +113,6 @@
                 </div>
               </div>
             </template>
-
           </a-table>
         </a-tab-pane>
         <!-- <a-tab-pane key="3" tab="自由时间上下班">

+ 1 - 1
src/views/system/UserList.vue

@@ -173,7 +173,7 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)" v-has='"user:edit"'>编辑</a>
          <a-divider type="vertical"/>
-         <a @click="EditQuit(record)" >离职</a>
+         <a @click="EditQuit(record)" v-has='"user:quit"'>离职</a>
          <a-divider type="vertical"/>
         <a @click="handleChangePassword(record.username)" >修改密码</a>
           <!-- <a-dropdown v-has='"user:more"'>

+ 0 - 3
src/views/system/modules/UserModal.vue

@@ -252,14 +252,12 @@
                 <a-select-option value="1">否</a-select-option>
               </a-select>
             </a-form-item>
-
           </a-col>
           <a-col :md="6" :sm="8" :lg="8" v-if="isatt=='0'||isatt==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">
@@ -277,7 +275,6 @@
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item v-if="!isEdit" label="合同日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-date-picker v-decorator="['cEndDate', {rules: [{ required: true, message: '请选择结束日期'}]}]"  style="width: 70%" placeholder="请选择试合同结束日期"
-               
                />
             </a-form-item>
           </a-col>