diff --git a/public/components/oa/workDetailEvent/workDetailEvent.html b/public/components/oa/workDetailEvent/workDetailEvent.html index 45f111e1b..9fcf8716f 100644 --- a/public/components/oa/workDetailEvent/workDetailEvent.html +++ b/public/components/oa/workDetailEvent/workDetailEvent.html @@ -1,80 +1,90 @@
-
- +
+
+
+
    +
  • + 问题{{item.seqNum}} +
    • +
+
+
-
- -
-
- -
-
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- {{event.preStaffName}} - - {{event.staffName}} - - {{event.startTime}}
- ~{{event.endTime}} - 		- {{event.remark}} - - {{event.createTime}} -
-
    -
    - -
    - +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + +
    + {{event.preStaffName}} + + {{event.staffName}} + + {{event.startTime}}
    + ~{{event.endTime}} +     		+ {{event.remark}} + + {{event.createTime}} +
    + +
    + +
    +
    \ No newline at end of file diff --git a/public/components/oa/workDetailEvent/workDetailEvent.js b/public/components/oa/workDetailEvent/workDetailEvent.js index 5f8c91c26..763191e41 100644 --- a/public/components/oa/workDetailEvent/workDetailEvent.js +++ b/public/components/oa/workDetailEvent/workDetailEvent.js @@ -8,7 +8,9 @@ data: { workDetailEventInfo: { events: [], + contents:[], workId: '', + contentId:'', staffNameLike: '', queryStartTime: '', queryEndTime: '' @@ -19,15 +21,10 @@ _initEvent: function () { vc.on('workDetailEvent', 'switch', function (_data) { $that.workDetailEventInfo.workId = _data.workId; - $that._loadWorkDetailEventData(DEFAULT_PAGE, DEFAULT_ROWS); + $that.workDetailEventInfo.contents = _data.contents; + $that.swatchEventContentId(_data.contents[0]); setTimeout(function () { - vc.component._initWorkDetailEventDateInfo(); - /*vc.initDateTime('eventQueryStartTime', function (_value) { - $that.workDetailEventInfo.queryStartTime = _value; - }); - vc.initDateTime('eventQueryEndTime', function (_value) { - $that.workDetailEventInfo.queryEndTime = _value; - });*/ + $that._initWorkDetailEventDateInfo(); }, 1000) }); vc.on('workDetailEvent', 'paginationPlus', 'page_event', @@ -53,13 +50,13 @@ .on('changeDate', function (ev) { var value = $(".eventQueryStartTime").val(); var start = Date.parse(new Date(value)); - var end = Date.parse(new Date(vc.component.workDetailEventInfo.queryEndTime)); + var end = Date.parse(new Date($that.workDetailEventInfo.queryEndTime)); if (start - end >= 0) { vc.toast("开始时间必须小于结束时间"); $(".eventQueryStartTime").val(''); - vc.component.workDetailEventInfo.queryStartTime = ""; + $that.workDetailEventInfo.queryStartTime = ""; } else { - vc.component.workDetailEventInfo.queryStartTime = value; + $that.workDetailEventInfo.queryStartTime = value; } }); $('.eventQueryEndTime').datetimepicker({ @@ -74,14 +71,14 @@ $('.eventQueryEndTime').datetimepicker() .on('changeDate', function (ev) { var value = $(".eventQueryEndTime").val(); - var start = Date.parse(new Date(vc.component.workDetailEventInfo.queryStartTime)); + var start = Date.parse(new Date($that.workDetailEventInfo.queryStartTime)); var end = Date.parse(new Date(value)); if (start - end >= 0) { vc.toast("结束时间必须大于开始时间"); $(".eventQueryEndTime").val(''); - vc.component.workDetailEventInfo.queryEndTime = ""; + $that.workDetailEventInfo.queryEndTime = ""; } else { - vc.component.workDetailEventInfo.queryEndTime = value; + $that.workDetailEventInfo.queryEndTime = value; } }); //防止多次点击时间插件失去焦点 @@ -102,6 +99,7 @@ params: { taskId: $that.workDetailEventInfo.taskId, workId: $that.workDetailEventInfo.workId, + contentId: $that.workDetailEventInfo.contentId, staffNameLike: $that.workDetailEventInfo.staffNameLike, queryStartTime: $that.workDetailEventInfo.queryStartTime, queryEndTime: $that.workDetailEventInfo.queryEndTime, @@ -129,10 +127,15 @@ _queryWorkDetailEvent: function () { $that._loadWorkDetailEventData(DEFAULT_PAGE, DEFAULT_ROWS); }, + swatchEventContentId:function(_content){ + $that.workDetailEventInfo.contentId = _content.contentId; + $that._loadWorkDetailEventData(DEFAULT_PAGE, DEFAULT_ROWS); + + }, _resetWorkDetailEvent: function () { - vc.component.workDetailEventInfo.staffNameLike = ""; - vc.component.workDetailEventInfo.queryStartTime = ""; - vc.component.workDetailEventInfo.queryEndTime = ""; + $that.workDetailEventInfo.staffNameLike = ""; + $that.workDetailEventInfo.queryStartTime = ""; + $that.workDetailEventInfo.queryEndTime = ""; $that._loadWorkDetailEventData(DEFAULT_PAGE, DEFAULT_ROWS); } } diff --git a/public/components/oa/workDetailFile/workDetailFile.html b/public/components/oa/workDetailFile/workDetailFile.html index 798b471d2..c5c525ba2 100644 --- a/public/components/oa/workDetailFile/workDetailFile.html +++ b/public/components/oa/workDetailFile/workDetailFile.html @@ -1,5 +1,20 @@
    +
    +
    +
    +
      +
    • + 问题{{item.seqNum}} +
      • +
    +
    +
    +
    +
    +
    @@ -61,4 +76,6 @@
    +
    +
    \ No newline at end of file diff --git a/public/components/oa/workDetailFile/workDetailFile.js b/public/components/oa/workDetailFile/workDetailFile.js index 038b627eb..ff763545c 100644 --- a/public/components/oa/workDetailFile/workDetailFile.js +++ b/public/components/oa/workDetailFile/workDetailFile.js @@ -8,6 +8,7 @@ data: { workDetailFileInfo: { files: [], + contents:[], workId: '', staffNameLike: '', queryStartTime: '', @@ -19,7 +20,8 @@ _initEvent: function () { vc.on('workDetailFile', 'switch', function (_data) { $that.workDetailFileInfo.workId = _data.workId; - $that._loadWorkDetailFileData(DEFAULT_PAGE, DEFAULT_ROWS); + $that.workDetailFileInfo.contents = _data.contents; + $that.swatchFileContentId(_data.contents[0]); setTimeout(function () { vc.initDateTime('fileQueryStartTime', function (_value) { $that.workDetailFileInfo.queryStartTime = _value; @@ -43,6 +45,7 @@ params: { taskId: $that.workDetailFileInfo.taskId, workId: $that.workDetailFileInfo.workId, + contentId: $that.workDetailFileInfo.contentId, staffNameLike: $that.workDetailFileInfo.staffNameLike, queryStartTime: $that.workDetailFileInfo.queryStartTime, queryEndTime: $that.workDetailFileInfo.queryEndTime, @@ -70,10 +73,15 @@ _queryWorkDetailFile: function () { $that._loadWorkDetailFileData(DEFAULT_PAGE, DEFAULT_ROWS); }, + swatchFileContentId:function(_content){ + $that.workDetailFileInfo.contentId = _content.contentId; + $that._loadWorkDetailFileData(DEFAULT_PAGE, DEFAULT_ROWS); + + }, _resetWorkDetailFile: function () { - vc.component.workDetailFileInfo.staffNameLike = ""; - vc.component.workDetailFileInfo.queryStartTime = ""; - vc.component.workDetailFileInfo.queryEndTime = ""; + $that.workDetailFileInfo.staffNameLike = ""; + $that.workDetailFileInfo.queryStartTime = ""; + $that.workDetailFileInfo.queryEndTime = ""; $that._loadWorkDetailFileData(DEFAULT_PAGE, DEFAULT_ROWS); } } diff --git a/public/pages/oa/workDetail/workDetail.html b/public/pages/oa/workDetail/workDetail.html index 3293eff46..6c7eb579e 100644 --- a/public/pages/oa/workDetail/workDetail.html +++ b/public/pages/oa/workDetail/workDetail.html @@ -165,8 +165,8 @@
    -
    {{index+1}}、
    -
    +
    {{item.seqNum}}、
    +
    diff --git a/public/pages/oa/workDetail/workDetail.js b/public/pages/oa/workDetail/workDetail.js index 276345be1..2d8c3ee04 100644 --- a/public/pages/oa/workDetail/workDetail.js +++ b/public/pages/oa/workDetail/workDetail.js @@ -68,7 +68,8 @@ vc.emit(_tab, 'switch', { taskId: $that.workDetailInfo.taskId, workId: $that.workDetailInfo.workId, - wtId: $that.workDetailInfo.wtId + wtId: $that.workDetailInfo.wtId, + contents:$that.workDetailInfo.contents }) }, }