From 29991bdf993502e9c4e13fe507d8818244e44279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B0=81=E7=BE=BD?= <2360164671@qq.com>
Date: Sun, 8 Jan 2023 20:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=89=93=E5=9B=9E?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=9A=84=E7=90=86=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Invoice/InvoiceDetailModal.tsx      | 21 +++++++++++++------
 src/pages/Invoice/InvoiceListView.tsx         |  4 +++-
 src/pages/MessageList.tsx                     |  3 ++-
 .../component/ReimbursementDetailFiles.tsx    |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/pages/Invoice/InvoiceDetailModal.tsx b/src/pages/Invoice/InvoiceDetailModal.tsx
index 3dac4c3..a6a119f 100644
--- a/src/pages/Invoice/InvoiceDetailModal.tsx
+++ b/src/pages/Invoice/InvoiceDetailModal.tsx
@@ -1,5 +1,5 @@
 import React, {useEffect, useState} from "react";
-import {Button, DatePicker, Form, Input, InputNumber, Modal, Select, Typography, Image} from "antd";
+import {Button, DatePicker, Form, Input, InputNumber, Modal, Select, Typography, Image, Popconfirm} from "antd";
 import {
     InvoiceDetail,
     InvoiceIdentifyResponse,
@@ -14,11 +14,12 @@ import qs from "qs";
 
 const {Text, Paragraph} = Typography;
 
-function InvoiceDetailModal(props: { invoiceDetail: any, open: boolean, onClose: () => void, needRefresh?: () => void, isBase64?:boolean }) {
+function InvoiceDetailModal(props: { invoiceDetail: any, open: boolean, onClose: () => void, needRefresh?: () => void, isBase64?:boolean,isOwner:boolean}) {
     //const [open, setOpen] = useState(false)
     const [loading, setLoading] = useState(false)
     const [invoice, setInvoice] = useState(null as any)
     const [formItems, setFormItems] = useState(undefined)
+    const [withdrawReason, setWithdrawReason] = useState("")
     //const [form] = Form.useForm();
     useEffect(() => {
 
@@ -79,11 +80,12 @@ function InvoiceDetailModal(props: { invoiceDetail: any, open: boolean, onClose:
         refreshFormItems(value)
     }
 
-    const withDraw = () => {
+    const withdraw = () => {
         setLoading(true)
         axiosInstance({
             url: 'common/invoice/' + props.invoiceDetail.invoiceId,
             method: 'delete',
+            data:{deleteOpinion:withdrawReason}
         }).then(response => {
             console.log(response.data)
             setLoading(false)
@@ -106,10 +108,17 @@ function InvoiceDetailModal(props: { invoiceDetail: any, open: boolean, onClose:
                 <div style={{width: '100%', display: "flex", flexDirection: "row", justifyContent: "space-between"}}>
                     <Text>{props.invoiceDetail?.modified ? '' : ''}</Text>
                     <div>
-                        {props.invoiceDetail?.invoiceState === 0 && <Button danger loading={loading} onClick={withDraw}
+                        {props.invoiceDetail?.invoiceState === 0 && <Popconfirm
+                            title={props.isOwner?"确定撤回吗？":"请填写撤回理由"}
+                            onConfirm={withdraw}
+                            okText="确定"
+                            //showCancel={false}
+                            cancelText="取消"
+                            onCancel={() => {setWithdrawReason("")}}
+                            description={props.isOwner?"":<TextArea rows={4} onChange={(e)=>{setWithdrawReason(e.target.value)}}/>}
                         >
-                            撤回
-                        </Button>}
+                            <Button danger  type="primary">撤回</Button>
+                        </Popconfirm>}
 
                         <Button type="primary" href={baseUrl + props.invoiceDetail?.invoiceFileUri} download
                         >
diff --git a/src/pages/Invoice/InvoiceListView.tsx b/src/pages/Invoice/InvoiceListView.tsx
index 57bd770..2833ccd 100644
--- a/src/pages/Invoice/InvoiceListView.tsx
+++ b/src/pages/Invoice/InvoiceListView.tsx
@@ -416,7 +416,9 @@ function InvoiceListView(props: { isManagement: boolean }) {
                             pageSize={Number(search.get('pageSize') ? search.get('pageSize') : 10)}
                             total={totalNum} onChange={onChange}/>
             </div>
-            <InvoiceDetailModal needRefresh={() => {
+            <InvoiceDetailModal
+                isOwner={!props.isManagement}
+                needRefresh={() => {
                 searchInvoiceContent(invoiceSearchOption)
             }} invoiceDetail={invoiceDetail} open={detailModalOpen} onClose={() => {
                 setDetailModalOpen(false)
diff --git a/src/pages/MessageList.tsx b/src/pages/MessageList.tsx
index 66c6bdd..33f8bc6 100644
--- a/src/pages/MessageList.tsx
+++ b/src/pages/MessageList.tsx
@@ -284,7 +284,8 @@ function MessageList(props: { count: number, onCountChange: (count: number) => v
                 </Badge>
             </Popover>
             <InvoiceDetailModal open={invoiceModalOpen} invoiceDetail={invoiceDetail}
-                                onClose={() => setInvoiceModalOpen(false)} isBase64={true}/>
+                                onClose={() => setInvoiceModalOpen(false)} isBase64={true}
+                                isOwner={true}/>
             <ReimbursementDetail closeDetail={()=>{setReimbursementDetail(undefined)}}
             accessLevel={-1} reimbursement={reimbursementDetail}/>
         </>
diff --git a/src/pages/reimbursement/mine/component/ReimbursementDetailFiles.tsx b/src/pages/reimbursement/mine/component/ReimbursementDetailFiles.tsx
index c1ec619..7d9df6a 100644
--- a/src/pages/reimbursement/mine/component/ReimbursementDetailFiles.tsx
+++ b/src/pages/reimbursement/mine/component/ReimbursementDetailFiles.tsx
@@ -113,7 +113,7 @@ function DisplayInvoicesList(props:{departureInvoice: Invoice, destinationInvoic
             onSelect={onSelect}
             treeData={getTreeData()}
         />
-        <InvoiceDetailModal invoiceDetail={invoiceDetail} open={detailModalOpen} onClose={() => {
+        <InvoiceDetailModal isOwner={true} invoiceDetail={invoiceDetail} open={detailModalOpen} onClose={() => {
             setDetailModalOpen(false)
         }}/>
     </>)