From e3313f1db0e285c6ab5cb8ad918b642d5d4961f5 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 16:10:14 +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

---
 .../xm/core/xmIteration/XmIterationAdd.vue    | 14 +--
 .../xm/core/xmIteration/XmIterationMng.vue    | 93 ++++---------------
 2 files changed, 24 insertions(+), 83 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index 3c8f7c74..28c241d1 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -7,17 +7,17 @@
 						<xm-product-select v-if="!xmProduct||!xmProduct.id" ref="xmProductSelect" :auto-select="true" :link-project-id="selProject?selProject.id:null"   @row-click="onProductRowClick" @clear="onProductClearSelect" @close="productSelectVisible=false"></xm-product-select>
  
 					<span v-else>{{addForm.productName}}</span>
-				</el-form-item>
+				</el-form-item> 
+				<el-form-item label="上线时间" prop="onlineTime">
+					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'onlineTime',$event)"></el-date-picker>
+				</el-form-item>   
+				<el-form-item label="起止时间" prop="startTime">
+					<date-range :auto-default="true" start-key="startTime" end-key="endTime" v-model="addForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></date-range>
+				</el-form-item>   
 				<el-form-item label="迭代名称" prop="iterationName">
 					<el-input v-model="addForm.iterationName" placeholder="迭代名称" minlength="10"></el-input>
 					<font color="blue">格式如下： 上线日期+主题+V版本号 例如： 2021.6.15购书商城V1.0.9 &nbsp;&nbsp;留空，选日期后自动填写迭代名称</font>
 				</el-form-item>  
-				<el-form-item label="起止时间" prop="startTime">
-					<date-range :auto-default="true" start-key="startTime" end-key="endTime" v-model="addForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></date-range>
-				</el-form-item>   
-				<el-form-item label="上线时间" prop="onlineTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'onlineTime',$event)"></el-date-picker>
-				</el-form-item>   
 				<el-form-item label="负责人姓名" prop="adminUsername">
 					{{addForm.adminUsername}} <el-button @click="userSelectVisible=true">选择负责人</el-button>
 				</el-form-item>     
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 086b425a..be2c2b18 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -5,7 +5,7 @@
         v-if="!xmProduct || !xmProduct.id"
         ref="xmProductSelect1"
         style="display: inline"
-        :auto-select="true"
+        :auto-select="false"
         :link-project-id="selProject ? selProject.id : null"
         @row-click="onProductSelected"
         @clear="onProductClearSelect"
@@ -124,14 +124,14 @@
           aria-disabled
           width="55"
         ></el-table-column>
-        <el-table-column prop="iterationName" label="迭代名称" min-width="260">
+        <el-table-column prop="iterationName" label="迭代名称" min-width="260"  sortable>
           <template slot-scope="scope">
             <el-link type="primary" @click="intoInfo(scope.row, scope.$index)">
-              {{ scope.row.seqNo }} &nbsp;&nbsp;{{ scope.row.iterationName }}
+              {{ scope.row.iterationName }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="finishRate" label="总进度" min-width="80">
+        <el-table-column prop="finishRate" label="总进度" min-width="80" sortable>
           <template slot-scope="scope">
             <font
               ><el-tag
@@ -149,14 +149,14 @@
             </font>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column  sortable
           prop="startTime"
           label="开始时间"
           min-width="80"
           :formatter="formatterDate"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column
+        <el-table-column sortable
           prop="endTime"
           label="结束时间"
           min-width="80"
@@ -164,26 +164,26 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          prop="onlineTime"
+          prop="onlineTime"  sortable
           label="上线时间"
           min-width="80"
           :formatter="formatterDate"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column
+        <el-table-column  sortable
           prop="adminUsername"
           label="负责人姓名"
           min-width="80"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column
-          prop="distBudgetWorkload"
+        <el-table-column  sortable
+          prop="budgetWorkload"
           label="已分配工作量"
           min-width="80"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          prop="actWorkload"
+          prop="actWorkload"  sortable
           label="实际工作量"
           min-width="80"
           show-overflow-tooltip
@@ -302,9 +302,11 @@ import {
   listXmIteration,
   listXmIterationWithState,
   delXmIteration,
-  batchDelXmIteration,
-  loadTasksToXmIterationState,
+  batchDelXmIteration, 
 } from "@/api/xm/core/xmIteration";
+import { 
+  loadTasksToXmIterationState,
+} from "@/api/xm/core/xmIterationState";
 import {
   addXmIterationLink,
   delXmIterationLink,
@@ -353,6 +355,7 @@ export default {
         key: "",
         queryScope: "", //迭代查询范围 iterationId\branchId\compete\''
         id: "", //迭代编号
+		xmProduct:null,
       },
       pickerOptions: util.getPickerOptions("datarange"),
       dateRanger: [], //创建时间选择范围
@@ -729,69 +732,7 @@ export default {
       } else {
         return cellValue;
       }
-    },
-    onXmIterationSelect: function (row) {
-      var xmIteration = row;
-      var xmProduct = this.xmProduct;
-      this.$confirm(
-        "确认将产品【" +
-          xmProduct.productName +
-          "】加入迭代计划【" +
-          xmIteration.iterationName +
-          "】吗？",
-        "提示",
-        {
-          type: "warning",
-        }
-      ).then(() => {
-        addXmIterationLink({
-          iterationId: xmIteration.id,
-          productId: xmProduct.id,
-        }).then((res) => {
-          var tips = res.data.tips;
-          if (tips.isOk) {
-            this.getXmIterations();
-          }
-          this.$notify({
-            position: "bottom-left",
-            showClose: true,
-            message: tips.msg,
-            type: tips.isOk ? "success" : "error",
-          });
-        });
-      });
-    },
-    doDelXmIterationLink(row) {
-      var xmIteration = row;
-      var xmProduct = this.xmProduct;
-      this.$confirm(
-        "确认将产品【" +
-          xmProduct.productName +
-          "】与迭代【" +
-          xmIteration.iterationName +
-          "】进行脱钩吗？脱钩后，产品与迭代互相查看不到对方信息。",
-        "提示",
-        {
-          type: "warning",
-        }
-      ).then(() => {
-        delXmIterationLink({
-          iterationId: xmIteration.id,
-          productId: xmProduct.id,
-        }).then((res) => {
-          var tips = res.data.tips;
-          if (tips.isOk) {
-            this.getXmIterations();
-          }
-          this.$notify({
-            position: "bottom-left",
-            showClose: true,
-            message: tips.msg,
-            type: tips.isOk ? "success" : "error",
-          });
-        });
-      });
-    },
+    },  
     focusOrUnfocus: function (row) {
       if (this.menukey == "myFocus") {
         delUserFocus({