From f1d31c9120bbe6031208a8c4f85674e211fde02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 20 Mar 2022 18:02:09 +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

---
 src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue | 3 +++
 src/views/xm/core/xmMenu/XmMenuMng.vue                   | 5 ++++-
 src/views/xm/core/xmMenu/XmMenuSelect.vue                | 2 ++
 src/views/xm/core/xmProduct/XmProductAdd.vue             | 1 +
 src/views/xm/core/xmProduct/XmProductEdit.vue            | 3 ++-
 src/views/xm/core/xmProduct/XmProductMng.vue             | 2 +-
 src/views/xm/core/xmProject/XmProjectAdd.vue             | 2 +-
 src/views/xm/core/xmProject/XmProjectEdit.vue            | 6 ++++--
 8 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index ab545e4c..7bbcc83e 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -17,6 +17,9 @@
 					<!--列表 XmIterationMenu 迭代定义-->
 					<el-table ref="table" :height="maxTableHeight" :data="xmIterationMenusTreeData"  default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column  type="selection" width="45"></el-table-column> 
+						
+						<el-table-column prop="productId" label="产品" min-width="120" >  
+						</el-table-column> 
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
 								<el-link type="primary"  :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''">{{scope.row.seqNo}}</el-link> 
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 083fc85e..27eaa92b 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -135,11 +135,14 @@
 					<el-row class="padding-top">  
 						<el-table lazy :load="loadXmMenusLazy" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
+							
 							<el-table-column prop="menuName" label="需求名称" min-width="260" show-overflow-tooltip> 
 								<template slot-scope="scope"> 
 									<span class="vlink" @click="showEdit(scope.row)" :class="scope.row.ntype==='1'?'el-icon-folder-opened':''">{{scope.row.seqNo}} &nbsp; {{scope.row.menuName}} </span>
 								</template>
-							</el-table-column>  
+							</el-table-column>   
+							<el-table-column prop="productId" label="产品" width="100" show-overflow-tooltip>   
+							</el-table-column> 
 							<el-table-column prop="status" label="状态"  min-width="80" show-overflow-tooltip> 
 								<template slot-scope="scope"> 
 									{{dicts.menuStatus.some(i=>i.id==scope.row.status)?dicts.menuStatus.find(i=>scope.row.status==i.id).name:''}}
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index bc7b6902..7bf5cc96 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -111,12 +111,14 @@
 				<el-row style="padding-top:12px;">
 					<el-table ref="table" class="menu-table"  lazy :load="loadMenusLazy" :height="maxTableHeight" :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
+						
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
 								<span class="vlink" :class="scope.row.ntype==='1'?'el-icon-folder-opened':''"  @click="toMenu(scope.row)">{{scope.row.seqNo}}&nbsp;
 								{{scope.row.menuName}}</span> 
 							</template>
 						</el-table-column> 
+						<el-table-column prop="productId" label="产品" min-width="100" >   </el-table-column>
 						<el-table-column prop="iterationName" label="迭代" min-width="140" >   </el-table-column>
 						<el-table-column prop="mmUsername" label="责任人" width="140" > 
 							 
diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue
index 75eca47a..57caca73 100644
--- a/src/views/xm/core/xmProduct/XmProductAdd.vue
+++ b/src/views/xm/core/xmProduct/XmProductAdd.vue
@@ -11,6 +11,7 @@
 							</template>
 						</el-input>
 							
+						<font color="red" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享；产品内部编号为代号-四位随机码</font>
 				</el-form-item>  		   
 				<el-form-item label="产品名称" prop="productName">
 					<el-input v-model="addForm.productName" placeholder="产品名称" ></el-input>
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 66f0821e..0a1d0b6b 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -13,8 +13,9 @@
 		<el-row class="page-main">
 			<!--新增界面 XmProduct 产品表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="产品编码" prop="code">
+				<el-form-item label="产品代号" prop="code">
 					<el-input v-model="editForm.code" placeholder="产品编码" ></el-input>
+					<font color="red" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享;产品内部编号为代号-四位随机码</font>
 				</el-form-item> 
 				<el-form-item label="产品名称" prop="productName">
 					<el-input v-model="editForm.productName" placeholder="产品名称" ></el-input>
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 137daeae..6505037c 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -159,7 +159,7 @@
 						
 						<el-table-column type="index" width="60"> 
 						</el-table-column>
-						<el-table-column prop="code" label="产品代号" min-width="100" sortable > 
+						<el-table-column prop="id" label="产品编码" min-width="100" sortable > 
 						</el-table-column>
 						<el-table-column prop="productName" label="产品名称" min-width="200" sortable >
 							<template slot-scope="scope" >
diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue
index 9b2ee8ec..de2b079e 100644
--- a/src/views/xm/core/xmProject/XmProjectAdd.vue
+++ b/src/views/xm/core/xmProject/XmProjectAdd.vue
@@ -9,7 +9,7 @@
 									<el-button type="text" @click="createProjectCode">自动生成</el-button>
 								</template>
 							</el-input>
-							 
+							 <font color="red" style="font-size:10px;">项目代号为合同上的项目代号，甲乙方共享;项目内部编号为 &nbsp;代号-四位随机码</font>
 					</el-form-item>  					
 					<el-form-item label="名称" prop="name">  
 							<el-input  v-model="addForm.name" placeholder="项目名称" ></el-input> 
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 02d17c61..a8922004 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -14,8 +14,10 @@
 
 					<el-collapse value="1" accordion>
 						<el-collapse-item title="基本信息" name="1">
-							<el-form-item label="项目编号|名称" prop="name">
-								<el-input v-model="editForm.code" placeholder="项目编号，不可为空" style="width:20%;" ></el-input><el-input style="width:80%;" v-model="editForm.name" placeholder="项目名称" ></el-input>
+							<el-form-item label="项目代号|名称" prop="name">
+								<el-input v-model="editForm.code" placeholder="项目代号，不可为空" style="width:20%;" ></el-input><el-input style="width:80%;" v-model="editForm.name" placeholder="项目名称" ></el-input>
+							    <font color="red" style="font-size:10px;">项目代号为合同上的项目代号，甲乙方共享;项目内部编号为 &nbsp;代号-四位随机码</font>
+
 							</el-form-item>  
 							<el-form-item label="项目属性" prop="xmType"> 
 								<el-select v-model="editForm.xmType">