Skip to content

M
mes-ui
Commit 05e879a4 authored by 全洪江's avatar 全洪江
Browse files
Options

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

parents bfe55cbf ed0dae68
Hide whitespace changes
Inline Side-by-side
Showing with 897 additions and 557 deletions
src/components/SapPropertyData/index.vue
View file @ 05e879a4
...@@ -2,17 +2,19 @@ ...@@ -2,17 +2,19 @@
<div class="base-info"> <div class="base-info">
<el-form :model="sapData" ref="form" label-width="120px" size="mini"> <el-form :model="sapData" ref="form" label-width="120px" size="mini">
<el-row class="form-wrap" :gutter="gutter"> <el-row class="form-wrap" :gutter="gutter">
<template v-for="(sapProperties, key) in sapPropertyMap"> <div>
<div class="separator">{{ getViewTypeName(key) }}</div> <template v-for="(sapProperties, key) in sapPropertyMap">
<template v-for="item in sapProperties"> <div class="separator">{{ getViewTypeName(key) }}</div>
<el-col :span="span" :key="item.id"> <template v-for="item in sapProperties">
<el-form-item :label="item.name" :prop="item.sapField" <el-col :span="span" :key="item.id">
:rules="{required: item.required, validator: (rule, value, callback) => onValidate(rule, value, callback, item), trigger: ['blur', 'change']}"> <el-form-item :label="item.name" :prop="item.sapField"
<el-input-all v-model="sapData[item.sapField]" :item="item"/> :rules="{required: item.required, validator: (rule, value, callback) => onValidate(rule, value, callback, item), trigger: ['blur', 'change']}">
</el-form-item> <el-input-all v-model="sapData[item.sapField]" :item="item"/>
</el-col> </el-form-item>
</el-col>
</template>
</template> </template>
</template> </div>
</el-row> </el-row>
<div class="footer"> <div class="footer">
......
src/views/mes/md/client/components/ClientContact.vue
View file @ 05e879a4
...@@ -52,17 +52,16 @@ ...@@ -52,17 +52,16 @@
<el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="跟单员" align="center" prop="id"/> <el-table-column label="客户id" align="center" prop="clientId" width="100"/>
<el-table-column label="客户id" align="center" prop="clientId"/> <el-table-column label="品牌ID" align="center" prop="brandId" width="150"/>
<el-table-column label="品牌ID" align="center" prop="brandId"/> <el-table-column label="职位" align="center" prop="position" width="100"/>
<el-table-column label="职位" align="center" prop="position"/> <el-table-column label="联系人" align="center" prop="contact" width="100"/>
<el-table-column label="联系人" align="center" prop="contact"/> <el-table-column label="电话号码" align="center" prop="tel" width="150"/>
<el-table-column label="电话号码" align="center" prop="tel"/> <el-table-column label="email" align="center" prop="email" width="200"/>
<el-table-column label="email" align="center" prop="email"/> <el-table-column label="经营类型" align="center" prop="businessType" width="100"/>
<el-table-column label="经营类型" align="center" prop="businessType"/> <el-table-column label="工厂代号" align="center" prop="factoryCode" width="100"/>
<el-table-column label="工厂代号" align="center" prop="factoryCode"/> <el-table-column label="跟单员" align="center" prop="merchandiser" width="100"/>
<el-table-column label="跟单员" align="center" prop="merchandiser"/> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -91,13 +90,51 @@ ...@@ -91,13 +90,51 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改客户联系人对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="品牌ID" prop="brandId" label-width="120px">
<el-input v-model="form.brandId" placeholder="请输入品牌ID" />
</el-form-item>
<el-form-item label="职位" prop="position" label-width="120px">
<el-input v-model="form.position" placeholder="请输入职位" />
</el-form-item>
<el-form-item label="联系人" prop="contact" label-width="120px">
<el-input v-model="form.contact" placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="电话号码" prop="tel" label-width="120px">
<el-input v-model="form.tel" placeholder="请输入电话号码" />
</el-form-item>
<el-form-item label="email" prop="email" label-width="120px">
<el-input v-model="form.email" placeholder="请输入email" />
</el-form-item>
<el-form-item label="经营类型" prop="businessType" label-width="120px">
<el-input v-model="form.businessType" placeholder="请输入经营类型" />
</el-form-item>
<el-form-item label="工厂代号" prop="spefactoryCodec" label-width="120px">
<el-input v-model="form.factoryCode" placeholder="请输入产工厂代码" />
</el-form-item>
<el-form-item label="跟单员" prop="merchandiser" label-width="120px">
<el-input v-model="form.merchandiser" placeholder="请输入跟单员" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listContact } from '@/api/mes/md/clientContact' import { listContact,addContact,updateContact,getContact,delContact } from '@/api/mes/md/clientContact'
export default { export default {
props: {
clientId: { type: Number | undefined, default:undefined },
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -112,7 +149,7 @@ export default { ...@@ -112,7 +149,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 客户系人表格数据 // 客户联系人表格数据
contactList: [], contactList: [],
// 弹出层标题 // 弹出层标题
title: '', title: '',
...@@ -127,13 +164,34 @@ export default { ...@@ -127,13 +164,34 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {} rules: {
brandId: [
{ required: true, trigger: 'blur' }
],
position: [
{ required: true, trigger: 'blur' }
],
contact: [
{ required: true, trigger: 'blur' }
],
tel: [
{ required: true, trigger: 'blur' }
],
businessType: [
{ required: true, trigger: 'blur' }
],
merchandiser: [
{ required: true, trigger: 'blur' }
]
}
} }
}, },
methods: { methods: {
/** 查询客户系人列表 */ /** 查询客户联系人列表 */
getList() { getList() {
this.loading = true this.loading = true
this.queryParams.clientId=this.clientId
listContact(this.queryParams).then(response => { listContact(this.queryParams).then(response => {
this.contactList = response.rows this.contactList = response.rows
this.total = response.total this.total = response.total
...@@ -148,7 +206,7 @@ export default { ...@@ -148,7 +206,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
id: null, id: null,
clientId: null, clientId: this.clientId,
brandId: null, brandId: null,
position: null, position: null,
contact: null, contact: null,
...@@ -184,7 +242,7 @@ export default { ...@@ -184,7 +242,7 @@ export default {
handleAdd() { handleAdd() {
this.reset() this.reset()
this.open = true this.open = true
this.title = '添加客户系人' this.title = '添加客户联系人'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -193,7 +251,7 @@ export default { ...@@ -193,7 +251,7 @@ export default {
getContact(id).then(response => { getContact(id).then(response => {
this.form = response.data this.form = response.data
this.open = true this.open = true
this.title = '修改客户系人' this.title = '修改客户联系人'
}) })
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -201,12 +259,14 @@ export default { ...@@ -201,12 +259,14 @@ export default {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateContact(this.form).then(response => { updateContact(this.form).then(response => {
this.$modal.msgSuccess('修改成功') this.$modal.msgSuccess('修改成功')
this.open = false this.open = false
this.getList() this.getList()
}) })
} else { } else {
this.form.clientId = this.clientId
addContact(this.form).then(response => { addContact(this.form).then(response => {
this.$modal.msgSuccess('新增成功') this.$modal.msgSuccess('新增成功')
this.open = false this.open = false
...@@ -219,7 +279,7 @@ export default { ...@@ -219,7 +279,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids const ids = row.id || this.ids
this.$modal.confirm('是否确认删除客户系人编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除？').then(function() {
return delContact(ids) return delContact(ids)
}).then(() => { }).then(() => {
this.getList() this.getList()
......
src/views/mes/md/client/components/PaymentRelation.vue
View file @ 05e879a4
...@@ -48,9 +48,11 @@ ...@@ -48,9 +48,11 @@
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="支付方客户ID" align="center" prop="id" />
<el-table-column label="客户id" align="center" prop="clientId" /> <el-table-column label="客户id" align="center" prop="clientId" />
<el-table-column label="支付方客户ID" align="center" prop="relatedClientId" /> <el-table-column label="支付方客户ID" align="center" prop="relatedClientId" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -82,10 +84,7 @@ ...@@ -82,10 +84,7 @@
<!-- 添加或修改客户付款信息关联对话框 --> <!-- 添加或修改客户付款信息关联对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="客户id" prop="clientId"> <el-form-item label="支付方客户ID" prop="relatedClientId" label-width="8em">
<el-input v-model="form.clientId" placeholder="请输入客户id" />
</el-form-item>
<el-form-item label="支付方客户ID" prop="relatedClientId">
<el-input v-model="form.relatedClientId" placeholder="请输入支付方客户ID" /> <el-input v-model="form.relatedClientId" placeholder="请输入支付方客户ID" />
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -102,6 +101,9 @@ import { listRelation, getRelation, delRelation, addRelation, updateRelation } f ...@@ -102,6 +101,9 @@ import { listRelation, getRelation, delRelation, addRelation, updateRelation } f
export default { export default {
name: "Relation", name: "Relation",
props: {
clientId: { type: Number | undefined, default:undefined },
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -133,6 +135,9 @@ export default { ...@@ -133,6 +135,9 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
relatedClientId: [{
required: true, trigger: 'blur'
}]
} }
}; };
}, },
...@@ -143,6 +148,7 @@ export default { ...@@ -143,6 +148,7 @@ export default {
/** 查询客户付款信息关联列表 */ /** 查询客户付款信息关联列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams.clientId=this.clientId
listRelation(this.queryParams).then(response => { listRelation(this.queryParams).then(response => {
this.relationList = response.rows; this.relationList = response.rows;
this.total = response.total; this.total = response.total;
...@@ -157,7 +163,7 @@ export default { ...@@ -157,7 +163,7 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
id: null, clientId: null, relatedClientId: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; id: null, clientId: this.clientId, relatedClientId: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
...@@ -203,6 +209,7 @@ export default { ...@@ -203,6 +209,7 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
this.form.clientId= this.clientId
addRelation(this.form).then(response => { addRelation(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
......
src/views/mes/md/client/components/UrgeEmail.vue
View file @ 05e879a4
...@@ -53,11 +53,14 @@ ...@@ -53,11 +53,14 @@
<el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="是否开启" align="center" prop="id"/>
<el-table-column label="客户id" align="center" prop="clientId"/> <el-table-column label="客户id" align="center" prop="clientId"/>
<el-table-column label="邮箱" align="center" prop="email"/> <el-table-column label="邮箱" align="center" prop="email"/>
<el-table-column label="联系人" align="center" prop="contact"/> <el-table-column label="联系人" align="center" prop="contact"/>
<el-table-column label="是否开启" align="center" prop="enableFlag"/> <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" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -90,17 +93,21 @@ ...@@ -90,17 +93,21 @@
<!-- 添加或修改催货款通知邮箱对话框 --> <!-- 添加或修改催货款通知邮箱对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="客户id" prop="clientId">
<el-input v-model="form.clientId" placeholder="请输入客户id"/>
</el-form-item>
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱"/> <el-input v-model="form.email" placeholder="请输入邮箱"/>
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact">
<el-input v-model="form.contact" placeholder="请输入联系人"/> <el-input v-model="form.contact" placeholder="请输入联系人"/>
</el-form-item> </el-form-item>
<el-form-item label="是否开启" prop="enableFlag"> <el-form-item label="是否启用" prop="enableFlag">
<el-input v-model="form.enableFlag" placeholder="请输入是否开启"/> <el-select v-model="form.enableFlag" placeholder="请选择是或否">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -116,6 +123,10 @@ import { addEmail, delEmail, getEmail, listEmail, updateEmail } from '@/api/mes/ ...@@ -116,6 +123,10 @@ import { addEmail, delEmail, getEmail, listEmail, updateEmail } from '@/api/mes/
export default { export default {
name: 'Email', name: 'Email',
dicts:['sys_yes_no'],
props: {
clientId: { type: Number | undefined, default:undefined },
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -140,18 +151,33 @@ export default { ...@@ -140,18 +151,33 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
clientId: null, email: null, contact: null, enableFlag: null clientId: null,
email: null, contact: null, enableFlag: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {} rules: {
email: [
{ required: true, trigger: 'blur' }
],
contact: [
{ required: true, trigger: 'blur' }
],
contact: [
{ required: true, trigger: 'blur' }
],
enableFlag: [
{ required: true, trigger: 'blur' }
]
}
} }
}, },
methods: { methods: {
/** 查询催货款通知邮箱列表 */ /** 查询催货款通知邮箱列表 */
getList() { getList() {
this.loading = true this.loading = true
this.queryParams.clientId=this.clientId
listEmail(this.queryParams).then(response => { listEmail(this.queryParams).then(response => {
this.emailList = response.rows this.emailList = response.rows
this.total = response.total this.total = response.total
...@@ -167,7 +193,7 @@ export default { ...@@ -167,7 +193,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
id: null, id: null,
clientId: null, clientId: this.clientId,
email: null, email: null,
contact: null, contact: null,
enableFlag: null, enableFlag: null,
...@@ -221,6 +247,7 @@ export default { ...@@ -221,6 +247,7 @@ export default {
this.getList() this.getList()
}) })
} else { } else {
this.form.clientId = this.clientId
addEmail(this.form).then(response => { addEmail(this.form).then(response => {
this.$modal.msgSuccess('新增成功') this.$modal.msgSuccess('新增成功')
this.open = false this.open = false
......
src/views/mes/md/client/index.vue
View file @ 05e879a4
...@@ -243,13 +243,13 @@ ...@@ -243,13 +243,13 @@
<FinanceInfo ref="FinanceInfo" :form="form"/> <FinanceInfo ref="FinanceInfo" :form="form"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="客户联系人" name="ClientContact"> <el-tab-pane label="客户联系人" name="ClientContact">
<ClientContact ref="ClientContact"/> <ClientContact ref="ClientContact" :clientId="form.clientId"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="催货款通知邮箱" name="UrgeEmail"> <el-tab-pane label="催货款通知邮箱" name="UrgeEmail">
<UrgeEmail ref="UrgeEmail"/> <UrgeEmail ref="UrgeEmail" :clientId="form.clientId"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="客户付款信息" name="PaymentRelation"> <el-tab-pane label="客户付款信息" name="PaymentRelation">
<PaymentRelation ref="PaymentRelation"/> <PaymentRelation ref="PaymentRelation" :clientId="form.clientId"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="SAP特性" name="SapProperty"> <el-tab-pane label="SAP特性" name="SapProperty">
<SapPropertyData ref="SapProperty"/> <SapPropertyData ref="SapProperty"/>
......
src/views/mes/md/product/components/specProperty.vue
View file @ 05e879a4
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
<el-form-item label="产品特性名称" prop="spec" label-width="7em"> ref="queryForm"
<el-input size="small"
v-model="queryParams.spec" :inline="true"
placeholder="请输入产品特性名称" v-show="showSearch"
clearable label-width="68px"
>
@keyup.enter.native="handleQuery" <el-form-item label="产品特性名称" prop="spec" label-width="7em">
/> <el-input
</el-form-item> v-model="queryParams.spec"
<el-form-item> placeholder="请输入产品特性名称"
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> clearable
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> @keyup.enter.native="handleQuery"
</el-form-item> />
</el-form> </el-form-item>
<el-form-item>
<el-row :gutter="10" class="mb8"> <el-button
<el-col :span="1.5"> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:spec:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:spec:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:spec:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:spec:export']"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="specList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品特性名称" align="center" prop="spec" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button <el-button
type="primary"
plain
icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" type="text"
v-hasPermi="['md:spec:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" @click="handleUpdate(scope.row)"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:spec:edit']" v-hasPermi="['md:spec:edit']"
>修改</el-button> >修改</el-button
</el-col> >
<el-col :span="1.5">
<el-button <el-button
type="danger"
plain
icon="el-icon-delete"
size="mini" size="mini"
:disabled="multiple" type="text"
@click="handleDelete" icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:spec:remove']" v-hasPermi="['md:spec:remove']"
>删除</el-button> >删除</el-button
</el-col> >
<el-col :span="1.5"> </template>
<el-button </el-table-column>
type="warning" </el-table>
plain
icon="el-icon-download" <pagination
size="mini" v-show="total > 0"
@click="handleExport" :total="total"
v-hasPermi="['md:spec:export']" :page.sync="queryParams.pageNum"
>导出</el-button> :limit.sync="queryParams.pageSize"
</el-col> @pagination="getList"
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> />
</el-row>
<!-- 添加或修改产品特性名称对话框 -->
<el-table v-loading="loading" :data="specList" @selection-change="handleSelectionChange"> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-table-column type="selection" width="55" align="center" /> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="产品特性名称" prop="spec" label-width="120px">
<el-input v-model="form.spec" placeholder="请输入产品特性名称" />
<el-table-column label="产品特性名称" align="center" prop="spec" /> </el-form-item>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> </el-form>
<template slot-scope="scope"> <div slot="footer" class="dialog-footer">
<el-button <el-button type="primary" @click="submitForm">确 定</el-button>
size="mini" <el-button @click="cancel">取 消</el-button>
type="text" </div>
icon="el-icon-edit" </el-dialog>
@click="handleUpdate(scope.row)" </div>
v-hasPermi="['md:spec:edit']" </template>
>修改</el-button>
<el-button <script>
size="mini" import {
type="text" listSpec,
icon="el-icon-delete" getSpec,
@click="handleDelete(scope.row)" delSpec,
v-hasPermi="['md:spec:remove']" addSpec,
>删除</el-button> updateSpec,
</template> } from "@/api/mes/md/spec";
</el-table-column>
</el-table> export default {
name: "Spec",
<pagination props: {
v-show="total>0" itemId: { type: Number, default: "" },
:total="total" },
:page.sync="queryParams.pageNum" data() {
:limit.sync="queryParams.pageSize" return {
@pagination="getList" // 遮罩层
/> loading: true,
// 选中数组
<!-- 添加或修改产品特性名称对话框 --> ids: [],
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> // 非单个禁用
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> single: true,
// 非多个禁用
<el-form-item label="产品特性名称" prop="spec" label-width="120px"> multiple: true,
<el-input v-model="form.spec" placeholder="请输入产品特性名称" /> // 显示搜索条件
</el-form-item> showSearch: true,
</el-form> // 总条数
<div slot="footer" class="dialog-footer"> total: 0,
<el-button type="primary" @click="submitForm">确 定</el-button> // 产品特性名称表格数据
<el-button @click="cancel">取 消</el-button> specList: [],
</div> // 弹出层标题
</el-dialog> title: "",
</div> // 是否显示弹出层
</template> open: false,
// 查询参数
<script> queryParams: {
import { listSpec, getSpec, delSpec, addSpec, updateSpec } from "@/api/mes/md/spec"; pageNum: 1,
pageSize: 10,
export default { itemId: "",
name: "Spec", spec: null,
props: { },
itemId:{type:Number, // 表单参数
default:''} form: {},
// 表单校验
rules: {
spec: [
{
required: true,
message: "产品特性名称不能为空！",
trigger: "blur",
},
],
},
};
},
created() {
this.getList();
},
methods: {
/** 查询产品特性名称列表 */
getList() {
this.loading = true;
this.queryParams.itemId = this.itemId;
listSpec(this.queryParams).then((response) => {
this.specList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
}, },
data() { // 表单重置
return { reset() {
// 遮罩层 this.form = {
loading: true, itemSpecId: null,
// 选中数组 itemId: this.itemId,
ids: [], spec: null,
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 产品特性名称表格数据
specList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemId: '',
spec: null },
// 表单参数
form: {},
// 表单校验
rules: {
spec: [
{ required: true, message: "产品特性名称不能为空！", trigger: "blur" }
], }
}; };
this.resetForm("form");
}, },
created() { /** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
methods: { /** 重置按钮操作 */
/** 查询产品特性名称列表 */ resetQuery() {
getList() { this.resetForm("queryForm");
this.loading = true; this.handleQuery();
this.queryParams.itemId = this.itemId; },
listSpec(this.queryParams).then(response => { // 多选框选中数据
this.specList = response.rows; handleSelectionChange(selection) {
this.total = response.total; this.ids = selection.map((item) => item.itemSpecId);
this.loading = false; this.single = selection.length !== 1;
}); this.multiple = !selection.length;
}, },
// 取消按钮 /** 新增按钮操作 */
cancel() { handleAdd() {
this.open = false; this.reset();
this.reset(); this.open = true;
}, this.title = "添加产品特性名称";
// 表单重置 },
reset() { /** 修改按钮操作 */
this.form = { handleUpdate(row) {
itemSpecId: null, itemId: this.itemId, spec: null }; this.reset();
this.resetForm("form"); const itemSpecId = row.itemSpecId || this.ids;
}, getSpec(itemSpecId).then((response) => {
/** 搜索按钮操作 */ this.form = response.data;
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.itemSpecId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true; this.open = true;
this.title = "添加产品特性名称"; this.title = "修改产品特性名称";
}, });
/** 修改按钮操作 */ },
handleUpdate(row) { /** 提交按钮 */
this.reset(); submitForm() {
const itemSpecId = row.itemSpecId || this.ids this.$refs["form"].validate((valid) => {
getSpec(itemSpecId).then(response => { if (valid) {
this.form = response.data; if (this.form.itemSpecId != null) {
this.open = true; updateSpec(this.form).then((response) => {
this.title = "修改产品特性名称"; this.$modal.msgSuccess("修改成功");
}); this.open = false;
}, this.getList();
/** 提交按钮 */ });
submitForm() { } else {
this.$refs["form"].validate(valid => { this.form.itemId = this.itemId;
if (valid) { addSpec(this.form).then((response) => {
if (this.form.itemSpecId != null) { this.$modal.msgSuccess("新增成功");
updateSpec(this.form).then(response => { this.open = false;
this.$modal.msgSuccess("修改成功"); this.getList();
this.open = false; });
this.getList();
});
} else {
this.form.itemId = this.itemId;
addSpec(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
}); }
}, });
/** 删除按钮操作 */ },
handleDelete(row) { /** 删除按钮操作 */
const itemSpecIds = row.itemSpecId || this.ids; handleDelete(row) {
const itemSpecIds = row.itemSpecId || this.ids;
this.$modal.confirm('是否确认删除？').then(function() {
this.$modal
.confirm("是否确认删除？")
.then(function () {
return delSpec(itemSpecIds); return delSpec(itemSpecIds);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); })
}, .catch(() => {});
/** 导出按钮操作 */ },
handleExport() { /** 导出按钮操作 */
this.download('md/spec/export', { handleExport() {
...this.queryParams this.download(
}, `spec_${new Date().getTime()}.xlsx`) "md/spec/export",
} {
} ...this.queryParams,
}; },
</script> `spec_${new Date().getTime()}.xlsx`
);
\ No newline at end of file },
},
};
</script>
src/views/mes/order/sales/index.vue
View file @ 05e879a4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input <el-input
v-model="queryParams.orderNo" v-model.trim="queryParams.orderNo"
placeholder="请输入订单编号" placeholder="请输入订单编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-form-item> </el-form-item>
<el-form-item label="客户编号" prop="clientCode"> <el-form-item label="客户编号" prop="clientCode">
<el-input <el-input
v-model="queryParams.clientCode" v-model.trim="queryParams.clientCode"
placeholder="请输入客户编号" placeholder="请输入客户编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
...@@ -28,20 +28,14 @@ ...@@ -28,20 +28,14 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="跟单人" prop="merchandiser"> <el-form-item label="跟单人" prop="merchandiser">
<el-input <el-select v-model="queryParams.merchandiser" clearable filterable remote :remote-method="getUserList" placeholder="请选择跟单人">
v-model="queryParams.merchandiser" <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
placeholder="请输入跟单人" </el-select>
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="state"> <el-form-item label="订单状态" prop="state">
<el-input <el-select v-model="queryParams.state" clearable placeholder="请选择订单状态">
v-model="queryParams.state" <el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/>
placeholder="请输入订单状态" </el-select>
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -99,35 +93,20 @@ ...@@ -99,35 +93,20 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange" @expand-change="onShowDetail"> <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55"/>
<el-table-column type="expand">
<template slot-scope="{row}">
<el-row v-loading="row.detailLoading" class="order-detail">
<el-row v-for="item in row.detailList" :key="item.id">
<el-col :span="4">{{ item.productName }}</el-col>
<el-col :span="4">{{ item.num }}</el-col>
<el-col :span="4">{{ formatMoney(item.amount) }}</el-col>
<el-col :span="4">{{ item.state }}</el-col>
<el-col :span="4"></el-col>
<el-col :span="4"></el-col>
<el-col :span="4"></el-col>
</el-row>
</el-row>
</template>
</el-table-column>
<el-table-column label="订单编号" prop="orderNo"/> <el-table-column label="订单编号" prop="orderNo"/>
<el-table-column label="客户编号" prop="mdClient.clientCode"/> <el-table-column label="客户编号" prop="mdClient.clientCode"/>
<el-table-column label="交货期" prop="deliveryDate" width="180"> <el-table-column label="交货期" prop="deliveryDate" width="180"/>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.deliveryDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="总金额" prop="amount" :formatter="r => this.formatMoney(r.amount)"/> <el-table-column label="总金额" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
<el-table-column label="跟单人" prop="merchandiser" <el-table-column label="跟单人" prop="merchandiser"
:formatter="r => (this.userList.find(item => item.userId == r.merchandiser) || {}).nickName"/> :formatter="r => (this.userList.find(item => item.userId == r.merchandiser) || {}).nickName"/>
<el-table-column label="备注" prop="remark"/> <el-table-column label="备注" prop="remark"/>
<el-table-column label="订单状态" prop="state"/> <el-table-column label="订单状态" prop="state">
<template slot-scope="{row}">
{{ dict.type.sales_order_state.find(item => item.value == row.state).label }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width"> <el-table-column label="操作" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -158,70 +137,15 @@ ...@@ -158,70 +137,15 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改销售订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="订单编号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单编号"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户编号" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请输入客户编号"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="交货期" prop="deliveryDate">
<el-date-picker
clearable
v-model="form.deliveryDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择交货期"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="总金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入总金额"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="跟单人" prop="merchandiser">
<el-select v-model="form.merchandiser" placeholder="请输入跟单人" filterable clearable>
<el-option v-for="item in userList" :key="item.userId" :value="item.userId" :label="item.nickName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="订单状态" prop="state">
<el-input v-model="form.state" placeholder="请输入订单状态"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { addOrder, delOrder, getOrder, listOrder, updateOrder } from '@/api/mes/od/salesOrder' import { delOrder, listOrder } from '@/api/mes/od/salesOrder'
import { listDetail } from '@/api/mes/od/salesOrderDetail'
import { listUser } from '@/api/system/user' import { listUser } from '@/api/system/user'
export default { export default {
name: 'Order', dicts: ['mes_client_type','sys_yes_no', 'sales_order_state'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -238,10 +162,6 @@ export default { ...@@ -238,10 +162,6 @@ export default {
total: 0, total: 0,
// 销售订单表格数据 // 销售订单表格数据
orderList: [], orderList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -249,11 +169,7 @@ export default { ...@@ -249,11 +169,7 @@ export default {
orderNo: null, clientCode: null, deliveryDate: null, amount: null, merchandiser: null, state: null, orderNo: null, clientCode: null, deliveryDate: null, amount: null, merchandiser: null, state: null,
mdClient: {clientName: null} mdClient: {clientName: null}
}, },
// 表单参数 userList: [],
form: {},
// 表单校验
rules: {},
userList: []
} }
}, },
created() { created() {
...@@ -264,51 +180,13 @@ export default { ...@@ -264,51 +180,13 @@ export default {
/** 查询销售订单列表 */ /** 查询销售订单列表 */
getList() { getList() {
this.loading = true this.loading = true
console.log(this.queryParams)
listOrder(this.queryParams).then(response => { listOrder(this.queryParams).then(response => {
response.rows.forEach(item => {
item.detailLoading = false
item.detailList = []
})
this.orderList = response.rows this.orderList = response.rows
this.total = response.total this.total = response.total
this.loading = false }).finally(() => this.loading = false)
})
}, },
getUserList() { getUserList(nickName) {
if (this.userList.length) return listUser({nickName, pageNum: 1, pageSize: 100}).then(res => this.userList = res.rows)
listUser().then(res => this.userList = res.rows)
},
onShowDetail(row) {
if (!row.detailList.length) {
row.detailLoading = true
listDetail({ orderId: row.id }).then(res => {
row.detailList = res.rows
}).finally(() => row.detailLoading = false)
}
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
id: null,
orderNo: null,
clientCode: null,
deliveryDate: null,
amount: null,
merchandiser: null,
remark: null,
state: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
}
this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
...@@ -328,41 +206,11 @@ export default { ...@@ -328,41 +206,11 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset() this.$router.push('/order/sales/detail')
this.open = true
this.title = '添加销售订单'
this.getUserList()
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset() this.$router.push('/order/sales/detail?id=' + row.id)
this.getUserList()
const id = row.id || this.ids
getOrder(id).then(response => {
this.form = response.data
this.open = true
this.title = '修改销售订单'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
......
src/views/mes/order/salesdetail/index.vue 0 → 100644
View file @ 05e879a4
<template>
<div class="form-page">
<div class="page-head">
<div class="page-title">{{ form.id ? '编辑销售订单' : '新增销售订单' }}</div>
<div class="head-btn">
<el-button size="mini" @click="onGoBack">返回</el-button>
<el-button type="primary" size="mini" :loading="loading" @click="onEdit">提交</el-button>
</div>
</div>
<div class="page-body">
<el-form :model="form" ref="form" :rules="rules" label-width="100px">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="订单编号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入 订单编号" clearable style="width: calc(100% - 100px);"/>
<el-button @click="onGenCode" style="width: 80px; margin-left: 20px" :disabled="!!form.id">生成</el-button>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" prop="clientId">
<el-select v-model="form.clientId" placeholder="请选择 客户" clearable filterable remote :remote-method="getClientList">
<el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="交货日期" prop="deliveryDate">
<el-date-picker v-model="form.deliveryDate" type="date" value-format="yyyy-MM-dd 23:59:59" placeholder="选择交货日期" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总金额" prop="amount">
<el-input-money v-model="form.amount" placeholder="请输入 总金额" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="跟单人" prop="merchandiser" clearable filterable remote :remote-method="getUserList">
<el-select v-model="form.merchandiser" placeholder="请选择 跟单人" filterable clearable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态" prop="state">
<el-select v-model="form.state" clearable placeholder="请选择订单状态">
<el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :offset="16" :span="8">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入 备注" show-word-limit maxlength="120" :rows="3"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="page-item">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="onShowEditDetail(null)"
v-hasPermi="['mes:md:client:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="onDeleteDetail"
v-hasPermi="['mes:md:client:remove']"
>删除
</el-button>
</el-col>
</el-row>
<el-dialog :visible="showEditDetail" :title="itemForm.id ? '修改订单产品' : '新增订单产品'" width="960px">
<el-form :model="itemForm" ref="itemForm" :rules="itemRules" label-width="100px">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="itemForm.itemName" readonly placeholder="请选择产品" clearable>
<el-button slot="append" icon="el-icon-search" @click="$refs['ItemSelectRef'].showFlag = true"/>
</el-input>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品编码" prop="itemName">
<el-input v-model="itemForm.itemCode" placeholder="请输入 产品编码" readonly/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="数量" prop="num">
<el-input v-model.number="itemForm.num" placeholder="请输入 数量" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="金额" prop="amount">
<el-input-money v-model="itemForm.amount" placeholder="请输入 金额" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="state">
<el-select v-model="itemForm.state" clearable placeholder="请选择订单状态">
<el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<template v-if="itemForm.specList">
<el-col v-for="(spec, i) in itemForm.specList" :span="12" :key="spec.specId">
<el-form-item :label="spec.specKey" :prop="'specList.' + i + '.specVal'" :rules="{required: true, message: '特性值不能为空', trigger: 'blur'}">
<el-input v-model="spec.specVal" clearable/>
</el-form-item>
</el-col>
</template>
</el-row>
</el-form>
<div slot="footer">
<el-button @click="showEditDetail = false">取消</el-button>
<el-button type="primary" @click="onEditDetail">确认</el-button>
</div>
</el-dialog>
<el-table :data="form.detailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"/>
<el-table-column label="产品名称" prop="itemName" width="200" show-overflow-tooltip/>
<el-table-column label="产品编码" prop="itemCode" width="200"/>
<el-table-column label="数量" prop="num" width="100"/>
<el-table-column label="金额" :formatter="r => this.formatMoney(r.amount)" width="150"/>
<el-table-column label="订单状态" prop="state" width="150">
<template slot-scope="{row}">
{{ dict.type.sales_order_state.find(item => item.value == row.state).label }}
</template>
</el-table-column>
<el-table-column label="其它特性">
<el-row v-if="row.specList" slot-scope="{row}">
<el-col class="spec-item" :span="12" v-for="spec in row.specList" :key="spec.id">
<span class="spec-key">{{ spec.specKey }}：</span>
<span class="spec-val">{{spec.specVal }}；</span>
</el-col>
</el-row>
</el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="{row}">
<el-button
v-hasPermi="['od:salesOrder:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="onShowEditDetail(row)"
>修改
</el-button>
<el-button
v-hasPermi="['od:salesOrder:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="onDeleteDetail(row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
import { addOrder, getOrder, updateOrder } from '@/api/mes/od/salesOrder'
import { listUser } from '@/api/system/user'
import { listClient } from '@/api/mes/md/client'
import { listSpec } from '@/api/mes/md/spec.js'
import ItemSelect from '@/components/itemSelect/single.vue'
import {genCode} from "@/api/system/autocode/rule"
import store from '@/store'
import router from '@/router'
export default {
components: {
ItemSelect
},
dicts: ['sales_order_state'],
data() {
return {
form: {
id: null,
remark: null,
orderNo: null,
clientId: null,
deliveryDate: null,
amount: null,
merchandiser: null,
state: null,
detailList: []
},
itemForm: {
itemId: null,
itemName: null,
itemCode: null,
num: null,
amount: null,
state: null,
specList: []
},
rules: {
orderNo: { required: true, message: '请输入订单编号', trigger: ['change'] },
clientId: { required: true, message: '请选择客户', trigger: ['change'] },
deliveryDate: { required: true, message: '请选择交货日期', trigger: ['change'] },
amount: { required: true, message: '请输入订单总金额', trigger: ['blur'] },
merchandiser: { required: true, message: '请选择更进入', trigger: ['change'] },
state: { required: true, message: '请选择订单状态', trigger: ['change'] }
},
itemRules: {
itemName: { required: true, message: '请选择产品名称', trigger: ['change'] },
itemCode: { required: true, message: '请选择产品编码', trigger: ['change'] },
num: { required: true, message: '请输入产品数量', trigger: ['blur'] },
amount: { required: true, message: '请输入产品金额', trigger: ['blur'] },
state: { required: true, message: '请选择产品状态', trigger: ['change'] }
},
ids: {},
clientList: [],
userList: [],
showEditDetail: false,
loading: false,
multiple: false
}
},
methods: {
onEdit() {
if (this.loading) return
this.loading = true
this.$refs.form.validate(valid => {
if (valid) {
let editOrder = this.form.id ? updateOrder : addOrder
editOrder(this.form).then(() => {
this.$message.success('操作成功')
this.$store.dispatch("tagsView/delView", this.$router.currentRoute)
this.onGoBack()
}).finally(() => this.loading = false)
} else {
this.loading = false
}
})
},
onEditDetail() {
this.showEditDetail = false
this.$refs.itemForm.validate(valid => {
if (valid) {
let index = this.form.detailList.indexOf(item => item.id === this.itemForm.id)
if (index != -1) {
this.form.detailList[index] = this.itemForm
} else {
this.form.detailList.push(this.itemForm)
}
}
})
},
onItemSelect(row) {
if (row != null) {
this.itemForm.itemId = row.itemId
this.itemForm.itemName = row.itemName
this.itemForm.itemCode = row.itemCode
listSpec({ itemId: row.itemId }).then(res => {
for (let itemSpec of res.rows) {
const itemSize = { specId: itemSpec.itemSpecId, specKey: itemSpec.spec, specVal: null }
this.itemForm.specList.push(itemSize)
}
}).finally(() => this.$forceUpdate())
}
},
onShowEditDetail(item) {
console.log(item)
this.showEditDetail = true
this.$refs.itemForm && this.$refs.itemForm.resetFields()
this.itemForm = item || { itemName: null, itemCode: null, num: null, amount: null, state: null, specList: [] }
},
onDeleteDetail(row) {
let { form } = this
this.$modal.confirm('是否确认删除？').then(() => {
let ids = row.itemId || this.ids
ids = (ids instanceof Array) ? ids : [ids]
for (let id of ids) {
let index = form.detailList.findIndex(item => item.itemId == id)
if (index != -1) {
form.detailList.splice(index, 1)
}
}
})
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
onGenCode() {
genCode('SALES_ORDER_CODE').then(response => {
this.form.orderNo = response;
});
},
onGoBack() {
this.$store.dispatch("tagsView/delView", this.$router.currentRoute)
this.$router.back()
},
getClientList(key) {
listClient({ clientName: key, pageNum: 1, pageSize: 100 }).then(res => this.clientList = res.rows)
},
getUserList(key) {
listUser({ nickName: key, pageNum: 1, pageSize: 100 }).then(res => this.userList = res.rows)
},
getDetail() {
let orderId = this.$route.query.id
if (orderId) {
getOrder(orderId).then(res => {
this.form = res.data
this.form.detailList = this.form.detailList || []
})
}
}
},
created() {
this.getDetail()
this.getUserList()
this.getClientList()
}
}
</script>
<style lang="scss" scoped>
.page-head {
border-bottom: 1px solid #dddddd;
box-shadow: 0 2px 2px #dddddd;
}
.page-title {
line-height: 80px;
text-align: center;
font-size: 18px;
font-weight: bold;
}
.head-btn {
margin: 0 20px 20px;
}
.page-body {
margin: 20px 40px;
}
.page-item {
margin: 20px 40px;
}
.spec-item {
line-height: 18px;
font-size: 12px;
}
.spec-key {
color: #99a9bf;
}
</style>
src/views/mes/proofing/components/ProogingProcess.vue
View file @ 05e879a4
...@@ -8,9 +8,15 @@ ...@@ -8,9 +8,15 @@
prop="linkType" prop="linkType"
align="center" align="center"
/> />
<el-table-column label="工作站" prop="workstationId" align="center" /> <el-table-column label="工作站" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" /> <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column v-if="mode != 'info'" label="操作" align="center" width="150"> <el-table-column
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
>
<template slot-scope="{ row, $index }"> <template slot-scope="{ row, $index }">
<el-button <el-button
type="text" type="text"
...@@ -42,7 +48,7 @@ ...@@ -42,7 +48,7 @@
v-dialogDrag v-dialogDrag
:visible.sync="showFlag" :visible.sync="showFlag"
width="800px" width="800px"
title="添加工序" title="工序修改"
> >
<el-form <el-form
ref="form" ref="form"
...@@ -54,75 +60,31 @@ ...@@ -54,75 +60,31 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="组件数量" prop="quantity"> <el-form-item label="工作站" prop="workstationId">
<el-input
type="number"
v-model="form.quantity"
placeholder="请输入组件数量"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计量单位" prop="unitOfMeasure">
<el-input
v-model="form.unitOfMeasure"
placeholder="请输入计量单位"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废百分比" prop="scrapPercentage">
<el-input
v-model="form.scrapPercentage"
placeholder="请输入报废百分比"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代组" prop="alternativeGroup">
<el-input
v-model="form.alternativeGroup"
placeholder="请输入替代组"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代优先级" prop="alternativePriorities">
<el-input
v-model="form.alternativePriorities"
placeholder="请输入替代优先级"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="策略" prop="alternativeStrategy">
<el-input <el-input
v-model="form.alternativeStrategy" v-model="form.workstationName"
placeholder="请输入策略" disabled
></el-input> placeholder="请选择工作站信息"
>
<el-button
slot="append"
icon="el-icon-search"
@click="handleWorkstationSelect"
></el-button>
</el-input>
<WorkstationSelect
ref="WorkstationSelect"
:processId="form.processId"
@onSelected="onWorkstationSelected"
></WorkstationSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="使用概率" prop="alternativeProbability"> <el-form-item label="标准工时" prop="quantity">
<el-input <el-input
v-model="form.alternativeProbability" type="number"
placeholder="请输入使用概率" v-model="form.quantity"
></el-input> placeholder="请输入标准工时"
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="BOM行备注" prop="bomItemRemark">
<el-input
v-model="form.bomItemRemark"
placeholder="请输入BOM行备注"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料备注" prop="itemRemark">
<el-input
v-model="form.itemRemark"
placeholder="请输入物料备注"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -139,9 +101,10 @@ ...@@ -139,9 +101,10 @@
<script> <script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue"; import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ProcessProd from "./ProcessProd.vue"; import ProcessProd from "./ProcessProd.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
export default { export default {
components: { ItemBomSelect, ProcessProd }, components: { ItemBomSelect, ProcessProd, WorkstationSelect },
inject: ['mode'], inject: ["mode"],
props: { props: {
bomList: { bomList: {
type: Array, type: Array,
...@@ -158,15 +121,9 @@ export default { ...@@ -158,15 +121,9 @@ export default {
rules: {}, rules: {},
/**表单初始化数据 */ /**表单初始化数据 */
form: { form: {
quantity: "", stdWorkingTime: "",
unitOfMeasure: "", workstationId: "",
scrapPercentage: "", workstationName: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
}, },
currentRow: {}, currentRow: {},
currentRowIndex: undefined, currentRowIndex: undefined,
...@@ -174,9 +131,9 @@ export default { ...@@ -174,9 +131,9 @@ export default {
}, },
methods: { methods: {
setList(rows) { setList(rows) {
this.tableData = rows.map(item => { this.tableData = rows.map((item) => {
item.processItemList = [] item.processItemList = [];
return item return item;
}); });
}, },
/** 更新工序的物料信息 */ /** 更新工序的物料信息 */
...@@ -199,6 +156,8 @@ export default { ...@@ -199,6 +156,8 @@ export default {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
this.showFlag = false; this.showFlag = false;
Object.assign(this.currentRow, this.form);
this.tableData.splice(this.currentRowIndex, 1, this.currentRow);
} }
}); });
}, },
...@@ -208,22 +167,27 @@ export default { ...@@ -208,22 +167,27 @@ export default {
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
quantity: "", stdWorkingTime: "",
unitOfMeasure: "", workstationId: "",
scrapPercentage: "", workstationName: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
}; };
}, },
/**重置组件状态 */ /**重置组件状态 */
resetState() { resetState() {
this.resetForm() this.resetForm();
this.tableData = [] this.tableData = [];
} },
// 查询工作站信息
handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true;
},
onWorkstationSelected(row) {
if (row != undefined && row != null) {
this.form.workstationId = row.workstationId;
this.form.workstationName = row.workstationName;
this.form.stdWorkingTime = row.stdWorkingTime;
}
},
}, },
}; };
</script> </script>
......
src/views/mes/proofing/proofingInfo.vue
View file @ 05e879a4
...@@ -259,7 +259,7 @@ export default { ...@@ -259,7 +259,7 @@ export default {
this.bomList = data.bomList; this.bomList = data.bomList;
// 设置组件数据 // 设置组件数据
this.$refs["ProogingBomRef"].tableData = data.bomList; this.$refs["ProogingBomRef"].tableData = data.bomList;
this.$refs["ProogingProcess"].tableData = data.processList; this.$refs["ProogingProcessRef"].tableData = data.processList;
}) })
.finally(() => { .finally(() => {
this.loading = false; this.loading = false;
......
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