From 16010e86b030714a57b0aff10cc0d89d2905f7c7 Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Tue, 27 May 2025 11:11:06 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Dashboard.php    |  2 +-
 .../admin/view/dashboard/task_complete.html   | 19 +++++++++++++++----
 application/admin/view/oa/doc/add.html        |  4 ++--
 application/admin/view/oa/doc/edit.html       |  2 +-
 application/admin/view/oa/task/review.html    |  4 ++--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php
index c8f8b99..c260fcf 100755
--- a/application/admin/controller/Dashboard.php
+++ b/application/admin/controller/Dashboard.php
@@ -169,7 +169,7 @@ class Dashboard extends Backend
         }
         $params = $this->request->post('row/a');
 
-        $task = (new Task())->where('id', '=', $ids)->where('status', 1)->find();
+        $task = (new Task())->where('id', '=', $ids)->whereIn('status', [1, 5])->find();
 
         if (!$task) {
             $this->error('任务状态已变更，请刷新后操作');
diff --git a/application/admin/view/dashboard/task_complete.html b/application/admin/view/dashboard/task_complete.html
index 4b8b140..4f22f1a 100644
--- a/application/admin/view/dashboard/task_complete.html
+++ b/application/admin/view/dashboard/task_complete.html
@@ -7,33 +7,44 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Desc')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">描述:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-desc" class="form-control" readonly="readonly" type="text" value="{$row.desc|htmlentities}">
         </div>
     </div>
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Prove_desc')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">完成说明:</label>
         <div class="col-xs-12 col-sm-8">
             <textarea id="c-prove_desc" class="form-control" name="row[prove_desc]" rows="3">{$row.prove_desc|htmlentities}</textarea>
         </div>
     </div>
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">文件地址</label>
-        <div class="col-xs-12">
+        <label class="control-label col-xs-12 col-sm-2">文件说明:</label>
+        <div class="col-xs-12 col-sm-8">
             <div class="input-group">
                 <input id="c-prove_file_path" class="form-control" size="50" name="row[prove_file_path]" type="text" value="{$row.path|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="plupload-path" class="btn btn-danger plupload" data-input-id="c-prove_file_path" data-mimetype="*" data-multiple="false" data-preview-id="p-path"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    {if $row->prove_file_path}
                     <span><a href="{$row.url}" class="btn btn-primary btn-info btn-preview" data-type="{$row.filetype}">预览</a></span>
+                    {/if}
                 </div>
                 <span class="msg-box n-right" for="c-prove_file_path"></span>
             </div>
         </div>
     </div>
 
+    {if $row->status == 5}
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">驳回原因:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refuse_reason" class="form-control" readonly="readonly" type="text" value="{$row.refuse_reason|htmlentities}">
+        </div>
+    </div>
+    {/if}
+
     <div class="form-group layer-footer">
         <div class="col-xs-12 col-sm-8">
             <button type="submit" class="btn btn-primary btn-embossed disabled">完成任务</button>
diff --git a/application/admin/view/oa/doc/add.html b/application/admin/view/oa/doc/add.html
index 3485802..76c65a5 100644
--- a/application/admin/view/oa/doc/add.html
+++ b/application/admin/view/oa/doc/add.html
@@ -19,8 +19,8 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">{:__('Path')}:</label>
-        <div class="col-xs-12">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Path')}:</label>
+        <div class="col-xs-12 col-sm-8">
             <div class="input-group">
                 <input id="c-path" data-rule="required" class="form-control" size="50" name="row[path]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
diff --git a/application/admin/view/oa/doc/edit.html b/application/admin/view/oa/doc/edit.html
index 2e4399a..a456dce 100644
--- a/application/admin/view/oa/doc/edit.html
+++ b/application/admin/view/oa/doc/edit.html
@@ -21,7 +21,7 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Path')}:</label>
-        <div class="col-xs-12">
+        <div class="col-xs-12 col-sm-8">
             <div class="input-group">
                 <input id="c-path" data-rule="required" class="form-control" size="50" name="row[path]" type="text" value="{$row.path|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
diff --git a/application/admin/view/oa/task/review.html b/application/admin/view/oa/task/review.html
index 725cbd0..87b1a6f 100644
--- a/application/admin/view/oa/task/review.html
+++ b/application/admin/view/oa/task/review.html
@@ -43,8 +43,8 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">完成附件:</label>
-        <div class="col-xs-12">
+        <label class="control-label col-xs-12 col-sm-2">完成附件:</label>
+        <div class="col-xs-12 col-sm-8">
             <div class="input-group">
                 <input id="c-prove_file_path" class="form-control" size="50" readonly="readonly" name="row[prove_file_path]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">