diff --git a/src/extension/hr/deptship/HR_DeptShip.jsx b/src/extension/hr/deptship/HR_DeptShip.jsx index bc580db..613a252 100644 --- a/src/extension/hr/deptship/HR_DeptShip.jsx +++ b/src/extension/hr/deptship/HR_DeptShip.jsx @@ -20,21 +20,26 @@ let extension = { tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写) buttons: { view: [], box: [], detail: [] }, //扩展的按钮 methods: { - //下面这些方法可以保留也可以删除 + //下面这些方法可以保留也可以删除 onInit() { //框架初始化配置前, - //示例:在按钮的最前面添加一个按钮 - // this.buttons.unshift({ //也可以用push或者splice方法来修改buttons数组 - // name: '按钮', //按钮名称 - // icon: 'el-icon-document', //按钮图标:https://element.eleme.cn/#/zh-CN/component/icon - // type: 'primary', //按钮样式:https://element-plus.gitee.io/zh-CN/component/button.html - // //color:"#eee",//自定义按钮颜色 - // onClick: function () { - // this.$Message.success('点击了按钮'); - // } - // }); + //示例:在按钮的最前面添加一个按钮 + this.buttons.unshift({ //也可以用push或者splice方法来修改buttons数组 + name: '刷新部门信息缓存', //按钮名称 + icon: 'el-icon-document', //按钮图标:https://element.eleme.cn/#/zh-CN/component/icon + type: 'primary', //按钮样式:https://element-plus.gitee.io/zh-CN/component/button.html + //color:"#eee",//自定义按钮颜色 + onClick: function () { - //示例:设置修改新建、编辑弹出框字段标签的长度 - // this.boxOptions.labelWidth = 150; + this.http.post('api/HR_DeptSync/cacheDingTalkDept', {}, '刷新钉钉部门缓存中').then((reslut) => { + this.http.post('api/HR_DeptSync/cacheYSERPDept', {}, '刷新YS部门缓存中').then((reslut) => { + this.$Message.warning('部门信息缓存刷新成功'); + }); + }); + } + }); + + //示例:设置修改新建、编辑弹出框字段标签的长度 + // this.boxOptions.labelWidth = 150; }, onInited() { //框架初始化配置后 diff --git a/src/extension/hr/employeesync/HR_EmployeeSync.jsx b/src/extension/hr/employeesync/HR_EmployeeSync.jsx index b773fae..645548b 100644 --- a/src/extension/hr/employeesync/HR_EmployeeSync.jsx +++ b/src/extension/hr/employeesync/HR_EmployeeSync.jsx @@ -4,7 +4,7 @@ ** 框架文档: http://v3.volcore.xyz/ *****************************************************************************************/ //此js文件是用来自定义扩展业务代码,在当前[表.vue]文件中也可以实现业务处理 - + let extension = { components: { //查询界面扩展组件 @@ -20,27 +20,24 @@ let extension = { tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写) buttons: { view: [], box: [], detail: [] }, //扩展的按钮 methods: { - //下面这些方法可以保留也可以删除 + //下面这些方法可以保留也可以删除 onInit() { //框架初始化配置前, - //示例:在按钮的最前面添加一个按钮 - this.buttons.unshift({ //也可以用push或者splice方法来修改buttons数组 - name: '立即同步', //按钮名称 - icon: 'el-icon-refresh', //按钮图标:https://element.eleme.cn/#/zh-CN/component/icon - type: 'primary', //按钮样式:https://element-plus.gitee.io/zh-CN/component/button.html - //color:"#eee",//自定义按钮颜色 - onClick: function () { - let url = 'api/HR_EmployeeSync/GenEmpSystemShip'; + this.buttons.unshift({ + name: '立即同步', + icon: 'el-icon-refresh', + type: 'primary', + onClick: function () { + let url = 'api/HR_EmployeeSync/GenEmpSystemShip'; - this.http.post(url, {}, '生成关联关系中').then((reslut) => { - this.$Message.success('生成完成,请点击查询进行刷新'); - this.search(); - }); - // proxy.http.post(url, {}, '生成关联关系中').then((reslut) => {}); - } + this.http.post(url, {}, '生成关联关系中').then((reslut) => { + this.$Message.success('生成完成,请点击查询进行刷新'); + this.search(); }); + // proxy.http.post(url, {}, '生成关联关系中').then((reslut) => {}); + } + }); - //示例:设置修改新建、编辑弹出框字段标签的长度 - // this.boxOptions.labelWidth = 150; + }, onInited() { //框架初始化配置后 @@ -78,4 +75,8 @@ let extension = { } } }; -export default extension; + +function saveClick(row) { + +} +export default extension; diff --git a/src/views/hr/deptship/HR_DeptShip/options.js b/src/views/hr/deptship/HR_DeptShip/options.js index a85c738..c6cbdce 100644 --- a/src/views/hr/deptship/HR_DeptShip/options.js +++ b/src/views/hr/deptship/HR_DeptShip/options.js @@ -25,7 +25,7 @@ export default function(){ {field:'YSDeptName',title:'YS部门名称',type:'string',width:60,hidden:true,readonly:true,align:'left'}, {field:'DingTalkDeptId',title:'钉钉部门',type:'string',bind:{ key:'Q002',data:[]},width:60,align:'left'}, {field:'DingTalkDeptName',title:'钉钉部门名称',type:'string',width:60,hidden:true,readonly:true,align:'left'}, - {field:'IsRoot',title:'根节点',type:'bool',width:120,align:'left'}]; + {field:'IsRoot',title:'根节点',type:'bool',width:120,hidden:true,align:'left'}]; const detail ={columns:[]}; const details = []; diff --git a/src/views/hr/employeesync/HR_EmployeeSync.vue b/src/views/hr/employeesync/HR_EmployeeSync.vue index 16bbf1b..a34c4b3 100644 --- a/src/views/hr/employeesync/HR_EmployeeSync.vue +++ b/src/views/hr/employeesync/HR_EmployeeSync.vue @@ -5,79 +5,104 @@ *新版本支持vue或【表.jsx]文件编写业务,文档见:https://v3.volcore.xyz/docs/view-grid、https://v3.volcore.xyz/docs/web --> - + diff --git a/src/views/hr/employeesync/HR_EmployeeSync/options.js b/src/views/hr/employeesync/HR_EmployeeSync/options.js index f4c2744..73d0e88 100644 --- a/src/views/hr/employeesync/HR_EmployeeSync/options.js +++ b/src/views/hr/employeesync/HR_EmployeeSync/options.js @@ -29,7 +29,7 @@ export default function(){ {field:'EmpJobNumber',title:'员工工号',type:'string',link:true,width:60,readonly:true,align:'left',sort:true}, {field:'EmpYSID',title:'员工YSID',type:'string',width:60,readonly:true,align:'left'}, {field:'EmpDingDingID',title:'员工钉钉ID',type:'string',width:60,readonly:true,align:'left'}, - {field:'EmpYSMobile',title:'员工YS手机号',type:'string',width:60,readonly:true,align:'left'}, + {field:'EmpYSMobile',title:'员工YS手机号',type:'string',sort:true,width:60,readonly:true,align:'left'}, {field:'EmpDingDingMobile',title:'员工钉钉手机号',type:'string',width:60,readonly:true,align:'left'}, {field:'EmpYSDeptID',title:'员工YS所属部门',type:'string',bind:{ key:'Q001',data:[]},width:60,readonly:true,align:'left'}, {field:'EmpLastSyncInfo',title:'最后一次同步记录',type:'string',width:60,readonly:true,align:'left'}, diff --git a/src/views/hr/ysemployees/HR_YSEmployees.vue b/src/views/hr/ysemployees/HR_YSEmployees.vue index 68da2fe..07ae3f4 100644 --- a/src/views/hr/ysemployees/HR_YSEmployees.vue +++ b/src/views/hr/ysemployees/HR_YSEmployees.vue @@ -5,81 +5,66 @@ *新版本支持vue或【表.jsx]文件编写业务,文档见:https://v3.volcore.xyz/docs/view-grid、https://v3.volcore.xyz/docs/web --> - +