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

修改物料字段 修改计量单位界面 编写物料同步功能

Browse Source
This commit is contained in:
张江玮
2022-12-16 14:53:26 +08:00
parent 0ebcc7c34a
commit 47624946eb
8 changed files with 216 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<!--工具栏-->
<div class="head-container">
<el-row>
<el-col :span="8">
<el-col v-if="false" :span="8">
<el-row>
<el-col :span="7">
<span style="line-height:36px;text-align: center">物料类别：</span>
@@ -43,7 +43,7 @@
type="success"
icon="el-icon-position"
size="mini"
@click="synchronize()"
@click="show_sync_dialog = true"
>
同步
</el-button>
@@ -54,7 +54,7 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="1200px"
width="400px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
@@ -63,20 +63,48 @@
<el-input v-model="form.material_code" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="16">
<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>
<el-form-item label="计量单位" prop="unit_code">
<el-select
v-model="form.unit_code"
placeholder="请选择"
style="width: 200px;"
>
<el-option
v-for="item in measure_unit"
:key="item.measure_unit_id"
:label="item.unit_name"
:value="item.unit_code"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="false">
<el-col v-if="false" :span="8">
<el-form-item label="规格" prop="material_spec">
<label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
<el-input v-model="form.material_spec" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="型号" prop="material_model">
<label slot="label">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
@@ -100,7 +128,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="false">
<el-col :span="8">
<el-form-item label="产品系列">
<treeselect
@@ -118,16 +146,10 @@
<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-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
@@ -142,12 +164,12 @@
>
<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_spec" label="物料规格" width="140" />
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column v-if="false" prop="material_spec" label="物料规格" width="140" />
<el-table-column v-if="false" prop="material_model" label="物料型号" />
<el-table-column v-if="false" 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 v-if="false" prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column v-if="false" prop="product_series_name" label="系列" />
<el-table-column label="启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -160,8 +182,8 @@
/>
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column
v-permission="['admin','Materialbase:edit','Materialbase:del']"
fixed="right"
@@ -177,6 +199,33 @@
</template>
</el-table-column>
</el-table>
<!--同步对话框-->
<el-dialog
:visible.sync="show_sync_dialog"
width="400px"
>
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="同步时间">
<el-date-picker
v-model="sync_time"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="show_sync_dialog = false">取 消</el-button>
<el-button type="primary" @click="synchronize()">确 定</el-button>
</div>
</el-dialog>
<!--分页组件-->
<pagination />
</div>
@@ -203,7 +252,7 @@ const defaultForm = {
material_spec: null,
material_model: null,
english_name: null,
base_unit_id: null,
unit_code: null,
approve_fileno: null,
print_no: null,
material_type_id: null,
@@ -223,7 +272,7 @@ const defaultForm = {
update_optname: null,
update_time: null,
is_used_time: null,
is_used: null,
is_used: '1',
is_delete: null,
ext_id: null,
material_height_type: null,
@@ -254,6 +303,8 @@ export default {
measure_unit: [],
productSeries: [],
permission: {},
show_sync_dialog: false,
sync_time: '',
rules: {
material_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
@@ -264,9 +315,6 @@ export default {
material_name: [
{ required: true, message: '物料名称不能为空', trigger: 'blur' }
],
material_type_id: [
{ required: true, message: '物料分类不能为空', trigger: 'blur' }
],
create_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
@@ -278,6 +326,9 @@ export default {
],
material_height_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
unit_code: [
{ required: true, message: '计量单位不能为空', trigger: 'blur' }
]
}
}
@@ -344,22 +395,23 @@ export default {
crudClassstandard.getClassSuperior(id).then(res => {
const data = res.content
that.buildTree(data)
if (type == '02') {
if (type === '02') {
that.classes2 = data
}
if (type == '03') {
if (type === '03') {
that.classes3 = data
}
})
},
synchronize() {
this.fullscreenLoading = true
crudMaterialbase.synchronize(this.crud.query).then(res => {
this.fullscreenLoading = false
crudMaterialbase.synchronize({ start_time: this.sync_time[0], end_time: this.sync_time[1] }).then(res => {
this.show_sync_dialog = false
this.sync_time = ''
this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
this.show_sync_dialog = false
})
console.log(this.sync_time)
},
queryClassId() {
const param = {

16
lms/nladmin-ui/src/views/wms/basedata/measure/index.vue
View File

@@ -17,16 +17,16 @@
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码" prop="unit_code">
<el-form-item label="单位编码" prop="unit_code">
<el-input v-model="form.unit_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名称" prop="unit_name">
<el-form-item label="单位名称" prop="unit_name">
<el-input v-model="form.unit_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="外部标识" prop="ext_id">
<el-form-item v-if="false" label="外部标识" prop="ext_id">
<el-input v-model="form.ext_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="数据精度" prop="qty_precision">
<el-form-item v-if="false" label="数据精度" prop="qty_precision">
<!-- <el-input v-model="form.qty_precision" style="width: 370px;" />-->
<el-input-number v-model="form.qty_precision" :min="1" :max="6" label="描述文字" style="width: 150px;" @change="handleChange" />
</el-form-item>
@@ -36,7 +36,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
@@ -44,9 +44,9 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="unit_code" label="编码" />
<el-table-column prop="unit_name" label="名称" />
<el-table-column prop="qty_precision" label="数据精度" />
<el-table-column prop="update_optname" label="修改者" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column v-if="false" prop="qty_precision" label="数据精度" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="is_used" label="启用 ">
<template slot-scope="scope">
<el-switch