LiGuang hace 2 años
padre
commit
3d7cda6f69

+ 2 - 2
src/views/system/SysPositionList.vue

@@ -93,9 +93,9 @@
 
           <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a class="ant-dropdown-link" v-has='"position:delete"'>更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
-              <a-menu-item v-has='"position:delete"'>
+              <a-menu-item >
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>

+ 2 - 2
src/views/system/UserContractList.vue

@@ -90,11 +90,11 @@
 
           <a-divider type="vertical" />
           <a-dropdown>
-            <a class="ant-dropdown-link">更多
+            <a class="ant-dropdown-link" v-has='"contract:delete"'>更多
               <a-icon type="down" />
             </a>
             <a-menu slot="overlay">
-              <a-menu-item v-has='"contract:delete"'>
+              <a-menu-item >
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>

+ 53 - 71
src/views/system/modules/UserDetailModal.vue

@@ -55,7 +55,7 @@
               <j-dict-select-tag style="width: 70%" disabled v-decorator="[ 'category']" :triggerChange="true" dictCode="category" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="证件类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-select style="width: 70%" disabled v-model="sfzType">
                 <a-select-option value="0">中国身份证</a-select-option>
@@ -63,11 +63,16 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width: 70%" disabled v-decorator="[ 'sfzCode']" />
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
+            <a-form-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <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">
               <a-select style="width: 70%" disabled v-decorator="[ 'sex']" :getPopupContainer="(target) => target.parentNode">
@@ -83,25 +88,20 @@
                 :getCalendarContainer="node => node.parentNode" />
             </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%" 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">
+      
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag style="width: 70%" v-decorator="['education', {}]" :triggerChange="true" disabled dictCode="education" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="毕业学校" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width: 70%" disabled v-decorator="['school']" />
             </a-form-item>
@@ -112,41 +112,50 @@
             </a-form-item>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
+        
 
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input disabled style="width: 70%" v-decorator="['bankCard']" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input disabled style="width: 70%" v-decorator="['bankAddr', {}]" />
             </a-form-item>
           </a-col>
+            <a-col :md="6" :sm="8" :lg="8">
+            <a-form-item label="是否打卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select @change="isAttes" style="width: 70%" v-decorator="[ 'isAttendance']" disabled :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="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-row>
-
-        <a-row>
-
-
-        </a-row>
-
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
+       
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="工资" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input disabled style="width: 70%" v-decorator="['wagesOne']" />
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
+            <a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input disabled style="width: 70%" v-decorator="['syFund']" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
+            <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input disabled style="width: 70%" controls="false" v-decorator="['wagesBase', {}]" />
+            </a-form-item>
+          </a-col>
+       
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input disabled  style="width: 70%" v-decorator="[ 'phone']" />
@@ -158,82 +167,64 @@
               </a-input-search>
             </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-input disabled style="width: 70%" v-decorator="['syFund']" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled style="width: 70%" controls="false" v-decorator="['wagesBase', {}]" />
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="入职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-date-picker disabled style="width: 70%" disabled v-decorator="['entryDate']"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
+        
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="试用期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input suffix="月" style="width: 70%" disabled v-decorator="['trialMoth']" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="结束日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-date-picker style="width: 70%" v-decorator="['trialEndDate']" disabled
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="工龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input suffix="月" style="width: 70%" v-model="workMoth" disabled />
             </a-form-item>
           </a-col>
 
-        </a-row>
-
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
+       
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="司龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input suffix="月" style="width: 70%" v-model="moth" disabled />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width: 70%" v-decorator="[ 'urgentName',{}]" disabled />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width: 70%" v-decorator="[ 'urgentPhone', {}]" disabled />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
+       
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="户口地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width: 70%" v-decorator="[ 'homeAddr', {}]" disabled />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width: 70%" v-decorator="[ 'addr', {}]" disabled />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
+          <a-col :md="6" :sm="8" :lg="8" v-has='"user:editpt"'>
             <a-form-item label="分摊部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag style="width: 70%" disabled v-decorator="['shareDept', {}]" :triggerChange="true" dictCode="share_dept" />
             </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">
@@ -255,16 +246,8 @@
           </a-col>
 
         </a-row> -->
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="是否打卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select @change="isAttes" style="width: 70%" v-decorator="[ 'isAttendance']" disabled :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="8">
             <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -279,9 +262,8 @@
               </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']"
@@ -294,7 +276,7 @@
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
-        </a-row>
+         </a-row>
         <a-row>
           <a-col :lg="24">
             <a-form-item style="margin-left: -240px;" label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">