Skip to content

M
mes-ui
Commit 08454e86 authored by hiyonx's avatar hiyonx
Browse files
Options

优化样式

parent 83a6bb39
Show whitespace changes
Inline Side-by-side
Showing with 279 additions and 87 deletions
src/api/mes/od/salesOrder.js
View file @ 08454e86
...@@ -17,6 +17,23 @@ export function getOrder(id) { ...@@ -17,6 +17,23 @@ export function getOrder(id) {
}) })
} }
// 查询销售订单详细
export function getSapInfo(id) {
return request({
url: '/od/salesOrder/getSapInfo/' + id,
method: 'get'
})
}
// 查询销售订单详细
export function syncSapData(sapData) {
return request({
url: '/od/salesOrder/syncSapInfo/',
method: 'post',
data: sapData
})
}
// 查询销售订单详细 // 查询销售订单详细
export function getOrderDetail(params) { export function getOrderDetail(params) {
return request({ return request({
......
src/components/ElInputAll/index.vue
View file @ 08454e86
<template> <template>
<div class="el-input-all"> <div class="el-input-all">
<el-input v-if="item.dataType === 1" v-model="value" :placeholder="'请输入' + item.name" clearable :disabled="!!item.relationField"/> <el-input v-if="item.dataType === 1" v-model="value" class="input-item" :placeholder="'请输入' + item.name" clearable :disabled="!!item.relationField"/>
<el-input-number v-if="item.dataType === 2" v-model="value" :placeholder="'请输入' + item.name" clearable :disabled="!!item.relationField"/> <el-input-number v-if="item.dataType === 2" v-model="value" class="input-item" :placeholder="'请输入' + item.name" clearable :disabled="!!item.relationField"/>
<el-input-money v-if="item.dataType === 3" v-model="value" :placeholder="'请输入' + item.name" clearable :disabled="!!item.relationField"/> <el-input-money v-if="item.dataType === 3" v-model="value" class="input-item" :placeholder="'请输入' + item.name" clearable :disabled="!!item.relationField"/>
<el-date-picker v-if="item.dataType === 4" v-model="value" :placeholder="'请选择' + item.name" clearable :disabled="!!item.relationField" type="date"/> <el-date-picker v-if="item.dataType === 4" v-model="value" class="input-item" :placeholder="'请选择' + item.name" clearable :disabled="!!item.relationField" type="date"/>
<el-time-picker v-if="item.dataType === 5" v-model="value" :placeholder="'请选择' + item.name" clearable :disabled="!!item.relationField"/> <el-time-picker v-if="item.dataType === 5" v-model="value" class="input-item" :placeholder="'请选择' + item.name" clearable :disabled="!!item.relationField"/>
<el-date-picker v-if="item.dataType === 6" v-model="value" :placeholder="'请选择' + item.name" clearable :disabled="!!item.relationField" type="datetime"/> <el-date-picker v-if="item.dataType === 6" v-model="value" class="input-item" :placeholder="'请选择' + item.name" clearable :disabled="!!item.relationField" type="datetime"/>
<el-select v-if="item.dataType === 7" v-model="value" :placeholder="'请选择' + item.name" clearable filterable :disabled="!!item.relationField"> <el-select v-if="item.dataType === 7" v-model="value" class="input-item" :placeholder="'请选择' + item.name" clearable filterable :disabled="!!item.relationField">
<el-option v-for="option in item.dictDataList" :key="option.id" :value="option.value" :label="option.name"/> <el-option v-for="option in item.dictDataList" :key="option.id" :value="option.value" :label="option.name"/>
</el-select> </el-select>
</div> </div>
...@@ -45,5 +45,7 @@ export default { ...@@ -45,5 +45,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.input-item {
width: 100%;
}
</style> </style>
src/components/SapPropertyData/index.vue
View file @ 08454e86
<template> <template>
<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="130px" size="mini">
<el-row class="form-wrap" :gutter="gutter"> <el-row class="form-wrap" :gutter="gutter">
<div> <div>
<template v-for="(sapProperties, key) in sapPropertyMap"> <template v-for="(sapProperties, key) in sapPropertyMap">
......
src/views/mes/md/client/components/AddrInfo.vue
View file @ 08454e86
...@@ -23,18 +23,6 @@ ...@@ -23,18 +23,6 @@
show-word-limit v-model="form.address" placeholder="请输入客户送货地址"/> show-word-limit v-model="form.address" placeholder="请输入客户送货地址"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item
label="客户工作时间"
prop="clientWorkTime"
:label-width="labelWidth"
>
<el-input
v-model="form.clientWorkTime"
placeholder="请输入客户工作时间"
/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="城市" prop="city" :label-width="labelWidth"> <el-form-item label="城市" prop="city" :label-width="labelWidth">
<el-input v-model="form.city" placeholder="请输入城市"/> <el-input v-model="form.city" placeholder="请输入城市"/>
......
src/views/mes/md/client/index.vue
View file @ 08454e86
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
/> />
<!-- 添加或修改客户对话框 --> <!-- 添加或修改客户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px"> <el-dialog :title="title" :visible.sync="open" width="1200px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
<el-tab-pane label="催货款通知邮箱" name="UrgeEmail"> <el-tab-pane label="催货款通知邮箱" name="UrgeEmail">
<UrgeEmail ref="UrgeEmail" :clientId="form.clientId"/> <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" :clientId="form.clientId"/> <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">
......
src/views/mes/order/purchase/index.vue
View file @ 08454e86
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible="showSpec" title="采购详情产品特性值" width="650px"> <el-dialog :visible.sync="showSpec" title="采购详情产品特性值" width="650px">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12" v-for="spec in specList" :key="spec.specKey"> <el-col :span="12" v-for="spec in specList" :key="spec.specKey">
...@@ -229,6 +229,7 @@ export default { ...@@ -229,6 +229,7 @@ export default {
this.multiple = !selection.length this.multiple = !selection.length
}, },
toSalesEdit(row) { toSalesEdit(row) {
if (row.state != 0) return this.$message.error("该采购单单已生成销售订单")
let id = row ? row.id : this.ids[0] let id = row ? row.id : this.ids[0]
this.$router.push('/order/sales/detail?purchaseId=' + id) this.$router.push('/order/sales/detail?purchaseId=' + id)
}, },
......
src/views/mes/order/salesdetail/index.vue
View file @ 08454e86
...@@ -8,161 +8,161 @@ ...@@ -8,161 +8,161 @@
</div> </div>
</div> </div>
<div class="page-body"> <div class="page-body">
<el-form :model="form" ref="form" :rules="rules" label-width="130px"> <el-form :model="form" ref="form" :rules="rules" label-width="120px" size="mini">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="6">
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入 订单编号" clearable style="width: calc(100% - 100px);"/> <el-input v-model="form.orderNo" placeholder="请输入 订单编号" clearable style="width: calc(100% - 90px);"/>
<el-button @click="onGenCode" style="width: 80px; margin-left: 20px" :disabled="!!form.id">生成</el-button> <el-button @click="onGenCode" style="width: 80px; margin-left: 10px" :disabled="!!form.id">生成</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="订单销售类型" prop="typeNo"> <el-form-item label="销售类型" prop="typeNo">
<el-select v-model="form.typeNo" clearable placeholder="请选择 订单销售类型"> <el-select v-model="form.typeNo" class="form-item" clearable placeholder="请选择 订单销售类型">
<el-option v-for="item in saleType" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleType" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="销售组织" prop="orgNo"> <el-form-item label="销售组织" prop="orgNo">
<el-select v-model="form.orgNo" clearable placeholder="请选择 销售组织"> <el-select v-model="form.orgNo" class="form-item" clearable placeholder="请选择 销售组织">
<el-option v-for="item in saleOrg" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleOrg" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="分销渠道" prop="channelNo"> <el-form-item label="分销渠道" prop="channelNo">
<el-select v-model="form.channelNo" clearable placeholder="请选择 分销渠道"> <el-select v-model="form.channelNo" class="form-item" clearable placeholder="请选择 分销渠道">
<el-option v-for="item in saleChannel" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleChannel" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="订单原因" prop="reasonNo"> <el-form-item label="订单原因" prop="reasonNo">
<el-select v-model="form.reasonNo" clearable placeholder="请选择 订单原因"> <el-select v-model="form.reasonNo" class="form-item" clearable placeholder="请选择 订单原因">
<el-option v-for="item in saleReason" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleReason" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="销售办事处" prop="agencyNo"> <el-form-item label="销售办事处" prop="agencyNo">
<el-select v-model="form.agencyNo" clearable placeholder="请选择 销售办事处"> <el-select v-model="form.agencyNo" class="form-item" clearable placeholder="请选择 销售办事处">
<el-option v-for="item in saleOffice" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleOffice" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="销售小组" prop="groupNo"> <el-form-item label="销售小组" prop="groupNo">
<el-select v-model="form.groupNo" clearable placeholder="请选择 销售小组"> <el-select v-model="form.groupNo" class="form-item" clearable placeholder="请选择 销售小组">
<el-option v-for="item in saleGroup" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleGroup" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="客户编号" prop="clientNo"> <el-form-item label="客户编号" prop="clientNo">
<el-select v-model="form.clientId" placeholder="请选择 客户" clearable filterable remote :remote-method="getClientList"> <el-select v-model="form.clientId" class="form-item" placeholder="请选择 客户" clearable filterable remote :remote-method="getClientList">
<el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientCode"/> <el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientCode"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="客户名称" prop="clientId"> <el-form-item label="客户名称" prop="clientId">
<el-select v-model="form.clientId" placeholder="请选择 客户" clearable filterable remote :remote-method="getClientList"> <el-select v-model="form.clientId" class="form-item" placeholder="请选择 客户" clearable filterable remote :remote-method="getClientList">
<el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientName"/> <el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientName"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="客户采购订单号" prop="purchaseNo"> <el-form-item label="客户采购单号" prop="purchaseNo">
<el-input v-model="form.purchaseNo" placeholder="请输入客户订单号"/> <el-input v-model="form.purchaseNo" placeholder="请输入 客户采购单号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="销售币别" prop="currencyNo"> <el-form-item label="销售币别" prop="currencyNo">
<el-select v-model="form.currencyNo" clearable placeholder="请选择 销售币别"> <el-select v-model="form.currencyNo" class="form-item" clearable placeholder="请选择 销售币别">
<el-option v-for="item in saleCurrency" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleCurrency" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="要求交货期" prop="deliveryDate"> <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-date-picker v-model="form.deliveryDate" class="form-item" type="date" value-format="yyyyMMdd" placeholder="选择交货日期" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="国际贸易条款" prop="clauseNo"> <el-form-item label="贸易条款" prop="clauseNo">
<el-select v-model="form.clauseNo" clearable placeholder="请选择 国际贸易条款"> <el-select v-model="form.clauseNo" class="form-item" clearable placeholder="请选择 国际贸易条款">
<el-option v-for="item in saleClause" :key="item.code" :value="item.code" :label="item.name"/> <el-option v-for="item in saleClause" :key="item.code" :value="item.code" :label="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="国际贸易条款地址" prop="clauseAddr"> <el-form-item label="条款地址" prop="clauseAddr">
<el-input v-model="form.clauseAddr" placeholder="请输入国际贸易条款地址"/> <el-input v-model="form.clauseAddr" placeholder="请输入国际贸易条款地址"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" title="凭证货币中销售订单的"> <el-col :span="6" title="凭证货币中销售订单的">
<el-form-item label="净值" prop="netValue"> <el-form-item label="净值" prop="netValue">
<el-input v-model="form.netValue" placeholder="请输入凭证货币中销售订单的净值"/> <el-input v-model="form.netValue" placeholder="请输入凭证货币中销售订单的净值"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="发货方式" prop="despatchType"> <el-form-item label="发货方式" prop="despatchType">
<el-select v-model="form.despatchType" placeholder="请选择发货方式"> <el-select v-model="form.despatchType" class="form-item" placeholder="请选择发货方式">
<el-option label="款到发货" value="1"/> <el-option label="款到发货" value="1"/>
<el-option label="款到生产" value="2"/> <el-option label="款到生产" value="2"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="条码" prop="barCode"> <el-form-item label="条码" prop="barCode">
<el-input v-model="form.barCode" placeholder="请输入条码"/> <el-input v-model="form.barCode" placeholder="请输入条码"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="加急" prop="urgent"> <el-form-item label="加急" prop="urgent">
<el-select v-model="form.urgent" placeholder="请选择加急"> <el-select v-model="form.urgent" class="form-item" placeholder="请选择加急">
<el-option label="加急" value="1"/> <el-option label="加急" value="1"/>
<el-option label="不加急" value="0"/> <el-option label="不加急" value="0"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="osp订单号" prop="ospNo"> <el-form-item label="osp订单号" prop="ospNo">
<el-input v-model="form.ospNo" placeholder="请输入osp订单号"/> <el-input v-model="form.ospNo" placeholder="请输入osp订单号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="总金额" required> <el-form-item label="总金额" required>
<el-input-money v-model="totalAmount" placeholder="请输入 总金额" readonly/> <el-input type="number" v-model="totalAmount" placeholder="请输入 总金额" readonly/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="跟单人" prop="merchandiser" clearable filterable remote :remote-method="getUserList"> <el-form-item label="跟单人" prop="merchandiser" clearable filterable remote :remote-method="getUserList">
<el-select v-model="form.merchandiser" placeholder="请选择 跟单人" filterable clearable> <el-select v-model="form.merchandiser" class="form-item" placeholder="请选择 跟单人" filterable clearable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/> <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.userId"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="客户采购订单日期" prop="purchaseDate"> <el-form-item label="采购订单日期" prop="purchaseDate">
<el-date-picker clearable v-model="form.purchaseDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择客户采购订单日期"/> <el-date-picker v-model="form.purchaseDate" class="form-item" type="date" value-format="yyyyMMdd" placeholder="请选择客户采购订单日期" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="客户定制信息" prop="custom"> <el-form-item label="客户定制信息" prop="custom">
<el-input v-model="form.custom" placeholder="请输入客户定制信息"/> <el-input v-model="form.custom" placeholder="请输入客户定制信息"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="订单状态" prop="state"> <el-form-item label="订单状态" prop="state">
<el-select v-model="form.state" clearable placeholder="请选择订单状态"> <el-select v-model="form.state" class="form-item" clearable placeholder="请选择订单状态">
<el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/> <el-option v-for="item in dict.type.sales_order_state" :key="item.value" :label="item.label" :value="item.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :offset="8" :span="16"> <el-col :offset="12" :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入 备注" show-word-limit maxlength="120" :rows="3"/> <el-input type="textarea" v-model="form.remark" placeholder="请输入 备注" show-word-limit maxlength="120" :rows="3"/>
</el-form-item> </el-form-item>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
v-hasPermi="['od:salesOrder:edit']" v-hasPermi="['od:salesOrder:edit']"
size="mini" size="mini"
type="text" type="text"
@click="onShowSpecDetail(row)" @click="onShowSpecDetail(row, $index)"
>特性 >特性
</el-button> </el-button>
</template> </template>
...@@ -262,7 +262,145 @@ ...@@ -262,7 +262,145 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="SAP特性" name="SapPropertyData"> <el-tab-pane label="SAP特性" name="SapPropertyData">
<SapPropertyData ref="SapPropertyData" :span="6"/> <div style="margin: 10px"><el-button icon="el-icon-upload" size="mini" @click="onSyncSapData">上传</el-button></div>
<el-form :model="sapInfo" label-width="120px" size="mini">
<el-row :gutter="10">
<el-col :span="6"><el-form-item label="销售凭证"><el-input v-model="sapInfo.VBELN" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="销售凭证类型"><el-input v-model="sapInfo.AUART" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="销售组织"><el-input v-model="sapInfo.VKORG" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="分销渠道"><el-input v-model="sapInfo.VTWEG" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="产品组"><el-input v-model="sapInfo.SPART" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="订单原因"><el-input v-model="sapInfo.AUGRU" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="销售办事处"><el-input v-model="sapInfo.VKBUR" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="销售组"><el-input v-model="sapInfo.VKGRP" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="客户编号"><el-input v-model="sapInfo.KUNNR" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="客户参考"><el-input v-model="sapInfo.BSTNK" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="要求的交货日期"><el-input v-model="sapInfo.VDATU" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="客户参考日期"><el-input v-model="sapInfo.BSTDK" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="国际贸易条款"><el-input v-model="sapInfo.INCO1" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="国际贸易位置"><el-input v-model="sapInfo.INCO2" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="付款条件代码"><el-input v-model="sapInfo.ZTERM" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="记录创建日期"><el-input v-model="sapInfo.ERDAT" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="备注"><el-input v-model="sapInfo.LTEXT" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="跟单员"><el-input v-model="sapInfo.ZKUNR" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="生产发货方式"><el-input v-model="sapInfo.ZF14" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="条码"><el-input v-model="sapInfo.ZBARDE" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="申购号"><el-input v-model="sapInfo.ZPONUM" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="款式"><el-input v-model="sapInfo.ZSTYLE" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="OSP订单号"><el-input v-model="sapInfo.ZOSP" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="交货冻结"><el-input v-model="sapInfo.LIFSK" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="开票冻结"><el-input v-model="sapInfo.FAKSK" placeholder="" clearable/></el-form-item></el-col>
<el-col :span="6"><el-form-item label="更新标识"><el-input v-model="sapInfo.UPDKZ" placeholder="" clearable/></el-form-item></el-col>
</el-row>
</el-form>
<el-form :model="sapInfo">
<div class="sap-info-items-wrap">
<div class="sap-info-items clearfix">
<div class="items-head clearfix">
<div class="item-head">物料编号</div>
<div class="item-head">工厂</div>
<div class="item-head">以销售单位表示的累计订购数量</div>
<div class="item-head">客户物料编号</div>
<div class="item-head">客户物料名称</div>
<div class="item-head">折扣率（Z001的金额）</div>
<div class="item-head">装运点/收货点</div>
<div class="item-head">存储地点</div>
<div class="item-head">批次编号</div>
<div class="item-head">计划行日期</div>
<div class="item-head">拒绝原因</div>
<div class="item-head">工厂单价（PR01的金额）</div>
<div class="item-head">订单行折前总金额（Z002的定价值）</div>
<div class="item-head">定价单位</div>
<div class="item-head">货币</div>
<div class="item-head">尺码组</div>
<div class="item-head">尺码单位（客户）</div>
<div class="item-head">指令号</div>
<div class="item-head">型体号</div>
<div class="item-head">配色号</div>
<div class="item-head">颜色</div>
<div class="item-head">销线</div>
<div class="item-head">段别</div>
<div class="item-head">季度</div>
<div class="item-head">整/半码</div>
<div class="item-head">特殊SIZE</div>
<div class="item-head">PO#</div>
<div class="item-head">WIP#</div>
<div class="item-head">装箱数</div>
<div class="item-head">产地</div>
<div class="item-head">周期</div>
<div class="item-head">SK编号</div>
<div class="item-head">专利号</div>
<div class="item-head">材质描述</div>
<div class="item-head">签收人</div>
<div class="item-head">SHIP TO ID</div>
<div class="item-head">产品规格</div>
<div class="item-head">产品用途</div>
<div class="item-head">厚度（丝）</div>
<div class="item-head">包装方式</div>
<div class="item-head">印刷方向</div>
<div class="item-head">工厂代号</div>
<div class="item-head">指令数(客户)汇总</div>
<div class="item-head">LOSS数(客户)汇总</div>
<div class="item-head">SIZE 序号</div>
<div class="item-head">尺码</div>
<div class="item-head">指令数(客户)</div>
<div class="item-head">LOSS数(客户)</div>
<div class="item-head">尺码备注</div>
</div>
<div v-for="(item, i) in sapInfo.ITEM" class="items-body clearfix" :key="'item' + i">
<div><el-form-item label=""><el-input v-model="item.MATNR" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.WERKS" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.KWMENG" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.KDMAT" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ARKTX" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZLOSSUM" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.NETPR" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.VSTEL" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.LGORT" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.CHARG" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.EDATU" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.NETWR" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.KWERT" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.KPEIN" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.KOEIN" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ABGRU" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSIZEGROUP" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSIZEUNITC" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZINSTNUM" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZMOLD" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZMAPCOLOR" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZCLOLOR" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSALEAREA" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZDUANBIE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSEASON" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZTOTALSIZE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSPECSIZE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZCPONUM" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZWIPNUM" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZBOXQUAN" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZORIGIN" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZCYCLE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSKCODE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZPATENTCODE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZMATERIALDES" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSIGNPERSON" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZSHIPID" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZPRODSPEC" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZPRODUSAGE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZTHICK" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZPACKINGMOT" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZPRINTDIRECT" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZPLANTCODE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-model="item.ZINCSUM" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-if="item[0]" v-model="item[0].ZSIZE_NUM" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-if="item[0]" v-model="item[0].ZSIZE" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-if="item[0]" v-model="item[0].ZINSNUM" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-if="item[0]" v-model="item[0].ZLOSSC" placeholder="" clearable/></el-form-item></div>
<div><el-form-item label=""><el-input v-if="item[0]" v-model="item[0].ZSIZECOM" placeholder="" clearable/></el-form-item></div>
</div>
</div>
</div>
</el-form>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -496,7 +634,9 @@ ...@@ -496,7 +634,9 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="" label="状态"> <el-form-item prop="" label="状态">
<el-input v-model="itemForm.state" placeholder="" clearable/> <el-select v-model="itemForm.state" class="form-item" 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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -512,13 +652,14 @@ ...@@ -512,13 +652,14 @@
<el-row> <el-row>
<el-col v-for="item in specForm.specList" :key="item.id" :span="12"> <el-col v-for="item in specForm.specList" :key="item.id" :span="12">
<el-form-item :label="item.specKey"> <el-form-item :label="item.specKey">
<el-input v-model="item.specVal" readonly/> <el-input v-model="item.specVal"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button @click="showSpecDetail = false">取消</el-button> <el-button @click="showSpecDetail = false">取消</el-button>
<el-button @click="onEditSpec">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -527,11 +668,10 @@ ...@@ -527,11 +668,10 @@
</template> </template>
<script> <script>
import { addOrder, getOrder, updateOrder } from '@/api/mes/od/salesOrder' import { addOrder, getOrder, getSapInfo, syncSapData, updateOrder } from '@/api/mes/od/salesOrder'
import { getSalesOrder } from '@/api/mes/od/purchaseOrder' import { getSalesOrder } from '@/api/mes/od/purchaseOrder'
import { listUser } from '@/api/system/user' import { listUser } from '@/api/system/user'
import { listClient } from '@/api/mes/md/client' import { listClient } from '@/api/mes/md/client'
import { listSpec } from '@/api/mes/md/spec.js'
import ItemSelect from '@/components/itemSelect/single.vue' import ItemSelect from '@/components/itemSelect/single.vue'
import { genCode } from '@/api/system/autocode/rule' import { genCode } from '@/api/system/autocode/rule'
...@@ -550,6 +690,7 @@ export default { ...@@ -550,6 +690,7 @@ export default {
}, },
data() { data() {
return { return {
sapInfo: {},
form: { form: {
id: null, id: null,
purchaseNo: null, purchaseNo: null,
...@@ -671,9 +812,6 @@ export default { ...@@ -671,9 +812,6 @@ export default {
} }
}, },
methods: { methods: {
onTabClick() {
if (this.activeName == 'SapPropertyData') this.$refs.SapPropertyData.init(3, null, this.form.id, this.form)
},
onEdit() { onEdit() {
if (this.loading) return if (this.loading) return
this.loading = true this.loading = true
...@@ -684,6 +822,7 @@ export default { ...@@ -684,6 +822,7 @@ export default {
this.loading = false this.loading = false
return this.$message.error(msg) return this.$message.error(msg)
} }
this.form.amount = this.totalAmount
let editOrder = this.form.id ? updateOrder : addOrder let editOrder = this.form.id ? updateOrder : addOrder
editOrder(this.form).then(() => { editOrder(this.form).then(() => {
this.$message.success('操作成功') this.$message.success('操作成功')
...@@ -702,6 +841,10 @@ export default { ...@@ -702,6 +841,10 @@ export default {
this.itemForm.itemName = row.itemName; this.itemForm.itemName = row.itemName;
} }
}, },
onEditSpec() {
this.showSpecDetail = false
this.form.detailList.splice(this.specForm.index, 1, this.specForm)
},
onEditDetail() { onEditDetail() {
this.showEditDetail = false this.showEditDetail = false
...@@ -721,10 +864,11 @@ export default { ...@@ -721,10 +864,11 @@ export default {
} }
return null return null
}, },
onShowSpecDetail(row) { onShowSpecDetail(row, index) {
console.log(row) console.log(row)
this.showSpecDetail = true this.showSpecDetail = true
this.specForm = row this.specForm = row
this.specForm.index = index
}, },
...@@ -755,6 +899,9 @@ export default { ...@@ -755,6 +899,9 @@ export default {
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
onSyncSapData() {
syncSapData(this.sapInfo).then(res => res)
},
onGenCode() { onGenCode() {
genCode('SALES_ORDER').then(response => { genCode('SALES_ORDER').then(response => {
this.form.orderNo = response this.form.orderNo = response
...@@ -773,6 +920,11 @@ export default { ...@@ -773,6 +920,11 @@ export default {
getUserList(key) { getUserList(key) {
listUser({ nickName: key, pageNum: 1, pageSize: 100 }).then(res => this.userList = res.rows) listUser({ nickName: key, pageNum: 1, pageSize: 100 }).then(res => this.userList = res.rows)
}, },
onTabClick() {
if (this.activeName == 'SapPropertyData') getSapInfo(this.form.id).then(res => {
this.sapInfo = JSON.parse(res.data)
})
},
getDetail() { getDetail() {
let { id: orderId, purchaseId } = this.$route.query let { id: orderId, purchaseId } = this.$route.query
if (orderId) { if (orderId) {
...@@ -872,7 +1024,7 @@ export default { ...@@ -872,7 +1024,7 @@ export default {
} }
.page-title { .page-title {
line-height: 80px; line-height: 50px;
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
...@@ -903,5 +1055,37 @@ export default { ...@@ -903,5 +1055,37 @@ export default {
margin-bottom: 50px; margin-bottom: 50px;
} }
.sap-info-items-wrap {
overflow: auto;
width: 100%;
max-height: 800px;
}
.items-head {
width: max-content;
}
.items-head div {
width: 150px;
float: left;
height: 40px;
font-size: 14px;
overflow: hidden;
margin-right: 10px;
}
.items-body {
width: max-content;
}
.items-body div {
width: 150px;
float: left;
margin-right: 10px;
}
.form-item {
width: 100%;
}
</style> </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