yinq
/
zs_aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 订单BOM、生产BOM

Browse Source
master
yinq 2 years ago
parent 9d5623032b
commit dbc0f5c69a
8 changed files with 163 additions and 115 deletions
Show Stats Download Patch File Download Diff File

9
src/api/production/baseBomInfo.js
Unescape Escape View File

@ -9,6 +9,15 @@ export function listBaseBomInfo(query) {
}) })
} }
// 自动同步生产BOM
export function addAutomaticSynchronizationBOM(query) {
return request({
url: '/production/baseBomInfo/addAutomaticSynchronizationBOM',
method: 'get',
params: query,
timeout: 60000
})
}
// 查询生产BOM列表 // 查询生产BOM列表
export function listTreeBaseBomInfo(query) { export function listTreeBaseBomInfo(query) {
return request({ return request({

30
src/views/base/materialInfo/index.vue
Unescape Escape View File

@ -29,8 +29,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物料类型" prop="materialType"> <el-form-item label="SAP物料类型" prop="materialType">
<el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable> <el-select v-model="queryParams.materialType" placeholder="请选择SAP物料类型" clearable>
<el-option <el-option
v-for="dict in dict.type.material_type" v-for="dict in dict.type.material_type"
:key="dict.value" :key="dict.value"
@ -71,7 +71,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['base:materialInfo:add']" v-hasPermi="['base:materialInfo:add']"
>新增</el-button> >手动新增物料</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -123,7 +123,7 @@
<dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/> <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[5].visible"> <el-table-column label="SAP物料类型" align="center" prop="materialType" v-if="columns[5].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/> <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
</template> </template>
@ -164,13 +164,13 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['base:materialInfo:edit']" v-hasPermi="['base:materialInfo:edit']"
>修改</el-button> >修改</el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['base:materialInfo:remove']" <!-- v-hasPermi="['base:materialInfo:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -212,8 +212,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物料类型" prop="materialType"> <el-form-item label="SAP物料类型" prop="materialType">
<el-select v-model="form.materialType" placeholder="请选择物料类型"> <el-select v-model="form.materialType" placeholder="请选择SAP物料类型">
<el-option <el-option
v-for="dict in dict.type.material_type" v-for="dict in dict.type.material_type"
:key="dict.value" :key="dict.value"
@ -337,10 +337,10 @@ export default {
{ key: 2, label: `物料名称`, visible: true }, { key: 2, label: `物料名称`, visible: true },
{ key: 3, label: `物料大类`, visible: true }, { key: 3, label: `物料大类`, visible: true },
{ key: 4, label: `物料小类`, visible: true }, { key: 4, label: `物料小类`, visible: true },
{ key: 5, label: `物料类型`, visible: true }, { key: 5, label: `SAP物料类型`, visible: true },
{ key: 6, label: `计量单位`, visible: true }, { key: 6, label: `计量单位`, visible: true },
{ key: 7, label: `MATKL`, visible: true }, { key: 7, label: `MATKL`, visible: true },
{ key: 8, label: `物料规格`, visible: true }, { key: 8, label: `物料规格`, visible: false },
{ key: 9, label: `所属工厂`, visible: true }, { key: 9, label: `所属工厂`, visible: true },
{ key: 10, label: `产线工位`, visible: false }, { key: 10, label: `产线工位`, visible: false },
{ key: 11, label: `启用标识`, visible: false }, { key: 11, label: `启用标识`, visible: false },

3
src/views/base/orderBomInfo/addBom.vue
Unescape Escape View File

@ -99,6 +99,7 @@ import {
addOrderBomInfo, addOrderBomInfo,
updateOrderBomInfo updateOrderBomInfo
} from '@/api/base/orderBomInfo' } from '@/api/base/orderBomInfo'
import { listMaterialInfo } from '@//api/base/materialInfo'
export default { export default {
name: 'OrderBomInfo', name: 'OrderBomInfo',
@ -176,7 +177,7 @@ export default {
/** 查询订单BOM列表 */ /** 查询订单BOM列表 */
getList() { getList() {
this.loading = true this.loading = true
listOrderBomInfo(this.queryParams).then(response => { listMaterialInfo(this.queryParams).then(response => {
this.orderBomInfoList = response.rows this.orderBomInfoList = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false

118
src/views/base/orderBomInfo/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<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" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<!-- <el-form-item label="BOM编号" prop="bomCode">--> <!-- <el-form-item label="BOM编号" prop="bomCode">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.bomCode"--> <!-- v-model="queryParams.bomCode"-->
@ -9,31 +9,39 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="子物料编号" prop="materialCode">
<el-input <el-input
v-model="queryParams.materialCode" v-model="queryParams.materialCode"
placeholder="请输入物料编码" placeholder="请输入子物料编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="子物料名称" prop="materialName">
<el-input <el-input
v-model="queryParams.materialName" v-model="queryParams.materialName"
placeholder="请输入物料名称" placeholder="请输入子物料名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料类别" prop="materialType"> <el-form-item label="子物料小类" prop="materialType">
<el-select v-model="queryParams.materialType" placeholder="请选择物料类别" clearable> <el-select v-model="queryParams.materialType" placeholder="请选择子物料小类" clearable>
<el-option <el-option
v-for="dict in dict.type.material_type" v-for="dict in dict.type.material_subclass"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
<el-form-item label="父物料编号" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入父物料编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</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>
@ -50,7 +58,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['base:orderBomInfo:add']" v-hasPermi="['base:orderBomInfo:add']"
>新增 >手动新增BOM
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -95,21 +103,27 @@
<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="objId" v-if="columns[0].visible"/> <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/> <el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[2].visible"> <el-table-column label="子物料编号" align="center" prop="materialCode" v-if="columns[2].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/base/bom-info/index/' + scope.row.materialCode" class="link-type"> <router-link :to="'/base/bom-info/index/' + scope.row.materialCode" class="link-type">
<span>{{ scope.row.materialCode }}</span> <span>{{ scope.row.materialCode }}</span>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible"/> <el-table-column label="子物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
<el-table-column label="物料类别" align="center" prop="materialType" v-if="columns[4].visible"> <el-table-column label="子物料小类" align="center" prop="materialType" v-if="columns[4].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/> <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/> <el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
<el-table-column label="父级编号" align="center" prop="parentId" v-if="columns[6].visible"/> <el-table-column label="父级物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>
<el-table-column label="父级物料名称" align="center" prop="parentName" v-if="columns[16].visible"/>
<el-table-column label="父级物料小类" align="center" prop="parentMaterialType" v-if="columns[17].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_subclass" :value="scope.row.parentMaterialType"/>
</template>
</el-table-column>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible"/> <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible"/>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/> <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible"> <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible">
@ -137,14 +151,14 @@
v-hasPermi="['base:orderBomInfo:edit']" v-hasPermi="['base:orderBomInfo:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['base:orderBomInfo:remove']" <!-- v-hasPermi="['base:orderBomInfo:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -159,31 +173,31 @@
<!-- 添加或修改订单BOM对话框 --> <!-- 添加或修改订单BOM对话框 -->
<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="100px">
<el-form-item label="BOM编号" prop="bomCode"> <!-- <el-form-item label="BOM编号" prop="bomCode">-->
<el-input v-model="form.bomCode" placeholder="请输入BOM编号"/> <!-- <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="子物料编号" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料编码"/> <el-input v-model="form.materialCode" placeholder="请输入子物料编号"/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称"/>
</el-form-item>
<el-form-item label="物料类别" prop="materialType">
<el-select v-model="form.materialType" placeholder="请选择物料类别">
<el-option
v-for="dict in dict.type.material_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="子物料名称" prop="materialName">-->
<!-- <el-input v-model="form.materialName" placeholder="请输入子物料名称"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="子物料小类" prop="materialType">-->
<!-- <el-select v-model="form.materialType" placeholder="请选择子物料小类">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.material_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="标准数量" prop="standardAmount"> <el-form-item label="标准数量" prop="standardAmount">
<el-input v-model="form.standardAmount" placeholder="请输入标准数量"/> <el-input v-model="form.standardAmount" placeholder="请输入标准数量"/>
</el-form-item> </el-form-item>
<el-form-item label="父级编号" prop="parentId"> <el-form-item label="父级物料编号" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父级编号"/> <el-input v-model="form.parentId" placeholder="请输入父级物料编号"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="是否标识" prop="isFlag">--> <!-- <el-form-item label="是否标识" prop="isFlag">-->
<!-- <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>--> <!-- <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>-->
@ -220,7 +234,7 @@ import {
export default { export default {
name: 'OrderBomInfo', name: 'OrderBomInfo',
dicts: ['material_type'], dicts: ['material_type','material_subclass'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -248,7 +262,7 @@ export default {
bomCode: null, bomCode: null,
materialCode: null, materialCode: null,
materialName: null, materialName: null,
materialType: 'FERT', materialType: null,
standardAmount: null, standardAmount: null,
parentId: null, parentId: null,
isFlag: null, isFlag: null,
@ -267,12 +281,12 @@ export default {
rules: {}, rules: {},
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: false }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `BOM编号`, visible: true }, { key: 1, label: `BOM编号`, visible: false },
{ key: 2, label: `物料编码`, visible: true }, { key: 2, label: `子物料编号`, visible: true },
{ key: 3, label: `物料名称`, visible: true }, { key: 3, label: `子物料名称`, visible: true },
{ key: 4, label: `物料类别`, visible: true }, { key: 4, label: `子物料小类`, visible: true },
{ key: 5, label: `标准数量`, visible: true }, { key: 5, label: `标准数量`, visible: true },
{ key: 6, label: `父级编号`, visible: true }, { key: 6, label: `父级物料编号`, visible: true },
{ key: 7, label: `是否标识`, visible: false }, { key: 7, label: `是否标识`, visible: false },
{ key: 8, label: `创建人`, visible: false }, { key: 8, label: `创建人`, visible: false },
{ key: 9, label: `创建时间`, visible: false }, { key: 9, label: `创建时间`, visible: false },
@ -281,7 +295,9 @@ export default {
{ key: 12, label: `工厂编号`, visible: true }, { key: 12, label: `工厂编号`, visible: true },
{ key: 13, label: `排序`, visible: true }, { key: 13, label: `排序`, visible: true },
{ key: 14, label: `销售凭证`, visible: false }, { key: 14, label: `销售凭证`, visible: false },
{ key: 15, label: `销售单据项目`, visible: false } { key: 15, label: `销售单据项目`, visible: false },
{ key: 16, label: `父级物料名称`, visible: true },
{ key: 17, label: `父级物料小类`, visible: true }
] ]
} }
}, },

16
src/views/base/orderInfo/index.vue
Unescape Escape View File

@ -107,12 +107,12 @@
<dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/> <dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开始日期" align="center" prop="beginDate" width="180" v-if="columns[11].visible"> <el-table-column label="计划开始日期" align="center" prop="beginDate" width="180" v-if="columns[11].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束日期" align="center" prop="endDate" width="180" v-if="columns[12].visible"> <el-table-column label="计划结束日期" align="center" prop="endDate" width="180" v-if="columns[12].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
@ -221,20 +221,20 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="开始日期" prop="beginDate"> <el-form-item label="计划开始日期" prop="beginDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.beginDate" v-model="form.beginDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择开始日期"> placeholder="请选择计划开始日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束日期" prop="endDate"> <el-form-item label="计划结束日期" prop="endDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.endDate" v-model="form.endDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择结束日期"> placeholder="请选择计划结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="工厂编码" prop="factoryCode"> <el-form-item label="工厂编码" prop="factoryCode">
@ -341,8 +341,8 @@ export default {
{ key: 8, label: `完成数量`, visible: true }, { key: 8, label: `完成数量`, visible: true },
{ key: 9, label: `工单类型`, visible: true }, { key: 9, label: `工单类型`, visible: true },
{ key: 10, label: `工单状态`, visible: true }, { key: 10, label: `工单状态`, visible: true },
{ key: 11, label: `开始日期`, visible: true }, { key: 11, label: `计划开始日期`, visible: true },
{ key: 12, label: `结束日期`, visible: true }, { key: 12, label: `计划结束日期`, visible: true },
{ key: 13, label: `工厂编码`, visible: true }, { key: 13, label: `工厂编码`, visible: true },
{ key: 14, label: `启用标识`, visible: false }, { key: 14, label: `启用标识`, visible: false },
{ key: 15, label: `创建人`, visible: false }, { key: 15, label: `创建人`, visible: false },

30
src/views/production/baseBomInfo/childBom.vue
Unescape Escape View File

@ -60,13 +60,13 @@
<el-table-column label="物料名称" align="center" prop="materialName" /> <el-table-column label="物料名称" align="center" prop="materialName" />
<el-table-column label="物料类型" align="center" prop="materialType"> <el-table-column label="物料类型" align="center" prop="materialType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/> <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标准数量" align="center" prop="standardAmount" /> <el-table-column label="标准数量" align="center" prop="standardAmount" />
<!-- <el-table-column label="父物料编号" align="center" prop="parentId" />--> <!-- <el-table-column label="父物料编号" align="center" prop="parentId" />-->
<el-table-column label="工厂名称" align="center" prop="plantName" /> <el-table-column label="工厂名称" align="center" prop="plantName" />
<el-table-column label="产线/工位" align="center" prop="productLineName" /> <!-- <el-table-column label="产线/工位" align="center" prop="productLineName" />-->
<!-- <el-table-column label="是否标识" align="center" prop="isFlag">--> <!-- <el-table-column label="是否标识" align="center" prop="isFlag">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>--> <!-- <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
@ -135,7 +135,7 @@
<el-form-item label="物料类型" prop="materialType"> <el-form-item label="物料类型" prop="materialType">
<el-select v-model="form.materialType" placeholder="请选择物料类型"> <el-select v-model="form.materialType" placeholder="请选择物料类型">
<el-option <el-option
v-for="dict in dict.type.material_type" v-for="dict in dict.type.material_subclass"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -143,7 +143,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属工厂"> <el-form-item label="所属工厂">
<el-select v-model="form.plantCode" placeholder="请选择所属工厂" :disabled="true"> <el-select v-model="form.plantCode" placeholder="请选择所属工厂" >
<el-option <el-option
v-for="item in factoryList" v-for="item in factoryList"
:key="item.factoryCode" :key="item.factoryCode"
@ -152,16 +152,16 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="产线工位"> <!-- <el-form-item label="产线工位">-->
<el-select v-model="form.productLineCode" placeholder="请选择产线工位"> <!-- <el-select v-model="form.productLineCode" placeholder="请选择产线工位">-->
<el-option <!-- <el-option-->
v-for="item in productLineList" <!-- v-for="item in productLineList"-->
:key="item.productLineCode" <!-- :key="item.productLineCode"-->
:label="item.productLineName" <!-- :label="item.productLineName"-->
:value="item.productLineCode" <!-- :value="item.productLineCode"-->
></el-option> <!-- ></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="启用标识" prop="isFlag">--> <!-- <el-form-item label="启用标识" prop="isFlag">-->
<!-- <el-radio-group v-model="form.isFlag">--> <!-- <el-radio-group v-model="form.isFlag">-->
<!-- <el-radio--> <!-- <el-radio-->
@ -205,7 +205,7 @@ import addBom from '@//views/base/orderBomInfo/addBom.vue';
export default { export default {
name: "BaseBomInfo", name: "BaseBomInfo",
dicts: ['material_type', 'is_flag'], dicts: ['material_type', 'is_flag','material_subclass'],
components: { components: {
Treeselect, Treeselect,
'add-bom': addBom 'add-bom': addBom

30
src/views/production/baseBomInfo/index.vue
Unescape Escape View File

@ -66,6 +66,15 @@
v-hasPermi="['production:baseBomInfo:export']" v-hasPermi="['production:baseBomInfo:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="AutomaticSynchronizationBOM"
>自动同步生产BOM</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
@ -157,7 +166,6 @@
:key="item.factoryCode" :key="item.factoryCode"
:label="item.factoryName" :label="item.factoryName"
:value="item.factoryCode" :value="item.factoryCode"
:disabled="true"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -208,9 +216,17 @@
</template> </template>
<script> <script>
import { listBaseBomInfo, getBaseBomInfo, delBaseBomInfo, addBaseBomInfo, updateBaseBomInfo } from "@/api/production/baseBomInfo"; import {
listBaseBomInfo,
getBaseBomInfo,
delBaseBomInfo,
addBaseBomInfo,
updateBaseBomInfo,
addAutomaticSynchronizationBOM
} from '@/api/production/baseBomInfo'
import {findFactoryList} from "@//api/base/factory"; import {findFactoryList} from "@//api/base/factory";
import addBom from '@//views/base/orderBomInfo/addBom.vue'; import addBom from '@//views/base/orderBomInfo/addBom.vue';
import { addSAPCalendar } from '@//api/production/calendarInfo'
export default { export default {
name: "BaseBomInfo", name: "BaseBomInfo",
@ -247,7 +263,7 @@ export default {
bomCode: null, bomCode: null,
materialCode: null, materialCode: null,
materialName: null, materialName: null,
materialType: 0, materialType: 100,
standardAmount: null, standardAmount: null,
parentId: null, parentId: null,
plantCode: null, plantCode: null,
@ -313,7 +329,7 @@ export default {
bomCode: null, bomCode: null,
materialCode: null, materialCode: null,
materialName: null, materialName: null,
materialType: 0, materialType: null,
standardAmount: null, standardAmount: null,
parentId: null, parentId: null,
plantCode: null, plantCode: null,
@ -398,6 +414,12 @@ export default {
} }
}); });
}, },
AutomaticSynchronizationBOM(){
addAutomaticSynchronizationBOM(this.form).then(response => {
this.$modal.msgSuccess('同步成功')
this.getList()
})
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const objIds = row.objId || this.ids; const objIds = row.objId || this.ids;

42
src/views/production/planInfo/index.vue
Unescape Escape View File

@ -1,17 +1,17 @@
<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" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="计划编号" prop="planCode"> <el-form-item label="计划编号" prop="orderCode">
<el-input <el-input
v-model="queryParams.planCode" v-model="queryParams.orderCode"
placeholder="请输入计划编号" placeholder="请输入计划编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工单编号" prop="orderCode"> <el-form-item label="工单编号" prop="planCode">
<el-input <el-input
v-model="queryParams.orderCode" v-model="queryParams.planCode"
placeholder="请输入工单编号" placeholder="请输入工单编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -25,25 +25,25 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开始时间"> <el-form-item label="实际开始时间">
<el-date-picker <el-date-picker
v-model="daterangeBeginTime" v-model="daterangeBeginTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="实际开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="完成时间"> <el-form-item label="实际完成时间">
<el-date-picker <el-date-picker
v-model="daterangeEndTime" v-model="daterangeEndTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="实际开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
@ -112,12 +112,12 @@
<el-table-column label="计划工位" align="center" prop="productLineName" v-if="columns[7].visible"/> <el-table-column label="计划工位" align="center" prop="productLineName" v-if="columns[7].visible"/>
<el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/> <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/>
<el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/> <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/>
<el-table-column label="开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible"> <el-table-column label="实际开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成时间" align="center" prop="endTime" width="180" v-if="columns[11].visible"> <el-table-column label="实际完成时间" align="center" prop="endTime" width="180" v-if="columns[11].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
@ -204,20 +204,20 @@
<el-form-item label="完成数量" prop="completeAmount"> <el-form-item label="完成数量" prop="completeAmount">
<el-input v-model="form.completeAmount" placeholder="请输入完成数量" /> <el-input v-model="form.completeAmount" placeholder="请输入完成数量" />
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="beginTime"> <el-form-item label="实际开始时间" prop="beginTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.beginTime" v-model="form.beginTime"
type="date" type="datetime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间"> placeholder="请选择实际开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="完成时间" prop="endTime"> <el-form-item label="实际完成时间" prop="endTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.endTime" v-model="form.endTime"
type="date" type="datetime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择完成时间"> placeholder="请选择实际完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -297,8 +297,8 @@ export default {
{ key: 7, label: `计划工位`, visible: true }, { key: 7, label: `计划工位`, visible: true },
{ key: 8, label: `计划数量`, visible: true }, { key: 8, label: `计划数量`, visible: true },
{ key: 9, label: `完成数量`, visible: true }, { key: 9, label: `完成数量`, visible: true },
{ key: 10, label: `开始时间`, visible: true }, { key: 10, label: `实际开始时间`, visible: true },
{ key: 11, label: `完成时间`, visible: true }, { key: 11, label: `实际完成时间`, visible: true },
{ key: 12, label: `是否标识`, visible: false }, { key: 12, label: `是否标识`, visible: false },
{ key: 13, label: `创建人`, visible: false }, { key: 13, label: `创建人`, visible: false },
{ key: 14, label: `创建时间`, visible: false }, { key: 14, label: `创建时间`, visible: false },

Write Preview
Loading…
Cancel
Save