From 81c47e5668399f06d3ce9f42b03f6dcd19db3afb 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:11:51 +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/xmProduct/XmProductAdd.vue     | 2 +-
 src/views/xm/core/xmProduct/XmProductMng.vue     | 3 ++-
 src/views/xm/core/xmProduct/XmProductSelect.vue  | 2 +-
 src/views/xm/core/xmProduct/XmProductTplMng.vue  | 2 ++
 src/views/xm/core/xmProject/XmProjectForLink.vue | 2 +-
 src/views/xm/core/xmProject/XmProjectList.vue    | 2 +-
 src/views/xm/core/xmProject/XmProjectMng.vue     | 4 +++-
 src/views/xm/core/xmProject/XmProjectRecycle.vue | 2 +-
 src/views/xm/core/xmProject/XmProjectTplMng.vue  | 1 +
 9 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue
index 57caca73..ed30d684 100644
--- a/src/views/xm/core/xmProduct/XmProductAdd.vue
+++ b/src/views/xm/core/xmProduct/XmProductAdd.vue
@@ -11,7 +11,7 @@
 							</template>
 						</el-input>
 							
-						<font color="red" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享；产品内部编号为代号-四位随机码</font>
+						<font color="red" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享；产品内部编号为&nbsp;代号-四位随机码</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/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 6505037c..321c9220 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -271,7 +271,8 @@
 							<el-input v-model="xmProductCopy.code"  placeholder="新的产品代号"> 
 							<template slot="append">
 								<el-button type="text" @click="createProductCode">自动生成</el-button>
-							</template></el-input>
+							</template></el-input> 
+							<font color="red" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享；产品内部编号为&nbsp;代号-四位随机码</font>
 						</el-form-item>
 						<el-form-item  label="目标">
 							<el-radio v-model="xmProductCopy.isTpl" label="1">复制为新的模板</el-radio>
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index a8b06604..35a58f60 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -5,7 +5,7 @@
 			<el-table  ref="table" :height="maxTableHeight" :data="xmProducts" :row-class-name="tableRowClassName" @sort-change="sortChange" :highlight-current-row="true" current-row-key="id" v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  				 
 				<el-table-column label="序号" type="index" width="50"  >  </el-table-column>
-				<el-table-column  v-if="isSelectProduct==true"  label="产品代号" prop="code" min-width="100" show-overflow-tooltip >  </el-table-column>
+				<el-table-column  v-if="isSelectProduct==true"  label="产品编码" prop="id" min-width="100" show-overflow-tooltip >  </el-table-column>
 				  <el-table-column prop="productName"  label="产品名称"    show-overflow-tooltip> 
 					 <template slot="header" slot-scope="scope"> 
 						 产品名称 <el-button type="text" @click="clearSelect">清空所选</el-button>&nbsp;<el-button type="text" @click="close">关闭</el-button>
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 2a44fa23..9ac7ad05 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -98,6 +98,8 @@
 								<el-button type="text" @click="createProductCode">自动生成</el-button>
 							</template>
 				</el-input>
+				
+						<font color="red" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享；产品内部编号为&nbsp;代号-四位随机码</font>
 			</el-form-item>
 			<el-form-item  label="目标">
 				<el-radio v-model="xmProductCopy.isTpl" label="1">复制为新的模板</el-radio>
diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue
index da814bbd..2e9c1fc0 100644
--- a/src/views/xm/core/xmProject/XmProjectForLink.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLink.vue
@@ -12,7 +12,7 @@
 		<el-row class="page-main ">   
 			<el-table ref="table" :height="tableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"   style="width: 100%;">
 				<el-table-column  type="index" label="序号" width="55" ></el-table-column>
-				<el-table-column prop="code" label="项目编号" min-width="80" ></el-table-column>
+				<el-table-column prop="id" label="项目编码" min-width="80" ></el-table-column>
 				<el-table-column prop="name" label="标题名称" min-width="80" ></el-table-column> 
 				<el-table-column label="操作" width="245" fixed="right">
 					<template slot-scope="scope">  
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index 5d495450..9269d787 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -8,7 +8,7 @@
 		<el-row class="page-main ">   
 			<el-table ref="table" :height="tableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"   style="width: 100%;">
 				<el-table-column  type="index" label="序号" width="55" ></el-table-column>
-				<el-table-column prop="code" label="项目编号" min-width="80" ></el-table-column>
+				<el-table-column prop="id" label="项目编码" min-width="80" ></el-table-column>
 				<el-table-column prop="name" label="项目名称" min-width="120" ></el-table-column> 
 				<el-table-column label="操作" width="100" fixed="right">
 					<template slot-scope="scope">  
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 299aef24..14410632 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -156,7 +156,7 @@
 
 					<el-table  ref="table" :height="maxTableHeight" v-cloak v-show="!showType" fit stripe :data="ScreenData" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column  type="index" label="序号" width="60" ></el-table-column>
-						<el-table-column prop="code" label="项目代号" width="120" sortable show-overflow-tooltip></el-table-column>
+						<el-table-column prop="id" label="项目编码" width="120" sortable show-overflow-tooltip></el-table-column>
 						<el-table-column prop="name" label="标题" sortable min-width="200" >
 							<template slot-scope="scope">
 								<el-link type="primary" @click.stop="intoInfo(scope.row)">{{scope.row.name}}</el-link>
@@ -282,6 +282,8 @@
 						<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="目标">
 				<el-radio v-model="xmProjectCopy.isTpl" label="1">复制为新的模板</el-radio>
diff --git a/src/views/xm/core/xmProject/XmProjectRecycle.vue b/src/views/xm/core/xmProject/XmProjectRecycle.vue
index 51903039..e15723d2 100644
--- a/src/views/xm/core/xmProject/XmProjectRecycle.vue
+++ b/src/views/xm/core/xmProject/XmProjectRecycle.vue
@@ -8,7 +8,7 @@
 		<el-row class="page-main ">  
 			 <el-table  ref="table" :height="maxTableHeight" v-cloak stripe :data="xmProjects" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column  type="index" label="序号" width="80" ></el-table-column>
-						<el-table-column prop="code" label="项目编号" min-width="120" ></el-table-column>
+						<el-table-column prop="id" label="项目编码" min-width="120" ></el-table-column>
 						<el-table-column prop="name" label="标题" min-width="200" >
 							<template slot-scope="scope">
 								<el-link @click.stop="intoInfo(scope.row)">{{scope.row.name}}</el-link>
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index b11b6eb6..924e0b70 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -57,6 +57,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="目标">
 				<el-radio v-model="xmProjectCopy.isTpl" label="1">复制为新的模板</el-radio>