diff --git a/public/pages/oa/doCopyWork/doCopyWork.html b/public/pages/oa/doCopyWork/doCopyWork.html index 634086244..f73566ac8 100644 --- a/public/pages/oa/doCopyWork/doCopyWork.html +++ b/public/pages/oa/doCopyWork/doCopyWork.html @@ -180,45 +180,27 @@
- +
-
+
- -
-
- -
- -
- -
-
- +
-
diff --git a/public/pages/oa/doCopyWork/doCopyWork.js b/public/pages/oa/doCopyWork/doCopyWork.js index b83a37582..4803a960e 100644 --- a/public/pages/oa/doCopyWork/doCopyWork.js +++ b/public/pages/oa/doCopyWork/doCopyWork.js @@ -21,28 +21,18 @@ items: [], pathUrl: '', taskId: '', - todo: 'OFF', - events: [], - files: [], + deduction: 'N', audit: { - taskId: '', - auditCode: 'C', - auditMessage: '已办理', - staffId: '', - staffName: '', - pathUrl: '', + copyId: '', + deductionMoney: 0.00, + deductionReason: '', itemId: '', } } }, _initMethod: function () { $that.doCopyWorkInfo.workId = vc.getParam('workId'); - $that.doCopyWorkInfo.taskId = vc.getParam('taskId'); - let _todo = vc.getParam('todo'); - if (_todo) { - $that.doCopyWorkInfo.todo = _todo; - $that.doCopyWorkInfo.audit.taskId = vc.getParam('taskId'); - } + $that.doCopyWorkInfo.audit.copyId = vc.getParam('copyId'); if (!vc.notNull($that.doCopyWorkInfo.workId)) { return; } @@ -108,7 +98,7 @@ }, _auditSubmit: function () { vc.http.apiPost( - '/work.finishWorkTask', + '/work.finishWorkCopy', JSON.stringify($that.doCopyWorkInfo.audit), { emulateJSON: true }, diff --git a/public/pages/oa/startWork/startWork.js b/public/pages/oa/startWork/startWork.js index 5a856a38d..ad2c7c0e9 100644 --- a/public/pages/oa/startWork/startWork.js +++ b/public/pages/oa/startWork/startWork.js @@ -101,6 +101,7 @@ _listStartWorks: function (_page, _rows) { $that.startWorkInfo.conditions.page = _page; $that.startWorkInfo.conditions.row = _rows; + $that.startWorkInfo.conditions.communityId = vc.getCurrentCommunity().communityId; var param = { params: $that.startWorkInfo.conditions };