end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 4 years ago
parent
e1b1e97983
commit
90a1e7ab00
3 changed files with 63 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      src/views/xm/core/components/XmProductSelect.vue
  2. 11
      src/views/xm/core/xmProduct/XmProductAdd.vue
  3. 14
      src/views/xm/core/xmProduct/XmProductForLinkComplex.vue

68
src/views/xm/core/components/XmProductSelect.vue
View File

@ -4,17 +4,10 @@
placement="bottom" placement="bottom"
width="400" width="400"
trigger="manual" 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 <el-popover
placement="top-start" placement="top-start"
title="" title=""
@ -63,9 +56,33 @@
<el-button type="text" @click="moreVisible=false" >关闭</el-button><el-button type="primary" @click="searchXmProducts" >查询</el-button> <el-button type="text" @click="moreVisible=false" >关闭</el-button><el-button type="primary" @click="searchXmProducts" >查询</el-button>
</el-col> </el-col>
</el-row> </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> </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>
<template slot-scope="scope"> <template slot-scope="scope">
<font>{{scope.row.productName}}</font> <font>{{scope.row.productName}}</font>
@ -74,7 +91,7 @@
</el-table> </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-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> </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> </el-popover>
</section> </section>
</template> </template>
@ -86,6 +103,7 @@
import { listXmProductWithState } from '@/api/xm/core/xmProduct'; import { listXmProductWithState } from '@/api/xm/core/xmProduct';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
import XmProductAdd from '../xmProduct/XmProductAdd.vue';
const map=new Map(); const map=new Map();
export default { export default {
@ -144,6 +162,7 @@
productVisible:false, productVisible:false,
moreVisible:false, moreVisible:false,
hadInit:false, hadInit:false,
addProductVisible:false,
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
@ -223,6 +242,8 @@
var row=this.xmProducts[0]; var row=this.xmProducts[0];
this.$refs.table.setCurrentRow(row); this.$refs.table.setCurrentRow(row);
this.rowClick(row); this.rowClick(row);
}else{
this.editForm=null
} }
}else{ }else{
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@ -285,6 +306,10 @@
this.productVisible=false; this.productVisible=false;
this.moreVisible=false; this.moreVisible=false;
}, },
refreshSelect(){
this.searchXmProducts();
this.moreVisible=false;
},
close(){ close(){
this.productVisible=false; this.productVisible=false;
this.moreVisible=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 },//end methods
components: { components: {
UsersSelect, UsersSelect,
XmProductAdd,
//在下面添加其它组件 //在下面添加其它组件
}, },
mounted() { mounted() {

11
src/views/xm/core/xmProduct/XmProductAdd.vue
View File

@ -3,6 +3,10 @@
<el-row class="page-main "> <el-row class="page-main ">
<!--新增界面 XmProduct 产品表--> <!--新增界面 XmProduct 产品表-->
<el-form :model="addForm" label-width="120px" :rules="addFormRules" ref="addForm"> <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-form-item label="产品代号" prop="code">
<el-input v-model="addForm.code" placeholder="产品代号，不可为空" > <el-input v-model="addForm.code" placeholder="产品代号，不可为空" >
@ -12,10 +16,7 @@
</el-input> </el-input>
<font color="blue" style="font-size:10px;">产品代号为合同上的产品代号，甲乙方共享；产品内部编号为&nbsp;代号-四位随机码</font> <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-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="总监" prop="admUserid"> <el-form-item label="总监" prop="admUserid">
@ -126,7 +127,7 @@
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
if (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.$confirm('确认提交吗？'+msg, '提示', {}).then(() => {
this.load.add=true this.load.add=true
let params = Object.assign({}, this.addForm); let params = Object.assign({}, this.addForm);

14
src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
View File

@ -3,7 +3,7 @@
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-row class="padding"> <el-row class="padding">
<el-col :span="20">
<el-col :span="24">
<xm-product-select <xm-product-select
ref="xmProductSelect" ref="xmProductSelect"
:auto-select="true" :auto-select="true"
@ -12,19 +12,11 @@
@row-click="onProductRowClick" @row-click="onProductRowClick"
@clear="onProductClearSelect" @clear="onProductClearSelect"
></xm-product-select> ></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>
<el-row <el-row
ref="pageBody" ref="pageBody"
class="padding border"
class="padding"
:style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }" :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"
> >
<h4 class="padding-bottom" v-if="xmProduct && xmProduct.id">常用功能导航</h4> <h4 class="padding-bottom" v-if="xmProduct && xmProduct.id">常用功能导航</h4>

Write Preview
Loading…
Cancel
Save