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

rev: 混碾下料任务修改、物料修改、工单修改

Browse Source
This commit is contained in:
liyongde
2023-07-28 11:00:59 +08:00
parent 3b21a4d4c1
commit 39d6b27c95
40 changed files with 613 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,10 +73,13 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="class_id" label="物料分类标识" :min-width="flexWidth('class_id',crud.data,'物料分类标识')" />
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="cooling_time" label="冷却时间(分钟)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
@@ -121,10 +124,13 @@ import pagination from '@crud/Pagination'
const defaultForm = {
material_id: null,
material_code: null,
half_material_code: null,
raw_material_code: null,
material_name: null,
material_spec: null,
class_id: null,
standing_time: null,
cooling_time: null,
workshop_code: null,
remark: null,
is_used: true,

9
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -108,8 +108,8 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="原料名称" prop="material_name">
<el-input v-model="form.raw_material_name" style="width: 240px;" @focus="getMaterial(2)" />
<el-form-item label="半成品编码" prop="material_name">
<el-input v-model="form.half_material_code" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="原料编码">
<el-input v-model="form.raw_material_code" style="width: 240px;" disabled />
@@ -361,8 +361,7 @@ const defaultForm = {
plan_qty: null,
real_qty: null,
material_id: null,
raw_material_id: null,
raw_material_name: null,
half_material_code: null,
raw_material_code: null,
vehicle_type: null,
planproducestart_date: null,
@@ -484,6 +483,8 @@ export default {
this.form.material_id = row.material_id
this.form.material_spec = row.material_spec
this.form.material_code = row.material_code
this.form.half_material_code = row.half_material_code
this.form.raw_material_code = row.raw_material_code
} else {
this.form.raw_material_name = row.material_name
this.form.raw_material_id = row.material_id

2
lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
View File

@@ -55,6 +55,8 @@
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="half_material_code" label="半成品编码" width="160" />
<el-table-column prop="raw_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="class_name" label="物料分类" width="140" />-->