Skip to content

P
pda-ui
Commit 8d06b6be authored by 何远江's avatar 何远江
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 54e4d0c9 c30880cf
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 42 deletions
src/views/mes/md/brand/quantity.vue
View file @ 8d06b6be
......@@ -95,15 +95,30 @@
<el-table v-loading="loading" :data="quantityList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="brandOrderQuantityId" />
<el-table-column label="品牌id" align="center" prop="brandId" />
<el-table-column label="订单编号" align="center" prop="brandOrderQuantityId" />
<el-table-column label="品牌编号" align="center" prop="brandCode" />
<el-table-column label="品牌名称" align="center" prop="brandName" />
<el-table-column label="年份" align="center" prop="time" />
<el-table-column label="区域" align="center" prop="region" />
<el-table-column label="订单量" align="center" prop="orderQuantity" />
<el-table-column label="是否启用" align="center" prop="enableFlag" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
/>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-query"
@click="handleView(scope.row)"
v-hasPermi="['md:quantity:query']"
>查看</el-button>
<el-button
size="mini"
type="text"
......@@ -132,45 +147,57 @@
<!-- 添加或修改订单信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form"
:model="form"
:rules="rules"
:disabled="form.brandOrderQuantityId&&optType!='edit'"
label-width="80px">
<el-row>
<el-col :span="12">
<!-- <el-form-item label="品牌id" prop="brandId">
<el-input v-model="form.brandId" placeholder="请输入品牌id" />
</el-form-item> -->
<el-form-item label="品牌" prop="brandName">
<el-input v-model="form.brandName" placeholder="请选择品牌">
<el-form-item label="品牌编码" prop="brandCode">
<el-input v-model="form.brandName" placeholder="请选择品牌编码">
<el-button
slot="append"
icon="el-icon-search"
@click="handleBrandSelect"
:disabled="form.brandOrderQuantityId"
></el-button>
</el-input>
<BrandSelect
ref="brSelect"
@onSelected="onBrandSelected"
></BrandSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="品牌名称" prop="brandName">
<el-input v-model="form.brandName" readonly="readonly" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年份" prop="time">
<el-input v-model="form.time" placeholder="请输入年份" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="区域" prop="region">
<el-input v-model="form.region" placeholder="请输入区域" />
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单量" prop="orderQuantity">
<el-input v-model="form.orderQuantity" placeholder="请输入订单量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="12">
<el-form-item label="是否启用" prop="enableFlag">
<el-input v-model="form.enableFlag" placeholder="请输入是否启用" />
......@@ -199,7 +226,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="cancel" v-if="optType =='view' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="optType != 'view'">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -239,7 +267,11 @@
queryParams: {
pageNum: 1,
pageSize: 10,
brandId: null, time: null, region: null, orderQuantity: null, enableFlag: null, },
brandId: null,
time: null,
region: null,
orderQuantity: null,
enableFlag: null, },
// 表单参数
form: {},
// 表单校验
......@@ -274,7 +306,19 @@
// 表单重置
reset() {
this.form = {
brandOrderQuantityId: null, brandId: null, brandName: null , time: null, region: null, orderQuantity: null, enableFlag: null, remark: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
brandOrderQuantityId: null,
brandId: null,
brandCode: null,
brandName: null ,
time: null,
region: null,
orderQuantity: null,
enableFlag: "Y",
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
......@@ -298,6 +342,7 @@
this.reset();
this.open = true;
this.title = "添加订单量信息";
this.optType = "add";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -306,9 +351,21 @@
getQuantity(brandOrderQuantityId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改【请填写功能名称】";
this.title = "修改订单量信息";
this.optType = "edit";
});
},
// 查询明细按钮操作
handleView(row){
this.reset();
const brandOrderQuantityId = row.brandOrderQuantityId || this.ids;
getQuantity(brandOrderQuantityId).then(response => {
this.form = response.data;
this.open=true,
this.title = "查看拜访信息";
this.optType = "view";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
......
src/views/mes/md/brand/visit.vue
View file @ 8d06b6be
......@@ -34,12 +34,25 @@
</el-date-picker>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-input
<!-- <el-input
v-model="queryParams.enableFlag"
placeholder="请输入是否启用"
clearable
@keyup.enter.native="handleQuery"
/>
/> -->
<el-select
v-model="queryParams.enableFlag"
placeholder="是否启用"
clearable
style="width: 215px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -95,9 +108,10 @@
<el-table v-loading="loading" :data="visitList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="brandVisitId" />
<el-table-column label="品牌id" align="center" prop="brandId" />
<el-table-column label="访问客户" align="center" prop="contactName" />
<el-table-column label="拜访信息编码" align="center" prop="brandVisitId" />
<el-table-column label="品牌编码" align="center" prop="brandCode" />
<el-table-column label="品牌名称" align="center" prop="brandName" />
<!-- <el-table-column label="访问客户" align="center" prop="contactName" /> -->
<el-table-column label="访问人" align="center" prop="visitPerson" />
<el-table-column label="拜访时间" align="center" prop="visitTime" width="180">
<template slot-scope="scope">
......@@ -105,10 +119,26 @@
</template>
</el-table-column>
<el-table-column label="拜访纪要" align="center" prop="visitSummary" />
<el-table-column label="是否启用" align="center" prop="enableFlag" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
/>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-query"
@click="handleView(scope.row)"
v-hasPermi="['md:visit:query']"
>查看</el-button>
<el-button
size="mini"
type="text"
......@@ -137,18 +167,23 @@
<!-- 添加或修改【请填写功能名称】对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form"
:model="form"
:rules="rules"
:disabled="form.brandVisitId&&optType!='edit'"
label-width="80px">
<el-row>
<el-col :span="12">
<!-- <el-form-item label="品牌id" prop="brandId">
<el-input v-model="form.brandId" placeholder="请输入品牌id" />
</el-form-item> -->
<el-form-item label="品牌" prop="brandName">
<el-input v-model="form.brandName" placeholder="请选择品牌">
<el-form-item label="品牌编码" prop="brandCode">
<el-input v-model="form.brandCode" placeholder="请选择品牌" readonly="readonly">
<el-button
slot="append"
icon="el-icon-search"
@click="handleBrandSelect"
:disabled="form.brandVisitId"
></el-button>
</el-input>
<BrandSelect
......@@ -159,10 +194,11 @@
</el-col>
<el-col :span="12">
<el-form-item label="访问客户" prop="contactName">
<el-input v-model="form.contactName" placeholder="请输入访问客户" />
<el-form-item label="品牌名称" prop="brandName">
<el-input v-model="form.brandName" readonly="readonly" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
......@@ -170,6 +206,13 @@
<el-input v-model="form.visitPerson" placeholder="请输入访问人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="访问客户" prop="contactName">
<el-input v-model="form.contactName" placeholder="请输入访问客户" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="拜访时间" prop="visitTime">
<el-date-picker clearable
......@@ -179,17 +222,9 @@
placeholder="请选择拜访时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="拜访纪要" prop="visitSummary">
<el-input v-model="form.visitSummary" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="是否启用" prop="enableFlag">
<el-input v-model="form.enableFlag" placeholder="请输入是否启用" />
</el-form-item> </el-col>-->
......@@ -211,6 +246,15 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="拜访纪要" prop="visitSummary">
<el-input v-model="form.visitSummary" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
</el-row>
<el-row>
<el-form-item label="备注" prop="remark">
......@@ -219,7 +263,8 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="cancel" v-if="optType =='view' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="optType != 'view'">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -259,7 +304,14 @@ export default {
pageNum: 1,
pageSize: 10,
brandId: null, contactName: null, visitPerson: null, visitTime: null, visitSummary: null, enableFlag: null, },
brandId: null,
contactName: null,
brandCode: null,
brandName: null,
visitPerson: null,
visitTime: null,
visitSummary: null,
enableFlag: null, },
// 表单参数
form: {},
// 表单校验
......@@ -279,7 +331,7 @@ export default {
this.getList();
},
methods: {
/** 查询【请填写功能名称】列表 */
/** 查询拜访信息列表 */
getList() {
this.loading = true;
listVisit(this.queryParams).then(response => {
......@@ -288,6 +340,7 @@ export default {
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
......@@ -296,7 +349,20 @@ export default {
// 表单重置
reset() {
this.form = {
brandVisitId: null, brandId: null, brandName:null, contactName: null, visitPerson: null, visitTime: null, visitSummary: null, enableFlag: null, remark: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
brandVisitId: null,
brandId: null,
brandName:null,
brandCode: null,
contactName: null,
visitPerson: null,
visitTime: null,
visitSummary: null,
enableFlag: "Y",
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
......@@ -333,6 +399,17 @@ export default {
this.optType = "edit";
});
},
// 查询明细按钮操作
handleView(row){
this.reset();
const brandVisitId = row.brandVisitId || this.ids;
getVisit(brandVisitId).then(response => {
this.form = response.data;
this.open=true,
this.title = "查看拜访信息";
this.optType = "view";
});
},
/** 提交按钮 */
submitForm() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment