Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 ef3d8de0 编写于 作者: 楼 楼国栋
浏览文件
操作

Merge branch 'fix/attendance' into 'develop' 

考勤相关的问题修改

See merge request o2oa/o2oa!735
上级 d386a4e5 7e96b87e
隐藏空白更改
内联 并排
Showing with 431 addition and 213 deletion
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendanceMobile.java
浏览文件 @ ef3d8de0
......@@ -72,6 +72,9 @@ public class ActionReciveAttendanceMobile extends BaseAction {
}
}
if( check ){
if (StringUtils.isNotEmpty(wrapIn.getDescription())) {
attendanceDetailMobile.setDescription(wrapIn.getDescription());
}
if( StringUtils.isNotEmpty(wrapIn.getRecordAddress()) ){
attendanceDetailMobile.setRecordAddress( wrapIn.getRecordAddress() );
}
......
o2web/source/x_component_Attendance/AppealExplorer.js
浏览文件 @ ef3d8de0
......@@ -241,7 +241,7 @@ MWF.xApplication.Attendance.AppealExplorer = new Class({
"onComplete": function(items){
var arr = [];
items.each(function(item){
arr.push(item.data.name);
arr.push(item.data.distinguishedName);
}.bind(this));
el.set("value",arr.join(","));
}.bind(this)
......
o2web/source/x_component_Attendance/PeopleDetail.js
浏览文件 @ ef3d8de0
......@@ -133,11 +133,17 @@ MWF.xApplication.Attendance.PeopleDetail.Explorer = new Class({
this.fileterNode.set("html",html);
MWF.xDesktop.requireApp("Template", "MForm", function(){
var empSelector = { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } };
if( !this.app.isAdmin() && this.app.manageUnits ){
empSelector = { text : lp.person, type : "org", orgType : "identity", "units": this.app.manageUnits, orgOptions: {
"resultType": "person",
} , notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm( this.fileterNode, {}, {
style: "attendance",
isEdited : true,
itemTemplate : {
q_empName : { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } },
q_empName : empSelector,
cycleYear : {
text : lp.annuaal,
"type" : "select",
......@@ -499,11 +505,17 @@ MWF.xApplication.Attendance.PeopleDetail.DetailStaticExplorer = new Class({
this.fileterNode.set("html",html);
MWF.xDesktop.requireApp("Template", "MForm", function(){
var empSelector = { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } };
if( !this.app.isAdmin() && this.app.manageUnits ){
empSelector = { text : lp.person, type : "org", orgType : "identity", "units": this.app.manageUnits, orgOptions: {
"resultType": "person",
} , notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm( this.fileterNode, {}, {
style: "attendance",
isEdited : true,
itemTemplate : {
q_empName : { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } },
q_empName : empSelector,
cycleYear : {
text : lp.annuaal,
"type" : "select",
......
o2web/source/x_component_Attendance/PeopleDingdingDetail.js
浏览文件 @ ef3d8de0
......@@ -114,11 +114,17 @@ MWF.xApplication.Attendance.PeopleDingdingDetail.Explorer = new Class({
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
var empSelector = { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } };
if( !this.app.isAdmin() && this.app.manageUnits ){
empSelector = { text : lp.person, type : "org", orgType : "identity", "units": this.app.manageUnits, orgOptions: {
"resultType": "person",
} , notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
person: { text: lp.person, type: "org", orgType: "person", notEmpty: true, style: { "min-width": "100px" } },
person: empSelector,
year: {
text: lp.annuaal,
"type": "select",
......@@ -264,11 +270,17 @@ MWF.xApplication.Attendance.PeopleDingdingDetail.DetailStaticExplorer = new Clas
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
var empSelector = { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } };
if( !this.app.isAdmin() && this.app.manageUnits ){
empSelector = { text : lp.person, type : "org", orgType : "identity", "units": this.app.manageUnits, orgOptions: {
"resultType": "person",
} , notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
q_empName: { text: lp.person, type: "org", orgType: "person", notEmpty: true, style: { "min-width": "100px" } },
q_empName: empSelector,
cycleYear: {
text: lp.annuaal,
"type": "select",
......
o2web/source/x_component_Attendance/PeopleQywxDetail.js
浏览文件 @ ef3d8de0
......@@ -114,11 +114,17 @@ MWF.xApplication.Attendance.PeopleQywxDetail.Explorer = new Class({
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
var empSelector = { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } };
if( !this.app.isAdmin() && this.app.manageUnits ){
empSelector = { text : lp.person, type : "org", orgType : "identity", "units": this.app.manageUnits, orgOptions: {
"resultType": "person",
} , notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
person: { text: lp.person, type: "org", orgType: "person", notEmpty: true, style: { "min-width": "100px" } },
person: empSelector,
year: {
text: lp.annuaal,
"type": "select",
......@@ -264,11 +270,17 @@ MWF.xApplication.Attendance.PeopleQywxDetail.DetailStaticExplorer = new Class({
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
var empSelector = { text : lp.person, type : "org", orgType : "person", notEmpty : true, style : {"min-width": "100px" } };
if( !this.app.isAdmin() && this.app.manageUnits ){
empSelector = { text : lp.person, type : "org", orgType : "identity", "units": this.app.manageUnits, orgOptions: {
"resultType": "person",
} , notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
q_empName: { text: lp.person, type: "org", orgType: "person", notEmpty: true, style: { "min-width": "100px" } },
q_empName: empSelector,
cycleYear: {
text: lp.annuaal,
"type": "select",
......
o2web/source/x_component_Attendance/UnitDetail.js
浏览文件 @ ef3d8de0
......@@ -116,12 +116,8 @@ MWF.xApplication.Attendance.UnitDetail.Explorer = new Class({
this.fileterNode.set("html",html);
MWF.xDesktop.requireApp("Template", "MForm", function(){
this.form = new MForm( this.fileterNode, {}, {
style: "attendance",
isEdited : true,
itemTemplate : {
q_unitName : { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } },
cycleYear : {
var itemTemplate = {
cycleYear : {
text : lp.annuaal,
"type" : "select",
"selectValue" : function(){
......@@ -193,10 +189,31 @@ MWF.xApplication.Attendance.UnitDetail.Explorer = new Class({
debugger;
this.actions.detailsExportStream(result.q_topUnitName,result.q_unitName,result.q_empName,result.cycleYear,result.cycleMonth,result.q_date,result.isAbsent,result.isLackOfTime,result.isLate,true);
}.bind(this)
}}
}
}
};
if( this.app.isAdmin() ){
itemTemplate.q_unitName = { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } };
}else{
var unitNameArr = []
var unitValueArr = this.app.manageUnits;
for (let i = 0; i < unitValueArr.length; i++) {
const element = unitValueArr[i];
if(element.indexOf("@") > -1){
const name = element.split("@")[0];
unitNameArr.push(name);
} else {
unitNameArr.push(element);
}
}
itemTemplate.q_unitName = { text : lp.unit, type : "select", selectValue : unitValueArr, "selectText": unitNameArr, notEmpty : true, style : {"min-width": "100px" } };
}
}, this.app, this.app.css);
this.form.load();
this.form = new MForm( this.fileterNode, {}, {
style: "attendance",
isEdited : true,
itemTemplate : itemTemplate
}, this.app, this.app.css);
this.form.load();
}.bind(this), true);
},
getDateSelectValue : function(){
......@@ -492,47 +509,65 @@ MWF.xApplication.Attendance.UnitDetail.DetailStaticExplorer = new Class({
this.fileterNode.set("html",html);
MWF.xDesktop.requireApp("Template", "MForm", function(){
this.form = new MForm( this.fileterNode, {}, {
style: "attendance",
isEdited : true,
itemTemplate : {
q_unitName : { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } },
cycleYear : {
text : lp.annuaal,
"type" : "select",
"selectValue" : function(){
var years = [];
var year = new Date().getFullYear();
for(var i=0; i<6; i++ ){
years.push( year-- );
}
return years;
var itemTemplate = {
q_unitName : { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } },
cycleYear : {
text : lp.annuaal,
"type" : "select",
"selectValue" : function(){
var years = [];
var year = new Date().getFullYear();
for(var i=0; i<6; i++ ){
years.push( year-- );
}
return years;
}
},
cycleMonth : {
text : lp.months, notEmpty : true,
"type" : "select",
"defaultValue" : function(){
var month = (new Date().getMonth() + 1 ).toString();
return month.length == 1 ? "0"+month : month;
},
cycleMonth : {
text : lp.months, notEmpty : true,
"type" : "select",
"defaultValue" : function(){
var month = (new Date().getMonth() + 1 ).toString();
return month.length == 1 ? "0"+month : month;
},
"selectValue" :["","01","02","03","04","05","06","07","08","09","10","11","12"]
},
action : { "value" : lp.query, type : "button", className : "filterButton", event : {
"selectValue" :["","01","02","03","04","05","06","07","08","09","10","11","12"]
},
action : { "value" : lp.query, type : "button", className : "filterButton", event : {
click : function(){
var result = this.form.getResult(true,",",true,true,false);
if( !result )return;
this.loadView( result );
}.bind(this)
}},
export : { "value" : lp.export, type : "button", className : "filterButton", event : {
click : function(){
var result = this.form.getResult(true,",",true,true,false);
if( !result )return;
this.loadView( result );
this.actions.exportUnitStatisticAttachment(result.q_unitName,result.cycleYear,result.cycleMonth,true);
}.bind(this)
}},
export : { "value" : lp.export, type : "button", className : "filterButton", event : {
click : function(){
var result = this.form.getResult(true,",",true,true,false);
if( !result )return;
this.actions.exportUnitStatisticAttachment(result.q_unitName,result.cycleYear,result.cycleMonth,true);
}.bind(this)
}}
}}
};
if( this.app.isAdmin() ){
itemTemplate.q_unitName = { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } };
}else{
var unitNameArr = []
var unitValueArr = this.app.manageUnits;
for (let i = 0; i < unitValueArr.length; i++) {
const element = unitValueArr[i];
if(element.indexOf("@") > -1){
const name = element.split("@")[0];
unitNameArr.push(name);
} else {
unitNameArr.push(element);
}
}
itemTemplate.q_unitName = { text : lp.unit, type : "select", selectValue : unitValueArr, "selectText": unitNameArr, notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm( this.fileterNode, {}, {
style: "attendance",
isEdited : true,
itemTemplate : itemTemplate
}, this.app, this.app.css);
this.form.load();
}.bind(this), true);
......
o2web/source/x_component_Attendance/UnitDingdingDetail.js
浏览文件 @ ef3d8de0
......@@ -113,60 +113,77 @@ MWF.xApplication.Attendance.UnitDingdingDetail.Explorer = new Class({
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
unit: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "100px" } },
year: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
},
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
var itemTemplate = {
unit: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "100px" } },
year: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
},
month: {
text: lp.months,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"],
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
}
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
}
},
month: {
text: lp.months,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
day: { text: lp.date, "type": "select", "selectValue": this.getDateSelectValue.bind(this) },
checkType: { text: lp.signinType, "type": "select", "selectValue": ["", "OnDuty", "OffDuty"], "selectText": lp.signinTypeSelectText },
timeResult: { text: lp.signinResult, "type": "select", "selectValue": ["", "Normal", "Early", "Late", "SeriousLate", "Absenteeism", "NotSigned"], "selectText": lp.signinResultSelectText },
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
if (result.day && result.day != "") {
result.q_date = result.year + "-" + result.month + "-" + result.day;
}
this.loadView(result);
}.bind(this)
}
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"],
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
}
},
day: { text: lp.date, "type": "select", "selectValue": this.getDateSelectValue.bind(this) },
checkType: { text: lp.signinType, "type": "select", "selectValue": ["", "OnDuty", "OffDuty"], "selectText": lp.signinTypeSelectText },
timeResult: { text: lp.signinResult, "type": "select", "selectValue": ["", "Normal", "Early", "Late", "SeriousLate", "Absenteeism", "NotSigned"], "selectText": lp.signinResultSelectText },
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
if (result.day && result.day != "") {
result.q_date = result.year + "-" + result.month + "-" + result.day;
}
this.loadView(result);
}.bind(this)
}
}
}
if( this.app.isAdmin() ){
itemTemplate.q_unitName = { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } };
}else{
var unitNameArr = []
var unitValueArr = this.app.manageUnits;
for (let i = 0; i < unitValueArr.length; i++) {
const element = unitValueArr[i];
if(element.indexOf("@") > -1){
const name = element.split("@")[0];
unitNameArr.push(name);
} else {
unitNameArr.push(element);
}
}
itemTemplate.q_unitName = { text : lp.unit, type : "select", selectValue : unitValueArr, "selectText": unitNameArr, notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: itemTemplate
}, this.app, this.app.css);
this.form.load();
}.bind(this), true);
......@@ -251,42 +268,59 @@ MWF.xApplication.Attendance.UnitDingdingDetail.DetailStaticExplorer = new Class(
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
q_unitName: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "100px" } },
cycleYear: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
var itemTemplate = {
q_unitName: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "100px" } },
cycleYear: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
}
},
cycleMonth: {
text: lp.months, notEmpty: true,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
cycleMonth: {
text: lp.months, notEmpty: true,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
},
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
this.loadView(result);
}.bind(this)
}
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
},
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
this.loadView(result);
}.bind(this)
}
}
}
if( this.app.isAdmin() ){
itemTemplate.q_unitName = { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } };
}else{
var unitNameArr = []
var unitValueArr = this.app.manageUnits;
for (let i = 0; i < unitValueArr.length; i++) {
const element = unitValueArr[i];
if(element.indexOf("@") > -1){
const name = element.split("@")[0];
unitNameArr.push(name);
} else {
unitNameArr.push(element);
}
}
itemTemplate.q_unitName = { text : lp.unit, type : "select", selectValue : unitValueArr, "selectText": unitNameArr, notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: itemTemplate
}, this.app, this.app.css);
this.form.load();
}.bind(this), true);
......
o2web/source/x_component_Attendance/UnitQywxDetail.js
浏览文件 @ ef3d8de0
......@@ -113,60 +113,77 @@ MWF.xApplication.Attendance.UnitQywxDetail.Explorer = new Class({
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
unit: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "200px" } },
year: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
},
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
var itemTemplate = {
unit: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "200px" } },
year: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
},
month: {
text: lp.months,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"],
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
}
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
}
},
month: {
text: lp.months,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
day: { text: lp.date, "type": "select", "selectValue": this.getDateSelectValue.bind(this) },
checkType: { text: lp.signinType, "type": "select", "selectValue": lp.signinQywxTypeSelectText, "selectText": lp.signinQywxTypeSelectText },
exceptionType: { text: lp.signinResult, "type": "select", "selectValue": lp.signinQywxResultSelectText, "selectText": lp.signinQywxResultSelectText },
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
if (result.day && result.day != "") {
result.q_date = result.year + "-" + result.month + "-" + result.day;
}
this.loadView(result);
}.bind(this)
}
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"],
"event": {
"change": function (item, ev) {
var values = this.getDateSelectValue();
item.form.getItem("day").resetItemOptions(values, values)
}.bind(this)
}
},
day: { text: lp.date, "type": "select", "selectValue": this.getDateSelectValue.bind(this) },
checkType: { text: lp.signinType, "type": "select", "selectValue": lp.signinQywxTypeSelectText, "selectText": lp.signinQywxTypeSelectText },
exceptionType: { text: lp.signinResult, "type": "select", "selectValue": lp.signinQywxResultSelectText, "selectText": lp.signinQywxResultSelectText },
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
if (result.day && result.day != "") {
result.q_date = result.year + "-" + result.month + "-" + result.day;
}
this.loadView(result);
}.bind(this)
}
}
}
if( this.app.isAdmin() ){
itemTemplate.unit = { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } };
}else{
var unitNameArr = []
var unitValueArr = this.app.manageUnits;
for (let i = 0; i < unitValueArr.length; i++) {
const element = unitValueArr[i];
if(element.indexOf("@") > -1){
const name = element.split("@")[0];
unitNameArr.push(name);
} else {
unitNameArr.push(element);
}
}
itemTemplate.unit = { text : lp.unit, type : "select", selectValue : unitValueArr, "selectText": unitNameArr, notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: itemTemplate
}, this.app, this.app.css);
this.form.load();
}.bind(this), true);
......@@ -251,42 +268,59 @@ MWF.xApplication.Attendance.UnitQywxDetail.DetailStaticExplorer = new Class({
this.fileterNode.set("html", html);
MWF.xDesktop.requireApp("Template", "MForm", function () {
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: {
q_unitName: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "200px" } },
cycleYear: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
var itemTemplate = {
q_unitName: { text: lp.unit, type: "org", orgType: "unit", notEmpty: true, style: { "min-width": "200px" } },
cycleYear: {
text: lp.annuaal,
"type": "select",
"selectValue": function () {
var years = [];
var year = new Date().getFullYear();
for (var i = 0; i < 6; i++) {
years.push(year--);
}
return years;
}
},
cycleMonth: {
text: lp.months, notEmpty: true,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
cycleMonth: {
text: lp.months, notEmpty: true,
"type": "select",
"defaultValue": function () {
var month = (new Date().getMonth() + 1).toString();
return month.length == 1 ? "0" + month : month;
},
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
},
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
this.loadView(result);
}.bind(this)
}
"selectValue": ["", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
},
action: {
"value": lp.query, type: "button", className: "filterButton", event: {
click: function () {
var result = this.form.getResult(true, ",", true, true, false);
if (!result) return;
this.loadView(result);
}.bind(this)
}
}
}
if( this.app.isAdmin() ){
itemTemplate.q_unitName = { text : lp.unit, type : "org", orgType : "unit", notEmpty : true, style : {"min-width": "100px" } };
}else{
var unitNameArr = []
var unitValueArr = this.app.manageUnits;
for (let i = 0; i < unitValueArr.length; i++) {
const element = unitValueArr[i];
if(element.indexOf("@") > -1){
const name = element.split("@")[0];
unitNameArr.push(name);
} else {
unitNameArr.push(element);
}
}
itemTemplate.q_unitName = { text : lp.unit, type : "select", selectValue : unitValueArr, "selectText": unitNameArr, notEmpty : true, style : {"min-width": "100px" } };
}
this.form = new MForm(this.fileterNode, {}, {
style: "attendance",
isEdited: true,
itemTemplate: itemTemplate
}, this.app, this.app.css);
this.form.load();
}.bind(this), true);
......
o2web/source/x_desktop/js/o2m.api.js
浏览文件 @ ef3d8de0
......@@ -1167,6 +1167,28 @@
this.o2m.util.navigation.goBack = _o2m_u_navigation_goBack;
//o2m.util.navigation.openOtherApp 功能不完整，有很多限制。暂时不开放
this.o2m.util.navigation.openOtherAppSuccess = function (result) {
console.log("util navigation openOtherApp back, result:" + result);
};
var _o2m_u_navigation_openOtherApp = function (c) {
var onSuccess = c && c.onSuccess ? c.onSuccess : null;
var onFail = c && c.onFail ? c.onFail : null;
if (onSuccess && typeof onSuccess === "function") {
o2m.util.navigation.openOtherAppSuccess = onSuccess;
}
var schema = c && c.schema ? c.schema : "";
var body = {
type: "navigation.openOtherApp",
callback: "o2m.util.navigation.openOtherAppSuccess",
data: {
schema: schema
}
};
_util_post(body, onFail);
};
this.o2m.util.navigation.openOtherApp = _o2m_u_navigation_openOtherApp;
/** ***** BEGIN BIZ BLOCK *****
......@@ -1179,11 +1201,13 @@
o2m.biz.contact.departmentsPicker
o2m.biz.contact.ComplexPicker
o2m.biz.contact.GroupPicker
o2m.biz.file.previewDoc
* ***** END UTIL BLOCK ******/
this.o2m.biz = {
contact: {}
contact: {},
file:{}
};
var _biz_post = function (body, onFail) {
......@@ -1651,4 +1675,56 @@
//o2m.biz.contact.ComplexPicker
this.o2m.biz.file.PreviewDocSuccess = function (result) {
console.log("biz file preview doc back, result:" + result);
};
var _o2m_b_file_preview = function (c) {
var onSuccess = c && c.onSuccess ? c.onSuccess : null;
var onFail = c && c.onFail ? c.onFail : null;
if (onSuccess && typeof onSuccess === "function") {
o2m.biz.file.PreviewDocSuccess = onSuccess;
}
var fileUrl = c && c.url ? c.url : "";
var fileName = c && c.fileName ? c.fileName : "";
var body = {
type: "file.previewDoc",
callback: "o2m.biz.file.PreviewDocSuccess ",
data: {
url: fileUrl,
fileName: fileName
}
};
_biz_post(body, onFail);
};
/**
* 文件预览
* @method PreviewDoc
* @memberOf o2m
* @o2membercategory biz
* @static
* @param {Object} obj PreviewDoc需要传入对象
* <pre><code class='language-js'>{
* url: String, //文件下载地址，比如https://www.o2oa.net/file.pdf
* fileName：String 预览的文件名称，比如file.pdf
* "onSuccess": function, //成功回调
* "onFail": function, //失败回调
* }</code></pre>
* @example
* o2m.biz.file.PreviewDoc({
* url: "https://www.o2oa.net/file.pdf", //文件下载地址
* fileName: "file.pdf",//预览的文件名称
* onSuccess : function(result) {
* //返回结果样例
* {
* result:true,
* message:""
* }
* },
* onFail : function(err) {}
* });
*/
this.o2m.biz.file.PreviewDoc = _o2m_b_file_preview;
})();
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或