From ec5e5cb6ca37903838e3e6c791757fab0463eb1e 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, 23 Jul 2022 13:01: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/xmProduct/XmProductEdit.vue | 23 +++++++++++++++----
 src/views/xm/core/xmProject/XmProjectEdit.vue |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index aff42d50..078f5805 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -5,8 +5,8 @@
       <el-form
         :model="editForm"
         label-width="120px"
-        :rules="editFormRules"
-		label-position="top"
+        :rules="editFormRules" 
+		label-position="left"
         ref="editForm"
       >
         <el-row  v-if="opType !== 'add'" class="padding-top label-font-color">
@@ -99,6 +99,9 @@
       </el-form>
  
     </el-row>
+	<el-row v-if="opType==='add'">
+		<el-button type="primary" @click="editSubmit">保存</el-button>
+	</el-row> 
   </section>
 </template>
 
@@ -106,8 +109,9 @@
 import util from "@/common/js/util"; //全局公共库
 import {
   initDicts,
-  editXmProduct,
+  addXmProduct,
   editSomeFields,
+  createProductCode
 } from "@/api/xm/core/xmProduct";
 import { mapGetters } from "vuex"; 
 
@@ -273,7 +277,7 @@ export default {
             this.load.edit = true;
             let params = Object.assign({}, this.editForm);
             params.branchId = this.userInfo.branchId;
-            editXmProduct(params)
+            addXmProduct(params)
               .then((res) => {
                 this.load.edit = false;
                 var tips = res.data.tips;
@@ -343,6 +347,17 @@ export default {
         })
         .catch((e) => Object.assign(this.editForm, this.editFormBak));
     },
+	
+			
+	createProductCode(){ 
+		createProductCode({}).then(res=>{
+			var tips=res.data.tips;
+			if(tips.isOk){  
+				this.$set(this.editForm,'code',res.data.data)
+			}
+			this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
+		})
+	},
     /**end 在上面加自定义方法**/
   }, //end method
   components: { 
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index cc329b49..874e925c 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -3,8 +3,8 @@
 		<el-row>  
 				<el-form :model="editForm"  label-width="120px" label-position="left" :rules="editFormRules" ref="editForm" class="editForm"> 
 						 			
-							 <el-row v-if="opType!=='add'" class="padding-top">
-								<span class="label-font-color">项目代号:</span>  {{editForm.code}} &nbsp;&nbsp;<span class="label-font-color">项目编号:</span>  {{editForm.id}} <el-tooltip content="项目代号用于签订合同等甲乙方共享的场景;项目编号为内部编号，用于内部流转,编号生成规则:项目代号+四位随机码 "><i class="el-icon-question"></i></el-tooltip>
+							 <el-row v-if="opType!=='add'" class="padding-top label-font-color">
+								 项目代号:   {{editForm.code}} &nbsp;&nbsp; 项目编号:   {{editForm.id}} <el-tooltip content="项目代号用于签订合同等甲乙方共享的场景;项目编号为内部编号，用于内部流转,编号生成规则:项目代号+四位随机码 "><i class="el-icon-question"></i></el-tooltip>
 							</el-row>
 							<el-form-item  prop="name"  label-width="0px">  
 									<my-input  v-model="editForm.name" placeholder="项目名称" @change="editXmProjectSomeFields(editForm,'name',$event)"></my-input>