From 93f7934791cbaa89cc526b57f7fefd063246b975 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, 15 Nov 2023 15:27:04 +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/components/XmIterationSelect.vue  | 160 ++++++++++--------
 .../xm/core/components/XmProjectSelect.vue    | 157 +++++++++--------
 2 files changed, 170 insertions(+), 147 deletions(-)

diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index 3dcd63e5..505f2dc4 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -1,80 +1,90 @@
 <template> 
-<span>
-   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" :placeholder="placeholder" :props="{id:'id',name:'iterationName'}" :load-fun="listXmIterationWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
-      <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建迭代</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多迭代</el-button></el-row>
-   </mdp-select-table> 
-   
-   <mdp-dialog ref="addDialog">
-    <template v-slot="visible,data,dialog">
-      <xm-iteration-add op-type="add"
-            :xm-product="productId?{ id: productId, name: '' }:null"
-			      :sel-project="linkProjectId?{id:linkProjectId,name:''}:null"
-            @cancel="dialog.close()"
-            @submit="afterAddSubmit"
-          >
-          </xm-iteration-add>
-    </template>
-  </mdp-dialog>
-</span>
-</template> 
-
-<script>  
-
- import { listXmIterationWithState } from "@/api/xm/core/xmIteration";
-import XmIterationAdd from "../xmIteration/XmIterationEdit.vue";
-export default {
-  components: { XmIterationAdd },
-  name: 'xm-iteration-select',
+  <span>
+     <mdp-select-table v-model="myVal" ref="selectTableRef" :init-name="initName" show-style="showStyle" :placeholder="placeholder" :props="{id:'id',name:'iterationName'}" :load-fun="listXmIterationWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick" :disabled="disabled">
+        <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建迭代</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多迭代</el-button></el-row>
+     </mdp-select-table> 
+     
+     <mdp-dialog ref="addDialog">
+      <template v-slot="visible,data,dialog">
+        <xm-iteration-add op-type="add"
+          :sel-project="{ id: linkProjectId, name: '' }"
+          @cancel="dialog.close()"
+          @submit="afterAddSubmit"
+        >
+        </xm-iteration-add>
+      </template>
+    </mdp-dialog>
+  </span>
+  </template> 
+  
+  <script>  
+  
+   import { listXmIterationWithState } from "@/api/xm/core/xmIteration";
+  import XmIterationAdd from "../xmIteration/XmIterationEdit.vue";
+  export default {
+    components: { XmIterationAdd },
+    name: 'xm-iteration-select',
     props:{ 
-    /**
-     * 项目编号
-     */
-      linkProjectId:{
-      type:String,
-      default:null,
-    }, 
-    productId:{
-      type:String,
-      default:null,
-    }, 
-    placeholder:{
-      type:String,
-      default:"选择产迭代"
-    }
-    
-  },
-  data(){
-    return { 
-      myVal:null,
-    }
-  },
-  methods:{
-    listXmIterationWithState, 
-    afterAddSubmit(row){  
-      this.$refs['selectTableRef'].onTableDataSelect(this.multiple?[row]:row)
+      /**
+       * 项目编号
+       */
+        linkProjectId:{
+        type:String,
+        default:null,
+      }, 
+      placeholder:{
+        type:String,
+        default:"选择/创建迭代"
+      },
+      value:{
+        type:String,
+        default:null,
+      },
+      initName:{
+        type:String,
+        default:null
+      },
+      disabled:{
+        type:Boolean,
+        default:false
+      },
+      showStyle:{
+        type:String,
+        default:'origin'
+      }
     },
-    onChange2(row){ 
-      debugger;
-      this.$emit("selected", row); 
-      this.$emit("change2", row);
+    data(){
+      return { 
+        myVal:null,
+      }
     },
-    onChange(val){ 
-      this.$emit("change", val);
-      this.$emit("input",val);
+    methods:{
+      listXmIterationWithState, 
+      afterAddSubmit(row){  
+        this.$refs['selectTableRef'].onTableDataSelect(this.multiple?[row]:row)
+      },
+      onChange2(row){ 
+        debugger;
+        this.$emit("selected", row); 
+        this.$emit("change2", row);
+      },
+      onChange(val){ 
+        this.$emit("change", val);
+        this.$emit("input",val);
+      },
+      onClear(){ 
+        this.$emit("clear");
+      },
+      onRowClick(row){
+        this.$emit('row-click',row)
+      }
     },
-    onClear(){ 
-      this.$emit("clear");
-    },
-    onRowClick(row){
-      this.$emit('row-click',row)
-    }
-  },
-  mounted(){
-       
-  }, 
-}
-</script>
-<style lang="scss" scoped>   
-
-</style> 
-  
\ No newline at end of file
+    mounted(){
+         this.myVal=this.value
+    }, 
+  }
+  </script>
+  <style lang="scss" scoped>   
+  
+  </style> 
+    
\ No newline at end of file
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 659171a6..8b852cb8 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -1,77 +1,90 @@
 <template> 
-<span>
-   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" :placeholder="placeholder" :props="{id:'id',name:'projectName'}" :load-fun="listXmProject" :params="{linkProductId:linkProductId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
-      <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建项目</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多项目</el-button></el-row>
-   </mdp-select-table> 
-   
-   <mdp-dialog ref="addDialog">
-    <template v-slot="visible,data,dialog">
-      <xm-project-add op-type="add"
-        :xm-project="{ id: linkProductId, name: '' }"
-        @cancel="dialog.close()"
-        @submit="afterAddSubmit"
-      >
-      </xm-project-add>
-    </template>
-  </mdp-dialog>
-</span>
-</template> 
-
-<script>  
-
-import { listXmProject } from "@/api/xm/core/xmProject";
-import { mapGetters } from "vuex"; 
-
-import XmProjectAdd from "../xmProject/XmProjectEdit.vue";
-
-export default {
-  components: { XmProjectAdd },
-  name: 'xm-project-select',
+  <span>
+     <mdp-select-table v-model="myVal" ref="selectTableRef" :init-name="initName" show-style="showStyle" :placeholder="placeholder" :props="{id:'id',name:'projectName'}" :load-fun="listXmProject" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick" :disabled="disabled">
+        <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建项目</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多项目</el-button></el-row>
+     </mdp-select-table> 
+     
+     <mdp-dialog ref="addDialog">
+      <template v-slot="visible,data,dialog">
+        <xm-project-add op-type="add"
+          :sel-project="{ id: linkProjectId, name: '' }"
+          @cancel="dialog.close()"
+          @submit="afterAddSubmit"
+        >
+        </xm-project-add>
+      </template>
+    </mdp-dialog>
+  </span>
+  </template> 
+  
+  <script>  
+  
+   import { listXmProject } from "@/api/xm/core/xmProject";
+  import XmProjectAdd from "../xmProject/XmProjectEdit.vue";
+  export default {
+    components: { XmProjectAdd },
+    name: 'xm-project-select',
     props:{ 
-    /**
-     * 项目编号
-     */
-      linkProductId:{
-      type:String,
-      default:null,
-    }, 
-    placeholder:{
-      type:String,
-      default:"选择项目"
-    }
-  },
-  data(){
-    return { 
-      myVal:null,
-    }
-  },
-  methods:{
-    listXmProject, 
-    afterAddSubmit(row){  
-      this.$refs['selectTableRef'].onTableDataSelect(this.multiple?[row]:row)
-    },
-    onChange2(row){ 
-      debugger;
-      this.$emit("selected", row); 
-      this.$emit("change2", row);
+      /**
+       * 项目编号
+       */
+        linkProjectId:{
+        type:String,
+        default:null,
+      }, 
+      placeholder:{
+        type:String,
+        default:"选择/创建项目"
+      },
+      value:{
+        type:String,
+        default:null,
+      },
+      initName:{
+        type:String,
+        default:null
+      },
+      disabled:{
+        type:Boolean,
+        default:false
+      },
+      showStyle:{
+        type:String,
+        default:'origin'
+      }
     },
-    onChange(val){ 
-      this.$emit("change", val);
-      this.$emit("input",val);
+    data(){
+      return { 
+        myVal:null,
+      }
     },
-    onClear(){ 
-      this.$emit("clear");
+    methods:{
+      listXmProject, 
+      afterAddSubmit(row){  
+        this.$refs['selectTableRef'].onTableDataSelect(this.multiple?[row]:row)
+      },
+      onChange2(row){ 
+        debugger;
+        this.$emit("selected", row); 
+        this.$emit("change2", row);
+      },
+      onChange(val){ 
+        this.$emit("change", val);
+        this.$emit("input",val);
+      },
+      onClear(){ 
+        this.$emit("clear");
+      },
+      onRowClick(row){
+        this.$emit('row-click',row)
+      }
     },
-    onRowClick(row){
-      this.$emit('row-click',row)
-    }
-  },
-  mounted(){
-       
-  }, 
-}
-</script>
-<style lang="scss" scoped>   
-
-</style> 
-  
\ No newline at end of file
+    mounted(){
+         this.myVal=this.value
+    }, 
+  }
+  </script>
+  <style lang="scss" scoped>   
+  
+  </style> 
+    
\ No newline at end of file