root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 任务、物料、mes对接

Browse Source
This commit is contained in:
liyongde
2023-06-29 10:03:55 +08:00
parent cf74502043
commit f50ab33253
16 changed files with 486 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -2,39 +2,26 @@
<div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
<!--工具栏-->
<div class="head-container">
<el-row>
<el-col :span="8">
<el-row>
<el-col :span="7">
<span style="line-height:36px;text-align: center">物料类别：</span>
</el-col>
<el-col :span="12">
<treeselect
v-model="query.material_type_id"
:load-options="loadChildNodes"
:options="classes1"
style="width: 200px;"
placeholder="请选择"
/>
</el-col>
</el-row>
</el-col>
<el-col :span="8">
模糊查询：
<el-input
v-model="query.search"
clearable
style="width: 200px"
size="mini"
placeholder="输入物料编码或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-col>
<el-col :span="8">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
clearable
size="mini"
placeholder="编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-col>
</el-row>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
@@ -83,55 +70,66 @@
<el-input v-model="form.material_model" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="外部标识" prop="ext_id">
<el-input v-model="form.ext_id" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料分类" prop="material_type_id">
<treeselect
v-model="form.material_type_id"
:load-options="loadChildNodes"
:options="classes2"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品系列">
<treeselect
v-model="form.product_series"
:options="classes3"
:auto-load-root-options="false"
:load-options="loadChildNodes"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="静置时间" prop="standing_time">
<el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="is_used">
<el-radio v-model="form.is_used" label="0">否</el-radio>
<el-radio v-model="form.is_used" label="1">是</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料数量" prop="standing_time">
<el-input-number v-model="form.material_qty" :controls="false" :min="0" style="width: 200px;" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="外部标识" prop="ext_id">-->
<!-- <el-input v-model="form.ext_id" style="width: 200px;" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="物料分类" prop="material_type_id">-->
<!-- <treeselect-->
<!-- v-model="form.material_type_id"-->
<!-- :load-options="loadChildNodes"-->
<!-- :options="classes2"-->
<!-- style="width: 200px;"-->
<!-- placeholder="请选择"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="产品系列">-->
<!-- <treeselect-->
<!-- v-model="form.product_series"-->
<!-- :options="classes3"-->
<!-- :auto-load-root-options="false"-->
<!-- :load-options="loadChildNodes"-->
<!-- style="width: 200px;"-->
<!-- placeholder="请选择"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="静置时间" prop="standing_time">-->
<!-- <el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="是否启用" prop="is_used">-->
<!-- <el-radio v-model="form.is_used" label="0">否</el-radio>-->
<!-- <el-radio v-model="form.is_used" label="1">是</el-radio>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="物料数量" prop="standing_time">-->
<!-- <el-input-number v-model="form.material_qty" :controls="false" :min="0" style="width: 200px;" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -147,16 +145,16 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料柜号" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<el-table-column prop="material_qty" label="物料数量" width="100" />
<!-- <el-table-column prop="material_qty" label="物料数量" />-->
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="product_series_name" label="系列" />
<el-table-column label="启用" align="center" prop="is_used">
<!-- <el-table-column prop="class_name" label="物料分类" width="140" />-->
<!-- <el-table-column prop="unit_name" label="计量单位" />-->
<!-- <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />-->
<!-- <el-table-column prop="product_series_name" label="系列" />-->
<el-table-column label="启用" align="center" prop="is_used" width="80">
<template slot-scope="scope">
<el-switch
v-model="scope.row.is_used"
@@ -169,7 +167,7 @@
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="update_time" label="修改时间"/>
<el-table-column
v-permission="['admin','Materialbase:edit','Materialbase:del']"
fixed="right"

27
lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
View File

@@ -15,15 +15,6 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="物料类别">
<treeselect
v-model="query.material_type_id"
:load-options="loadClass"
:options="classes"
style="width: 200px;"
placeholder="选择物料类别"
/>
</el-form-item>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
@@ -131,15 +122,15 @@ export default {
return this.dict.label.product_series[row.product_series]
},
open() {
const param = {
'materOpt_code': this.materOptCode
}
crudMaterialbase.getMaterOptType(param).then(res => {
this.class_idStr = res.class_idStr
this.crud.query.class_idStr = res.class_idStr
this.crud.toQuery()
this.queryClassId()
})
// const param = {
// 'materOpt_code': this.materOptCode
// }
// crudMaterialbase.getMaterOptType(param).then(res => {
// this.class_idStr = res.class_idStr
// this.crud.query.class_idStr = res.class_idStr
// this.crud.toQuery()
// this.queryClassId()
// })
},
queryClassId() {
const param = {