Skip to content

P
pda-ui
Commit 87dcc0fb authored by hiyonx's avatar hiyonx
Browse files
Options

销售订单功能完善

parent 6ce827a7
Show whitespace changes
Inline Side-by-side
Showing with 419 additions and 185 deletions
src/components/SapPropertyData/index.vue
View file @ 87dcc0fb
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<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">
<div>
<template v-for="(sapProperties, key) in sapPropertyMap"> <template v-for="(sapProperties, key) in sapPropertyMap">
<div class="separator">{{ getViewTypeName(key) }}</div> <div class="separator">{{ getViewTypeName(key) }}</div>
<template v-for="item in sapProperties"> <template v-for="item in sapProperties">
...@@ -13,6 +14,7 @@ ...@@ -13,6 +14,7 @@
</el-col> </el-col>
</template> </template>
</template> </template>
</div>
</el-row> </el-row>
<div class="footer"> <div class="footer">
......
src/views/mes/order/sales/index.vue
View file @ 87dcc0fb
...@@ -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() {
if (this.userList.length) return
listUser().then(res => this.userList = res.rows)
}, },
onShowDetail(row) { getUserList(nickName) {
if (!row.detailList.length) { listUser({nickName, pageNum: 1, pageSize: 100}).then(res => this.userList = res.rows)
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 @ 87dcc0fb
<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>
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