From fc568ca4230af39a194c729417aff95c93bea12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 2 Feb 2023 11:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmFunc/XmFuncSelect.vue | 13 ++++++++++--
 src/views/xm/core/xmMenu/XmMenuEdit.vue   | 26 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index 1c08204a..fbe41029 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -36,6 +36,13 @@
 									</div>
   								</template> 
 							</el-table-column> 
+                            <template v-if="showSelect">
+                                <el-table-column prop="name" label="操作" width="100" fixed="right"> 
+                                     <template slot-scope="scope"> 
+                                        <el-button  type="primary"  @click.stop="select(scope.row)">选择 </el-button>
+                                    </template> 
+                                </el-table-column> 
+                        </template>
 			</el-table>
 			<el-pagination  layout="total,prev,next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
 		</el-row>
@@ -67,7 +74,7 @@ export default {
     components: {
         XmFuncEdit,
     },
-    props:['visible','xmProduct'],
+    props:['visible','xmProduct','showSelect'],
     computed: {
         ...mapGetters(['userInfo']),
 
@@ -286,7 +293,9 @@ export default {
             this.$emit('row-click',null)
             this.$refs.xmFuncTable.setCurrentRow(); 
         },
-        
+        select(row){
+            this.$emit('select',row)
+        },
         loadDatasFirstCache(){
                 
                 if(!this.xmProduct || !this.xmProduct.id){
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 54f2e34a..6e7ee424 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -139,6 +139,14 @@
  
 						<el-row>
 							
+							<el-col :span="12"> 
+								<el-form-item  label="归属模块" prop="funcName" > 
+									{{ editForm.funcName }}
+										<el-button
+											@click="funcVisible=true"  
+											title="设置模块" > 设置</el-button>  
+								</el-form-item>
+							</el-col> 
 							<el-col :span="12">
 								<el-form-item label="排序序号" prop="seqNo" > 
 										<el-input style="max-width:90%;" v-model="editForm.seqNo" title="序号 如 1.1，1.2.3，1.3.2等" placeholder="如1.0 ， 1.1 ， 1.1.1等"  @change="editXmMenuSomeFields(editForm,'seqNo',$event)"></el-input>
@@ -281,6 +289,9 @@
 			:xm-product="{id:editForm.productId,productName:editForm.productName}"
 		></xm-epic-features-select>
 		</el-drawer>
+		<el-dialog append-to-body title="模块选择"  :visible.sync="funcVisible" size="40%" top="20px"  :close-on-click-modal="false">
+			<xm-func-select :show-select="true" class="padding-left padding-right" v-if="funcVisible"  @select="onFuncSelected" :xm-product="{id:editForm.productId,productName:editForm.productName}"></xm-func-select>
+		</el-dialog>
 	</section>
 </template>
 
@@ -299,6 +310,7 @@
 	import XmTestCaseMng from '@/views/xm/core/xmTestCase/XmTestCaseMng';
 	
 	import xmQuestionMng from "@/views/xm/core/xmQuestion/XmQuestionMng";
+	import XmFuncSelect from '../xmFunc/XmFuncSelect'
 
 	import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect";
 	import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm'
@@ -420,6 +432,7 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
 				activateTabPaneName:'4',
 				pmenuFormVisible:false,
 				parentMenuVisible:false,
+				funcVisible:false,
 
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 
@@ -540,6 +553,9 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
 				}else if(fieldName==='startTime'){
 					params.startTime=$event.startTime
 					params.endTime=$event.endTime
+				}else if(fieldName==='funcId'){
+					params.funcId=$event.id
+					params.funcName=$event.name
 				}else{
 					if(typeof $event ==='string'){
 						params[fieldName]=$event
@@ -632,6 +648,15 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
 					this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
 				})
 			},
+			
+			onFuncSelected(row){
+				this.editForm.funcId=row.id
+				this.editForm.funcName=row.name
+				this.funcVisible=false;
+				if(this.opType!=='add'){
+					this.editXmMenuSomeFields(this.editForm,'funcId',row)
+				}
+			},
 		},//end method
 		components: {
 			//在下面添加其它组件 'xm-menu-edit':XmMenuEdit
@@ -648,6 +673,7 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
 			XmEpicFeaturesSelect,
 			xmQuestionMng,
 			CommentArea,
+			XmFuncSelect,
 		},
 		mounted() {