From d3bf6e94cdb64aa8d5f85948a5a1c2b4a0ee294f Mon Sep 17 00:00:00 2001
From: duxp <dxp18195149767@163.com>
Date: Mon, 9 Oct 2023 11:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=97=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approvalForm/approvalForm.js              | 20 +++++++++++++++---
 .../approvalForm/approvalForm.wxml            | 21 ++++++++++++++++++-
 .../approvalForm/approvalForm.wxss            |  6 ++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js
index a57f3c2..c68a839 100644
--- a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js
+++ b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js
@@ -14,7 +14,9 @@ Page({
             nowScore:'',
             remark:''
         },
-        scoreMsg:''
+        scoreMsg:'',
+        overruleShow:false,
+        remark:''
     },
 
     /**
@@ -121,7 +123,18 @@ Page({
     },
 
     //驳回
-    handleOverrule(){
+    handleOverruleOpen(){
+        this.setData({
+            overruleShow:true
+        })
+    },
+    handleOverruleClose(){
+        this.setData({
+            overruleShow:false,
+            remark:''
+        })
+    },
+    handleOverruleSubmit(){
         let _this = this;
         wx.showModal({
             title: '温馨提示',
@@ -129,7 +142,8 @@ Page({
             success (res) {
                 if (res.confirm) {
                     API.reback({
-                        id:_this.data.fData.id
+                        id:_this.data.fData.id,
+                        remark:_this.data.remark
                     }).then(res => {
                         if(res.code === 0){
                             wx.showToast({
diff --git a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml
index feda129..0f018a8 100644
--- a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml
+++ b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml
@@ -69,7 +69,26 @@
         <view class="footer_wrap">审批人：{{fData.reviewer || '暂无'}}</view>
         <view class="submit_btn">
             <van-button type="info" custom-style="width:40%" bindtap="handleApproval">审批</van-button>
-            <van-button type="danger" custom-style="width:40%" bindtap="handleOverrule">驳回</van-button>
+            <van-button type="danger" custom-style="width:40%" bindtap="handleOverruleOpen">驳回</van-button>
         </view>
     </view>
 </view>
+
+<!--驳回意见-->
+<van-popup
+    show="{{ overruleShow }}"
+    position="bottom"
+    round
+    bind:close="handleOverruleClose"
+>
+    <view class="overrule_wrap">
+        <van-cell-group>
+            <van-field
+                    model:value="{{ remark }}"
+                    label="驳回意见"
+                    placeholder="请输入驳回意见"
+            />
+        </van-cell-group>
+        <van-button type="info" custom-style="width:100%;margin-top:2%" bindtap="handleOverruleSubmit">提交</van-button>
+    </view>
+</van-popup>
\ No newline at end of file
diff --git a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss
index 9872eaf..ae27f62 100644
--- a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss
+++ b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxss
@@ -52,4 +52,10 @@
     font-size: 30rpx;
     text-align: center;
     margin-top: 10px;
+}
+.overrule_wrap{
+    width: 96%;
+    margin: 0 auto;
+    box-sizing: border-box;
+    padding: 10px;
 }
\ No newline at end of file