From 5bc172a492ed7da30d3dc68aacdd1e9ad70ff67e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 29 Oct 2020 15:40:30 +0800
Subject: [PATCH] update

---
 src/forge/Branch/branch.css   |  2 +-
 src/forge/DevOps/About.jsx    |  2 +-
 src/forge/Order/Detail.js     | 16 ++++++-------
 src/forge/Order/order_form.js | 44 +++++++++++++++++------------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css
index b6dbd124..ff65db54 100644
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@@ -51,7 +51,7 @@
   display: flex;
   align-items: center;
   cursor: pointer;
-  width: 240px;
+  min-width: 240px;
 }
 .branch-tagBox-list .ant-popover-arrow{
   display: none;
diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index b25ac0d2..107b351f 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -127,7 +127,7 @@ function About(props, ref) {
       <div className="activatePanel">
         <img src={activate} alt="" width="250px" />
         <P>定义DevOps工作流，帮助您检测bug、发布代码…</P>
-        <a href={"https://www.trustie.net/forums/82/memos/3080"} target="_blank" style={{ color: "#5091FF"}}>
+        <a href={"https://forum.trustie.net/forums/3080/detail"} target="_blank" style={{ color: "#5091FF"}}>
           了解什么是DevOps？
         </a>
         {
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index c22013a3..87d774a5 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -309,8 +309,10 @@ class Detail extends Component {
           <div className="list-left list-left-padding">
             <div className="list-right-item-padding background-f boder-4">
               <p className="grid-item-left pb15">
-                <span className="issue_detail_info">分支:</span>
-                <span>{data && data.branch_name ? data.branch_name : "--"}</span>
+                <span className="issue_detail_info">负责人:</span>
+                <span>
+                  {data && data.assign_user_name ? data.assign_user_name : "--"}
+                </span>
               </p>
               <p className="grid-item-left pb15">
                 <span className="issue_detail_info">标签:</span>
@@ -344,12 +346,6 @@ class Detail extends Component {
                 <span className="issue_detail_info">分类:</span>
                 <span>{data && data.tracker ? data.tracker : "--"}</span>
               </p>
-              <p className="grid-item-left pb15">
-                <span className="issue_detail_info">负责人:</span>
-                <span>
-                  {data && data.assign_user_name ? data.assign_user_name : "--"}
-                </span>
-              </p>
               <p className="grid-item-left pb15">
                 <span className="issue_detail_info">开始日期:</span>
                 <span>{data && data.start_date ? data.start_date : "--"}</span>
@@ -363,6 +359,10 @@ class Detail extends Component {
                 <span className="issue_detail_info">完成度:</span>
                 <span>{data && data.done_ratio ? data.done_ratio : "--"}</span>
               </p>
+              <p className="grid-item-left pb15">
+                <span className="issue_detail_info">分支:</span>
+                <span>{data && data.branch_name ? data.branch_name : "--"}</span>
+              </p>
             </div>
           </div>
         </div>
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 339a8c3c..66f5803a 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -379,19 +379,13 @@ class order_form extends Component {
             </div>
             <div className="list-left list-left-padding issue-edit-form-right">
               <div className="pd20 background-f issue-form-right">
-                <Form.Item>
-                  {getFieldDecorator("branch_name", {
-                    rules: []
-                  })(
+                <Form.Item label="指派成员">
+                  {getFieldDecorator("assigned_to_id", {rules: []})(
                     <Select>
-                      <Option value={""}>分支未指定</Option>
-                      {branches && branches.length > 0 && branches.map((item, key) => {
-                        return (
-                          <Option value={item} key={key}>
-                            {item}
-                          </Option>
-                        );
-                      })}
+                      <Option value={""}>未指派成员</Option>
+                      {this.renderSelect(
+                        issue_chosen && issue_chosen.assign_user
+                      )}
                     </Select>
                   )}
                 </Form.Item>
@@ -460,16 +454,6 @@ class order_form extends Component {
                   )}
                 </Form.Item>
 
-                <Form.Item label="指派成员">
-                  {getFieldDecorator("assigned_to_id", {rules: []})(
-                    <Select>
-                      <Option value={""}>未指派成员</Option>
-                      {this.renderSelect(
-                        issue_chosen && issue_chosen.assign_user
-                      )}
-                    </Select>
-                  )}
-                </Form.Item>
                 <Form.Item label="开始日期">
                   <DatePicker
                     value={start_date ? moment(start_date, "YYYY-MM-DD") : null}
@@ -493,6 +477,22 @@ class order_form extends Component {
                     </Select>
                   )}
                 </Form.Item>
+                <Form.Item label="指定分支">
+                  {getFieldDecorator("branch_name", {
+                    rules: []
+                  })(
+                    <Select>
+                      <Option value={""}>分支未指定</Option>
+                      {branches && branches.length > 0 && branches.map((item, key) => {
+                        return (
+                          <Option value={item} key={key}>
+                            {item}
+                          </Option>
+                        );
+                      })}
+                    </Select>
+                  )}
+                </Form.Item>
               </div>
             </div>
           </Form>