From b72889fa0eb143a94beb5bc110286fa459d4fbe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=98=8E=E6=98=9F?= <321212099@qq.com>
Date: Thu, 8 Aug 2024 11:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=8F=8A=E7=BC=96=E8=BE=91=E9=A1=B5=E9=99=84=E4=BB=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Order/Milepost.js       |  2 +-
 src/forge/Order/MilepostDetail.js | 24 +++++++++++++++++++++++-
 src/forge/Order/UpdateMilepost.js |  6 +++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index 0ececf94f..e2478307a 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -197,7 +197,7 @@ class Milepost extends Component {
           </div>
           <div className="target-detail-search" style={{marginBottom:20}}>
             <Search
-              placeholder="输入关键字搜索疑修"
+              placeholder="输入关键字搜索里程碑"
               enterButton
               onSearch={this.searchFunc}
               style={{ width: 300 }}
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index cfed74efc..e2de0e098 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -4,6 +4,8 @@ import { Dropdown, Menu, Icon, Pagination, Spin } from 'antd';
 import './order.css';
 import { FlexAJ } from '../Component/layout';
 import CheckProfile from '../Component/ProfileModal/Profile';
+import Attachments from "../Upload/attachment";
+import RenderHtml from "../../components/render-html";
 
 import NoneData from '../Nodata';
 import OrderItem from './OrderItem';
@@ -34,6 +36,7 @@ class MilepostDetail extends Component {
       author_id: undefined,
       status_id: undefined,
       assigned_to_id: undefined,
+      fileList: undefined,
       limit: 15,
       page: 1,
       search_count: undefined,
@@ -180,6 +183,9 @@ class MilepostDetail extends Component {
       this.getIssueList(1,id,e.key);
     }
   }
+  commentCtx = (v) => {
+    return <RenderHtml className="break_word_comments imageLayerParent" value={v} url={this.props.history.location} />;
+  };
 
   renderMenu = (array, name, id) => {
     return (
@@ -274,7 +280,23 @@ class MilepostDetail extends Component {
             </div>
           </FlexAJ>
         </div>
-        
+        <div className="pd20">
+          <div className="detail_p" style={{maxHeight:100,overflowY:'auto'}}>
+            {data && data.description && data.description.length > 0 ? (
+              this.commentCtx(data.description)
+            ) : (
+              <span className="color-grey-9 ml3 mr3">暂无描述</span>
+            )}
+          </div>
+          {data && data.attachments && data.attachments.length > 0 ? (
+            <Attachments
+              attachments={data.attachments}
+              showNotification={this.props.showNotification}
+            />
+          ) : (
+            ""
+          )}
+        </div>
         <Spin spinning={isSpin}>
           <div className="pl20 pr20">
             <div className="f-wrap-between pt15 pb15 bor-bottom-greyE">
diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js
index 2c4511b3a..2eaead659 100644
--- a/src/forge/Order/UpdateMilepost.js
+++ b/src/forge/Order/UpdateMilepost.js
@@ -19,6 +19,7 @@ class UpdateMilepost extends Component {
       selectedValue: moment('2020-2-12'),
       isSpin: false,
       get_attachments: undefined,
+      fileList: undefined,
     }
   }
 
@@ -59,11 +60,13 @@ class UpdateMilepost extends Component {
           data: result.data,
           selectedValue: result.data.effective_date && moment(result.data.effective_date),
           get_attachments: result.data.attachments,
+          fileList: undefined,
         })
         this.props.form.setFieldsValue({
           name: result.data.name,
           description: result.data.description,
           get_attachments: result.data.attachments,
+          fileList: undefined,
         });
 
       }
@@ -77,7 +80,7 @@ class UpdateMilepost extends Component {
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         const { projectsId , owner } = this.props.match.params;
-        const { meilid } = this.props.match.params;
+        const { meilid,fileList } = this.props.match.params;
         const url = `/${owner}/${projectsId}/milestones/${meilid}.json`;
 
         let time = this.state.selectedValue && this.state.selectedValue.format("YYYY-MM-DD");
@@ -87,6 +90,7 @@ class UpdateMilepost extends Component {
           project_id: projectsId,
           id: meilid,
           effective_date: time,
+          attachment_ids: fileList,
           status: 'open'
         }).then(result => {
           if (result) {