From 8d5b6d258e2b1d069ce522a9e700302588973aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 5 Mar 2022 14:51:17 +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/XmProductMng.vue  | 20 ++++++++++++++----
 .../xm/core/xmProduct/XmProductSelect.vue     |  4 ++--
 .../xm/core/xmProduct/XmProductTplMng.vue     | 21 ++++++++++++++++---
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 61032bfe..926ee360 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -212,8 +212,11 @@
 						<el-form-item label="产品名称">
 							<el-input v-model="xmProductCopy.productName" placeholder="新的产品名称"></el-input> 
 						</el-form-item>
-						<el-form-item  label="产品编码(留空则后台自动生成)"> 
-							<el-input v-model="xmProductCopy.code"  placeholder="新的产品编码"></el-input>
+						<el-form-item  label="产品代号"> 
+							<el-input v-model="xmProductCopy.code"  placeholder="新的产品代号"> 
+							<template slot="append">
+								<el-button type="text" @click="createProductCode">自动生成</el-button>
+							</template></el-input>
 						</el-form-item>
 						<el-form-item  label="目标">
 							<el-radio v-model="xmProductCopy.isTpl" label="1">复制为新的模板</el-radio>
@@ -241,7 +244,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo } from '@/api/xm/core/xmProduct';
+	import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo,createProductCode } from '@/api/xm/core/xmProduct';
 	import { addXmIterationProductLink,delXmIterationProductLink } from '@/api/xm/core/xmIterationProductLink';
 	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
 	import  XmProductAdd from './XmProductAdd';//新增界面
@@ -628,7 +631,16 @@ import XmProductSelect from './XmProductSelect.vue';
 				}else{
 					return cellValue;
 				}
-			}
+			}, 
+			createProductCode(){
+				createProductCode({}).then(res=>{
+					var tips=res.data.tips;
+					if(tips.isOk){
+						this.xmProductCopy.code=res.data.data
+					}
+					this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
+				})
+			},
 			/**end 自定义函数请在上面加**/
 
 		},//end methods
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index b61b3cdb..785d5803 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -4,8 +4,8 @@
 			<!--列表 XmProduct 产品表-->
 			<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  v-if="isSelectProduct==true"  label="序号" type="index" width="70"  >  </el-table-column>
-				<el-table-column  v-if="isSelectProduct==true"  label="产品编码" prop="id" min-width="100"  >  </el-table-column>
+				<el-table-column label="" type="index" width="50"  >  </el-table-column>
+				<el-table-column  v-if="isSelectProduct==true"  label="产品代号" prop="code" min-width="100"  >  </el-table-column>
 				  <el-table-column prop="productName"  label="产品名称" min-width="150" > 
 					 <template slot="header" slot-scope="scope"> 
 						 产品名称 
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 2b3e041c..c535f7fc 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -89,8 +89,13 @@
 			<el-form-item label="产品名称">
 				<el-input v-model="xmProductCopy.productName" placeholder="新的产品名称"></el-input> 
 			</el-form-item>
-			<el-form-item  label="产品编码(留空则后台自动生成)"> 
-				<el-input v-model="xmProductCopy.code"  placeholder="新的产品编码"></el-input>
+			<el-form-item  label="产品代号"> 
+				<el-input v-model="xmProductCopy.code"  placeholder="新的产品代号">
+					
+							<template slot="append">
+								<el-button type="text" @click="createProductCode">自动生成</el-button>
+							</template>
+				</el-input>
 			</el-form-item>
 			<el-form-item  label="目标">
 				<el-radio v-model="xmProductCopy.isTpl" label="1">复制为新的模板</el-radio>
@@ -115,7 +120,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo } from '@/api/xm/core/xmProduct';
+	import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo,createProductCode } from '@/api/xm/core/xmProduct';
 	import { addXmIterationProductLink,delXmIterationProductLink } from '@/api/xm/core/xmIterationProductLink';
 	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
  	import  XmProductEdit from './XmProductEdit';//修改界面
@@ -447,6 +452,16 @@
 
 				})
 			},
+			
+			createProductCode(){
+				createProductCode({}).then(res=>{
+					var tips=res.data.tips;
+					if(tips.isOk){
+						this.xmProductCopy.code=res.data.data
+					}
+					this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
+				})
+			},
 			/**end 自定义函数请在上面加**/
 
 		},//end methods