From b5887c17436b8c4749a7b5b3d9ad5dd81bede760 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 4 Nov 2024 15:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/oa/doCopyWork/doCopyWork.html | 34 +++++-----------------
 public/pages/oa/doCopyWork/doCopyWork.js   | 22 ++++----------
 public/pages/oa/startWork/startWork.js     |  1 +
 3 files changed, 15 insertions(+), 42 deletions(-)

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 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <vc:i18n name="工单办理" namespace="doCopyWork"></vc:i18n>
+                        <vc:i18n name="抄送办理" namespace="doCopyWork"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;"></div>
                 </div>
                 <div class="ibox-content">
-                    <div class="form-group row">
+                    <div class="form-group row" v-if="doCopyWorkInfo.deduction == 'Y'">
                         <label class="col-sm-2 col-form-label text-right">
-                            <vc:i18n name="动作" namespace="doCopyWork"></vc:i18n>
+                            <vc:i18n name="扣款金额" namespace="doCopyWork"></vc:i18n>
                         </label>
                         <div class="col-sm-10">
-                            <select class="custom-select" v-model="doCopyWorkInfo.audit.auditCode">
-                                <option selected disabled value="">{{vc.i18n('请选择','doCopyWork')}}</option>
-                                <option value="C">{{vc.i18n('办理','doCopyWork')}}</option>
-                                <option value="T">{{vc.i18n('转单','doCopyWork')}}</option>
-                            </select>
-                        </div>
-                    </div>
-                    <!-- 转单时 必须指定 委托人 -->
-                    <div class="form-group row" v-if="doCopyWorkInfo.audit.auditCode == 'T'">
-                        <label class="col-sm-2 col-form-label text-right">
-                            <vc:i18n name="下一处理人" namespace="doCopyWork"></vc:i18n>
-                        </label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" :placeholder="vc.i18n('必填，请选择下一处理人','doCopyWork')"
-                                disabled v-model.trim="doCopyWorkInfo.audit.staffName">
-                        </div>
-                        <div class="col-sm-2">
-                            <button class="btn btn-white " type="button" v-on:click="chooseStaff()">
-                                <i class="fa fa-search"></i>选择
-                            </button>
+                            <input :placeholder="vc.i18n('必填，请填写扣款金额','doCopyWork')" type="number" class="form-control"
+                                v-model.trim="doCopyWorkInfo.audit.deductionMoney"/>
                         </div>
                     </div>
                     <div class="form-group row">
                         <label class="col-sm-2 col-form-label text-right">
-                            <vc:i18n name="工单说明" namespace="doCopyWork"></vc:i18n>
+                            <vc:i18n name="说明" namespace="doCopyWork"></vc:i18n>
                         </label>
                         <div class="col-sm-10">
-                            <textarea :placeholder="vc.i18n('必填，请填写工单说明','doCopyWork')" class="form-control"
-                                v-model.trim="doCopyWorkInfo.audit.auditMessage">
+                            <textarea :placeholder="vc.i18n('必填，请填写说明','doCopyWork')" class="form-control"
+                                v-model.trim="doCopyWorkInfo.audit.deductionReason">
                             </textarea>
                         </div>
                     </div>
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
                 };