格克

src/views/system/SysPositionList.vue

@@ -168,12 +168,14 @@ import JTreeSelect from '@/components/jeecg/JTreeSelect'
           {
             title: '一级部门',
             align: 'center',
-            dataIndex: 'deptName1'
+            dataIndex: 'deptName1',
+            sorter: true
           },
           {
             title: '二级部门',
             align: 'center',
-            dataIndex: 'deptName2'
+            dataIndex: 'deptName2',
+            sorter: true
           },
           // {
           //   title: '三级部门',

src/views/system/UserChange.vue

@@ -122,7 +122,7 @@
         :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
          @change="handleTableChange">
 
-        <span slot="action" slot-scope="text, record" v-if="record.status==0||record.status=='0'">
+        <span slot="action" slot-scope="text, record" >
            <span v-if="record.status==0&&record.state!=0">
              <a-popconfirm title="确定取消？" placement="left" @confirm="handleEdits(record,0)"  okText="确定" cancelText="取消" v-has='"change:lzqx"'>
               <a>取消</a>
@@ -137,6 +137,12 @@
              <a>拒绝</a>
           </a-popconfirm>
           </span>
+          <span v-if="record.syState==0&&record.status==1&&record.state==1">
+            <a-divider type="vertical" />
+            <a-popconfirm title="确定删除？" placement="left" @confirm="handleEdits(record,3)"  okText="确定" cancelText="取消" v-has='"change:lzjj"'>
+               <a>删除</a>
+            </a-popconfirm>
+          </span>
         </span>
 
       <span slot="types" slot-scope="text, record" >
@@ -144,6 +150,11 @@
         <a-tag  color="#87d068" v-if="text=='同意'" >{{text}}</a-tag>
         <a-tag  color="#cd201f" v-if="text=='拒绝'" >{{text}}</a-tag>
         </span>
+        
+        <span slot="syDel" slot-scope="text, record" >
+          <a-tag  color="blue" v-if="text=='未删除'" >{{text}}</a-tag>
+          <a-tag  color="#cd201f" v-if="text=='已删除'" >{{text}}</a-tag>
+          </span>
       </a-table>
     </div>
     <!-- table区域-end -->
@@ -304,7 +315,7 @@
             }
           }, */
           {
-            title: '状态',
+            title: '审核状态',
             align: "center",
             dataIndex: 'state_dictText',
             sorter: true,
@@ -313,6 +324,16 @@
               customRender: 'types'
             },
           },
+          {
+            title: '企微状态',
+            align: "center",
+            dataIndex: 'syState_dictText',
+            sorter: true,
+            ellipsis: true,
+            scopedSlots: {
+              customRender: 'syDel'
+            },
+          },
           
           {
             title: '操作',

src/views/system/UserContractList.vue

@@ -184,12 +184,14 @@
           {
             title: '一级部门',
             align: "center",
-            dataIndex: 'deptName'
+            dataIndex: 'deptName',
+            sorter: true
           },
           {
             title: '二级部门',
             align: "center",
-            dataIndex: 'deptName1'
+            dataIndex: 'deptName1',
+            sorter: true
           },
           // {
           //   title: '三级部门',

src/views/system/UserList.vue

@@ -347,12 +347,14 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
             align: "center",
             width: 120,
             dataIndex: 'del2',
+            sorter: true
           },
           {
             title: '末级部门',
             align: "center",
             width: 120,
-            dataIndex: 'del3'
+            dataIndex: 'del3',
+            sorter: true
           },
           // {
           //   title: '三级部门',

src/views/system/UserPrizeList.vue

@@ -57,7 +57,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus" v-has='"prize:add"'>新增</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" >新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('员工奖惩')" v-has='"prize:export"'>导出</a-button>
      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>

src/views/system/modules/UserModal.vue

@@ -1342,7 +1342,7 @@
             })
           }else{
           //update-begin--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
-          if (new RegExp(/^1[3|4|5|7|8|9][0-9]\d{8}$/).test(value)) {
+          if (new RegExp(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(value)) {
             //update-end--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
             var params = {
               tableName: 'sys_user',

src/views/system/schedulingInformation/BdWorkOverTimeList.vue

@@ -256,12 +256,14 @@ import moment from "moment"
           {
             title: '一级部门',
             align: 'center',
-            dataIndex: 'deptName'
+            dataIndex: 'deptName',
+            sorter: true
           },
           {
             title: '二级部门',
             align: 'center',
-            dataIndex: 'deptName2'
+            dataIndex: 'deptName2',
+            sorter: true
           },
           // {
           //   title: '三级部门',
@@ -323,13 +325,15 @@ import moment from "moment"
           {
             title: '一级部门',
             align: 'center',
-            dataIndex: 'deptname'
+            dataIndex: 'deptname',
+            sorter: true
             
           },
           {
             title: '二级部门',
             align: 'center',
-            dataIndex: 'deptname2'
+            dataIndex: 'deptname2',
+            sorter: true
            
           },
           {