From 90a1e7ab00d7060e049434652fb213015e7785bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 13 Jul 2022 11:04:27 +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

---
 .../xm/core/components/XmProductSelect.vue    | 68 +++++++++++++++----
 src/views/xm/core/xmProduct/XmProductAdd.vue  | 11 +--
 .../xmProduct/XmProductForLinkComplex.vue     | 14 +---
 3 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 0cd1910e..9036742f 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -4,17 +4,10 @@
 							placement="bottom"
 							width="400"
 							trigger="manual"
-							v-model="productVisible">
-
-								<el-row >
-									<!--列表 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 prop="productName"  label="产品名称">
-											<template slot="header" slot-scope="scope">
-												产品名称
-												<span style="float:right;">
-												<el-button type="text" @click="clearSelect">清空</el-button>&nbsp;&nbsp;
-												<el-button type="text" @click="close">关闭</el-button>&nbsp;&nbsp;
+							v-model="productVisible">  
+								<el-row>
+									 <el-button type="text" icon="el-icon-refresh" @click="refreshSelect" title="重新从后台刷新数据回来">刷新</el-button>&nbsp;&nbsp;
+												<el-button v-if="editForm && editForm.id" type="text" icon="el-icon-circle-close" @click="clearSelect" title="清空当前选中的产品">清除选中</el-button>&nbsp;&nbsp;
 												<el-popover
 													placement="top-start"
 													title=""
@@ -63,9 +56,33 @@
 															<el-button type="text"  @click="moreVisible=false" >关闭</el-button><el-button type="primary"  @click="searchXmProducts" >查询</el-button>
 														</el-col>
 													</el-row>
-													<el-button type="text" slot="reference" @click="moreVisible=!moreVisible" style="float:right;">更多条件</el-button>
+													<el-button type="text" slot="reference" @click="moreVisible=!moreVisible">更多条件</el-button> 
 												</el-popover>
-												</span>
+												<el-button style="float:right;" type="text" @click="close" icon="el-icon-close" title="关闭当前窗口">关闭</el-button>  
+								</el-row>
+								<el-row v-if="load.list==false && (!xmProducts ||xmProducts.length==0)">
+									<el-row v-if="linkProjectId">
+										<el-row>没有查到与项目【{{linkProjectId}}】关联的产品,您可以尝试&nbsp;&nbsp;												
+										<el-button type="text" icon="el-icon-refresh" @click="refreshSelect" title="重新从后台刷新数据回来">刷新</el-button>&nbsp;&nbsp;
+										重新从后台加载，或者<el-button @click="addProductVisible=true" icon="el-icon-plus" type="text">创建产品</el-button> ，并自动关联项目【{{linkProjectId}}】，或者到【项目->关联产品->加入更多产品到项目】手动关联一个已存在的产品。
+										</el-row>
+ 									</el-row>
+									<el-row v-else>
+										<el-row>没有查到相关产品,您可以尝试&nbsp;&nbsp;												
+										<el-button type="text" icon="el-icon-refresh" @click="refreshSelect" title="重新从后台刷新数据回来">刷新</el-button>&nbsp;&nbsp;
+										重新从后台加载，或者<el-button @click="addProductVisible=true" icon="el-icon-plus" type="text">创建产品</el-button>
+										</el-row>
+									</el-row>
+									<el-dialog append-to-body :visible.sync="addProductVisible" width="70%">
+										<xm-product-add :sel-project="{id:linkProjectId,name:''}" @cancel="addProductVisible=false" @submit="afterAddSubmit"> </xm-product-add>
+									</el-dialog>
+								</el-row>
+								<el-row>
+									<!--列表 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 prop="productName"  label="产品名称">
+											<template slot="header" slot-scope="scope">
+												产品名称 
 											</template>
 											<template slot-scope="scope">
 												<font>{{scope.row.productName}}</font>
@@ -74,7 +91,7 @@
 									</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>
-								<slot name="reference"><el-link title="产品，点击选择、清除选择" @click="referenceClick" type="warning" slot="reference"   icon="el-icon-search"><font style="font-size:14px;"><slot name="title">{{editForm && editForm.id?editForm.productName:'选择产品'}}</slot></font></el-link> </slot>
+								<slot name="reference"><el-link title="产品，点击选择、清除选择" @click="referenceClick" type="warning" slot="reference" v-loading="load.list"  icon="el-icon-search"><font style="font-size:14px;"><slot name="title">{{editForm && editForm.id?editForm.productName:'选择产品'}}</slot></font></el-link> </slot>
 						</el-popover>
 	</section>
 </template>
@@ -86,6 +103,7 @@
 	import { listXmProductWithState } from '@/api/xm/core/xmProduct';
 	import { mapGetters } from 'vuex'
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+	import XmProductAdd from '../xmProduct/XmProductAdd.vue';
 	const map=new Map();
 
 	export default {
@@ -144,6 +162,7 @@
 				productVisible:false,
 				moreVisible:false,
 				hadInit:false,
+				addProductVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 
 				/**end 自定义属性请在上面加 请加备注**/
@@ -223,6 +242,8 @@
 							var row=this.xmProducts[0];
 							this.$refs.table.setCurrentRow(row);
 							this.rowClick(row);
+						}else{
+							this.editForm=null
 						}
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -285,6 +306,10 @@
 				this.productVisible=false;
 				this.moreVisible=false;
 			},
+			refreshSelect(){  
+				this.searchXmProducts(); 
+				this.moreVisible=false;
+			},
 			close(){
 				this.productVisible=false;
 				this.moreVisible=false;
@@ -341,9 +366,24 @@
 					}
 				})
 			},
+			afterAddSubmit(row){ 
+				this.xmProducts.push(row)
+				if(this.iterationId){
+					map.set(this.iterationId,this.xmProducts)
+				}else if(this.linkProjectId){
+					map.set(this.linkProjectId,this.xmProducts)
+				}
+				if(this.autoSelect!==false&&this.xmProducts.length>0 && this.productVisible==false){
+					var row=this.xmProducts[0];
+					this.$refs.table.setCurrentRow(row);
+					this.rowClick(row);
+				}
+				this.addProductVisible=false;
+			}
 		},//end methods
 		components: {
 			UsersSelect,
+			XmProductAdd,
 		    //在下面添加其它组件
 		},
 		mounted() {
diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue
index 8ea785d3..e0b2ceef 100644
--- a/src/views/xm/core/xmProduct/XmProductAdd.vue
+++ b/src/views/xm/core/xmProduct/XmProductAdd.vue
@@ -3,6 +3,10 @@
 		<el-row class="page-main ">
 			<!--新增界面 XmProduct 产品表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
+					   
+				<el-form-item label="产品名称" prop="productName">
+					<el-input v-model="addForm.productName" placeholder="产品名称" ></el-input>
+				</el-form-item>   
 				
 				<el-form-item label="产品代号" prop="code">
 						<el-input v-model="addForm.code"  placeholder="产品代号，不可为空" >
@@ -12,10 +16,7 @@
 						</el-input>
 							
 						<font color="blue" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享；产品内部编号为&nbsp;代号-四位随机码</font>
-				</el-form-item>  		   
-				<el-form-item label="产品名称" prop="productName">
-					<el-input v-model="addForm.productName" placeholder="产品名称" ></el-input>
-				</el-form-item>   
+				</el-form-item>  	
 				<el-row>
 					<el-col :span="8">
 				<el-form-item label="总监"  prop="admUserid">
@@ -126,7 +127,7 @@
 				
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
-						var msg=this.selProject&&this.selProject.id?'将自动关联项目【'+this.selProject.name+'】':'';
+						var msg=this.selProject&&this.selProject.id?'将自动关联项目【'+this.selProject.name?this.selProject.name:this.selProject.id+'】':'';
 						this.$confirm('确认提交吗？'+msg, '提示', {}).then(() => { 
 							this.load.add=true
 							let params = Object.assign({}, this.addForm); 
diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index f8bdab7c..a586311b 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="4">
 	  <el-row class="padding">
-          <el-col :span="20"> 
+          <el-col :span="24"> 
               <xm-product-select
                 ref="xmProductSelect"
                 :auto-select="true"
@@ -12,19 +12,11 @@
                 @row-click="onProductRowClick"
                 @clear="onProductClearSelect"
               ></xm-product-select>
-          </el-col>
-          <el-col :span="4">  
-				<el-link
-					type="warning" 
-					@click="addProductVisible = true"
-					icon="el-icon-plus"
-					>产品</el-link
-				> 
-          </el-col>
+          </el-col> 
         </el-row>
         <el-row
           ref="pageBody"
-          class="padding border"
+          class="padding"
           :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"
         >
           <h4 class="padding-bottom" v-if="xmProduct && xmProduct.id">常用功能导航</h4>