格克

src/views/system/RoleUserList.vue

@@ -152,10 +152,13 @@
             :loading="loading2"
             
             @change="handleTableChange2">
-           <span slot="action" slot-scope="text, record">
-           <a @click="handleEdit2(record)">编辑</a>
-          <a-divider type="vertical"/>
-          <a-dropdown>
+           <span slot="action" slot-scope="text, record" v-has='"role:dels"'>
+             <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
+               <a>删除</a>
+             </a-popconfirm>
+          <!-- <a @click="handleEdit2(record)">编辑</a> -->
+          <!-- <a-divider type="vertical"/> -->
+          <!-- <a-dropdown>
             <a class="ant-dropdown-link">
               更多 <a-icon type="down"/>
             </a>
@@ -166,7 +169,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
           </a-table>
         </div>
@@ -294,13 +297,13 @@
           //   dataIndex: 'status_dictText'
           // },
 
-          // {
-          //   title: '操作',
-          //   dataIndex: 'action',
-          //   scopedSlots: { customRender: 'action' },
-          //   align: 'center',
-          //   width: 120
-          // }
+          {
+            title: '操作',
+            dataIndex: 'action',
+            scopedSlots: { customRender: 'action' },
+            align: 'center',
+            width: 120
+          }
           ],
 
         // 高级查询参数

src/views/system/UserChange.vue

@@ -351,8 +351,8 @@
           deleteBatch: "/usercontract/userContract/deleteBatch",
           exportXlsUrl: "userquit/userQuit/exportXls",
           importExcelUrl: "usercontract/userContract/importExcel",
-          update:"/userquit/userQuit/edit",
-          updateChage:"/userchange/userChage/edit"
+          update:"/sys/user/userQuitEdit",
+          updateChage:"/sys/user/userChageEdit"
         },
       }
     },

src/views/system/modules/UserModal.vue

@@ -123,7 +123,7 @@
               <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" v-if="isAttendance=='0'||isAttendance==0">
+          <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', {initialValue:2,rules: [{ required: true, message: '请选择类型'}]}]" :triggerChange="true" placeholder="请选择上班类型"
                 dictCode="type" />
@@ -242,7 +242,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="是否打卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select style="width: 70%"  @change="isAttes" v-decorator="['isAttendance',{initialValue:'0'}]" placeholder="请选择"
+              <a-select style="width: 70%"   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>
@@ -613,14 +613,7 @@
       }
      },
     methods: {
-      isAttes(e){
-        this.isAttendance=e;
-        if(e==0){
-          this.form.setFieldsValue({
-            type: 2
-          })
-        }
-      },
+      
       zwOk() {
         console.log(this.selectedRowKeys)
         if (this.selectionRows != null && this.selectionRows.length > 0) {
@@ -1059,8 +1052,6 @@
             }
             if (formData.trialEndDate != null) {
               formData.trialEndDate = moment(formData.trialEndDate).format('YYYY-MM-DD');
-            }if(formData.isAttendance==1||formData.isAttendance=='1'){
-              formData.type="";
             }if(this.isEdit){
               formData.workMoth=this.worMoth;
             }