From 03a174c8e0f932451573846d59f561b7c187dec2 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Thu, 28 Dec 2023 00:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E6=8A=84=E9=80=81=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/workDetailCopy/workDetailCopy.html | 6 +++ public/pages/oa/copyWork/copyWork.html | 47 ++++++++++++++++--- public/pages/oa/copyWork/copyWork.js | 30 +++++++++++- 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/public/components/oa/workDetailCopy/workDetailCopy.html b/public/components/oa/workDetailCopy/workDetailCopy.html index a8d24501c..0157f374c 100644 --- a/public/components/oa/workDetailCopy/workDetailCopy.html +++ b/public/components/oa/workDetailCopy/workDetailCopy.html @@ -28,6 +28,9 @@ + + + @@ -44,6 +47,9 @@ {{copy.stateName}} + + {{copy.remark}} + diff --git a/public/pages/oa/copyWork/copyWork.html b/public/pages/oa/copyWork/copyWork.html index dbc4948cc..42e8c4e15 100644 --- a/public/pages/oa/copyWork/copyWork.html +++ b/public/pages/oa/copyWork/copyWork.html @@ -42,19 +42,21 @@
+ v-model="copyWorkInfo.conditions.queryStartTime" + class=" form-control queryStartTime">
+ v-model="copyWorkInfo.conditions.queryEndTime" + class=" form-control queryEndTime">
@@ -70,7 +72,7 @@
- +
@@ -129,10 +131,10 @@ {{work.stateName}} {{work.createTime}} -
+
@@ -153,4 +155,37 @@
+ + \ No newline at end of file diff --git a/public/pages/oa/copyWork/copyWork.js b/public/pages/oa/copyWork/copyWork.js index d4364e1eb..bdcd61391 100644 --- a/public/pages/oa/copyWork/copyWork.js +++ b/public/pages/oa/copyWork/copyWork.js @@ -22,6 +22,10 @@ records: 1, moreCondition: false, wtId: '', + audit:{ + copyId:'', + auditMessage:'', + }, conditions: { state:'', typeName: '', @@ -74,7 +78,8 @@ ); }, _openCopyWorkModel:function(_work){ - + $('#auditModel').modal('show'); + $that.copyWorkInfo.audit.copyId = _work.copyId; }, _queryCopyWorkMethod: function () { $that._listCopyWorks(DEFAULT_PAGE, DEFAULT_ROWS); @@ -86,6 +91,29 @@ _toWorkDetailPage:function(_work){ vc.jumpToPage('/#/pages/oa/workDetail?workId='+_work.workId); }, + _auditSubmit: function () { + vc.http.apiPost( + '/work.finishWorkCopy', + JSON.stringify($that.copyWorkInfo.audit), { + emulateJSON: true + }, + function (json, res) { + let _json = JSON.parse(json); + if (_json.code == 0) { + //关闭model + vc.toast('添加成功'); + $('#auditModel').modal('hide'); + $that._listCopyWorks(DEFAULT_PAGE, DEFAULT_ROWS); + return; + } else { + vc.toast(_json.msg); + } + }, + function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + }); + } } }); })(window.vc);