From 48d72cabf10ba96660b270fb1688bb94edfb2a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 13 Jul 2022 00:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmProduct/XmProductForLinkComplex.vue     | 70 +++++++++----------
 .../xmProject/XmProjectForLinkComplex.vue     | 64 ++++++++---------
 src/views/xm/core/xmProject/XmProjectInfo.vue | 18 ++---
 3 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index 87a13cd2..f8bdab7c 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -171,41 +171,6 @@
               :sel-project="selProject"
             ></xm-product-overview>
           </el-tab-pane>
-          <el-tab-pane
-            label="执行统计"
-            name="productCalc"
-            v-if="xmProduct && xmProduct.id"
-          >
-            <div
-              v-if="showPanel == 'productCalc'"
-              class="padding-left padding-right"
-            >
-              <el-row>
-                <el-button
-                  type="primary"
-                  @click="loadTasksToXmProductState"
-                  v-loading="load.calcProduct"
-                  >计算产品汇总数据</el-button
-                >
-                <br />
-                <font color="blue" style="font-size: 10px"
-                  >将从项目任务及产品任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到产品统计表</font
-                >
-              </el-row>
-              <el-row>
-                <el-button
-                  type="primary"
-                  @click="loadTasksToXmMenuState"
-                  v-loading="load.calcMenu"
-                  >计算所有需求数据</el-button
-                >
-                <br />
-                <font color="blue" style="font-size: 10px"
-                  >将从项目任务汇总进度、预算工作量、实际工作量、预算金额、实际金额等数据到需求统计表</font
-                >
-              </el-row>
-            </div>
-          </el-tab-pane>
 
           <el-tab-pane
             label="产品详情"
@@ -280,6 +245,41 @@
               :sel-project="selProject"
             ></xm-question-mng>
           </el-tab-pane>
+          <el-tab-pane
+            label="执行统计"
+            name="productCalc"
+            v-if="xmProduct && xmProduct.id"
+          >
+            <div
+              v-if="showPanel == 'productCalc'"
+              class="padding-left padding-right"
+            >
+              <el-row>
+                <el-button
+                  type="primary"
+                  @click="loadTasksToXmProductState"
+                  v-loading="load.calcProduct"
+                  >计算产品汇总数据</el-button
+                >
+                <br />
+                <font color="blue" style="font-size: 10px"
+                  >将从项目任务及产品任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到产品统计表</font
+                >
+              </el-row>
+              <el-row>
+                <el-button
+                  type="primary"
+                  @click="loadTasksToXmMenuState"
+                  v-loading="load.calcMenu"
+                  >计算所有需求数据</el-button
+                >
+                <br />
+                <font color="blue" style="font-size: 10px"
+                  >将从项目任务汇总进度、预算工作量、实际工作量、预算金额、实际金额等数据到需求统计表</font
+                >
+              </el-row>
+            </div>
+          </el-tab-pane>
         </el-tabs>
         <el-row> </el-row>
       </el-col>
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index b1a2c0c1..36815f5b 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -134,38 +134,6 @@
               :sel-project="selProject"
             ></xm-project-overview>
           </el-tab-pane>
-          <el-tab-pane
-            label="执行统计"
-            name="projectCalc"
-            v-if="selProject && selProject.id"
-          >
-            <div v-if="showPanel == 'projectCalc'">
-              <el-row>
-                <el-button
-                  type="primary"
-                  @click="loadTasksToXmProjectState"
-                  v-loading="load.calcProject"
-                  >计算项目预算数据</el-button
-                >
-                <br />
-                <font color="blue" style="font-size: 10px"
-                  >将从项目任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到项目统计表</font
-                >
-              </el-row>
-              <el-row>
-                <el-button
-                  type="primary"
-                  @click="loadTasksSettleToXmProjectState"
-                  v-loading="load.calcSettle"
-                  >计算项目结算数据</el-button
-                >
-                <br />
-                <font color="blue" style="font-size: 10px"
-                  >将从项目任务汇总结算数据项目统计表</font
-                >
-              </el-row>
-            </div>
-          </el-tab-pane>
           <el-tab-pane
             label="项目详情"
             name="detail"
@@ -263,6 +231,38 @@
 			:sel-project="selProject"
 			></xm-group-mng>
           </el-tab-pane>
+          <el-tab-pane
+            label="执行统计"
+            name="projectCalc"
+            v-if="selProject && selProject.id"
+          >
+            <div v-if="showPanel == 'projectCalc'">
+              <el-row>
+                <el-button
+                  type="primary"
+                  @click="loadTasksToXmProjectState"
+                  v-loading="load.calcProject"
+                  >计算项目预算数据</el-button
+                >
+                <br />
+                <font color="blue" style="font-size: 10px"
+                  >将从项目任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到项目统计表</font
+                >
+              </el-row>
+              <el-row>
+                <el-button
+                  type="primary"
+                  @click="loadTasksSettleToXmProjectState"
+                  v-loading="load.calcSettle"
+                  >计算项目结算数据</el-button
+                >
+                <br />
+                <font color="blue" style="font-size: 10px"
+                  >将从项目任务汇总结算数据项目统计表</font
+                >
+              </el-row>
+            </div>
+          </el-tab-pane>
         </el-tabs> 
       </el-col>
     </el-row>
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 6fe4312e..aa825d4e 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -48,12 +48,12 @@
             >
           </span>
         </el-menu-item>
-        <el-menu-item index="迭代" class="hidden-sm-and-down">
-          <span slot="title"><i class="el-icon-document-copy"></i>迭代</span>
-        </el-menu-item>
-        <el-menu-item index="产品" class="hidden-sm-and-down">
+        <el-menu-item index="产品">
           <span slot="title"><i class="el-icon-s-flag"></i>产品</span>
         </el-menu-item> 
+        <el-menu-item index="迭代">
+          <span slot="title"><i class="el-icon-document-copy"></i>迭代</span>
+        </el-menu-item>
 				<el-menu-item label="需求" index="需求">
 					 <span slot="title"><i class="el-icon-document"></i>需求</span> 
 				</el-menu-item> 
@@ -265,16 +265,16 @@
           @edit-fields="onEditFields"
           ref="项目概览"
         ></xm-project-overview-complex>
-        <xm-iteration-for-link-complex
-          v-if="infotype == '迭代'"
-          ref="xmIterationMng"
-          :sel-project="selProject"
-        ></xm-iteration-for-link-complex>
         <xm-product-for-link-complex
           v-if="infotype == '产品'" class="padding"
           ref="xmProductComplex"
           :sel-project="selProject" 
         ></xm-product-for-link-complex>
+        <xm-iteration-for-link-complex
+          v-if="infotype == '迭代'"
+          ref="xmIterationMng"
+          :sel-project="selProject"
+        ></xm-iteration-for-link-complex>
         <xm-menu-mng
           v-if="infotype == '需求'"
           :sel-project="selProject"