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">
-
-
-
-
-
-
- 产品名称
-
- 清空
- 关闭
+ v-model="productVisible">
+
+ 刷新
+ 清除选中
关闭查询
- 更多条件
+ 更多条件
-
+ 关闭
+
+
+
+ 没有查到与项目【{{linkProjectId}}】关联的产品,您可以尝试
+ 刷新
+ 重新从后台加载，或者创建产品 ，并自动关联项目【{{linkProjectId}}】，或者到【项目->关联产品->加入更多产品到项目】手动关联一个已存在的产品。
+
+
+
+ 没有查到相关产品,您可以尝试
+ 刷新
+ 重新从后台加载，或者创建产品
+
+
+
+
+
+
+
+
+
+
+
+ 产品名称
{{scope.row.productName}}
@@ -74,7 +91,7 @@
- {{editForm && editForm.id?editForm.productName:'选择产品'}}
+ {{editForm && editForm.id?editForm.productName:'选择产品'}}
@@ -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 @@
+
+
+
+
@@ -12,10 +16,7 @@
产品代号为合同上的产品代号，甲乙方共享；产品内部编号为 代号-四位随机码
-
-
-
-
+
@@ -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 @@
-
+
-
-
- 产品
-
+
常用功能导航