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

提交

Browse Source
This commit is contained in:
18188916393
2022-08-22 10:26:54 +08:00
parent 7c7ed6f1b1
commit 006198d39f
27 changed files with 649 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
wms/qd/src/views/wms/database/material/index.vue
View File

@@ -36,28 +36,12 @@
<el-form-item label="是否启用" prop="is_used">
<el-radio v-for="item in dict.is_active" :key="item.id" v-model="form.is_used" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item label="是否人工打包" prop="is_manmade">
<el-radio v-for="item in dict.is_active" :key="item.id" v-model="form.is_manmade" :label="item.value">{{ item.label }}</el-radio>
<el-form-item label="是否人工打包" prop="is_auto_package">
<el-radio v-for="item in dict.is_active" :key="item.id" v-model="form.is_auto_package" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item label="码垛数量" prop="palletize_num">
<el-input-number v-model="form.palletize_num" controls-position="right" :min="0" :max="9999" />
</el-form-item>
<el-form-item label="托盘类型" prop="vehicle_type">
<el-select
v-model="form.vehicle_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 250px;"
>
<el-option
v-for="item in dict.MD_EVEHICLE_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-form-item label="打印模板">
<el-input v-model="form.print_model" style="width: 270px;" />
</el-form-item>
<el-form-item label="外部标识">
<el-input v-model="form.ext_id" style="width: 370px;" />
@@ -99,22 +83,17 @@
<el-table-column prop="is_used" label="是否人工打包" width="100px">
<template slot-scope="scope">
<el-switch
v-model="scope.row.is_manmade"
v-model="scope.row.is_auto_package"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value="1"
inactive-value="0"
@change="changeEnabledManmade(scope.row, scope.row.is_manmade)"
@change="changeEnabledManmade(scope.row, scope.row.is_auto_package)"
/>
</template>
</el-table-column>
<el-table-column prop="palletize_num" label="码垛数量" />
<el-table-column prop="vehicle_type" label="托盘类型">
<template slot-scope="scope">
{{ dict.label.MD_EVEHICLE_TYPE[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="ext_id" label="外部标识" />
<el-table-column v-if="false" prop="print_model" label="打印模板" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -153,10 +132,11 @@ const defaultForm = {
update_time: null,
is_used: '1',
is_delete: null,
is_manmade: '1',
is_auto_package: '1',
vehicle_type: null,
palletize_num: '1',
ext_id: null,
print_model: null,
stewing_time: null
}
export default {
@@ -188,15 +168,9 @@ export default {
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
],
is_manmade: [
is_auto_package: [
{ required: true, message: '是否人工打包不能为空', trigger: 'blur' }
],
palletize_num: [
{ required: true, message: '码垛数量不能为空', trigger: 'blur' }
],
vehicle_type: [
{ required: true, message: '托盘类型不能为空', trigger: 'blur' }
],
stewing_time: [
{ required: true, message: '静止时间不能为空', trigger: 'blur' }
]
@@ -251,22 +225,22 @@ export default {
this.crud.notify((val === 1 ? '切换人工打包' : '切换机器打包') + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
debugger
if (data.is_manmade === '0') {
data.is_manmade = '1'
if (data.is_auto_package === '0') {
data.is_auto_package = '1'
return
}
if (data.is_manmade === '1') {
data.is_manmade = '0'
if (data.is_auto_package === '1') {
data.is_auto_package = '0'
}
})
}).catch(() => {
debugger
if (data.is_manmade === '0') {
data.is_manmade = '1'
if (data.is_auto_package === '0') {
data.is_auto_package = '1'
return
}
if (data.is_manmade === '1') {
data.is_manmade = '0'
if (data.is_auto_package === '1') {
data.is_auto_package = '0'
}
})
},

134
wms/qd/src/views/wms/pdm/produceTask/index.vue
View File

@@ -127,7 +127,7 @@
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="780px">
<el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="120px">
<el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="120px" >
<el-form-item label="物料名称" prop="material_id">
<el-select v-model="form.material_id" filterable clearable style="width: 200px;" placeholder="请选择物料">
<el-option
@@ -158,7 +158,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="客户名称">
<el-form-item v-if="false" label="客户名称">
<el-select v-model="form.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
<el-option
v-for="item in custList"
@@ -178,21 +178,33 @@
<el-form-item label="计划生产数量" prop="plan_qty">
<el-input v-model="form.plan_qty" style="width: 200px;" />
</el-form-item>
<el-form-item label="实际生产数量">
<el-input v-model="form.real_qty" style="width: 200px;" />
<el-form-item label="班次" prop="classes">
<label slot="label">名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称</label>
<el-input v-model="form.classes" style="width: 200px; " />
</el-form-item>
<el-form-item label="计划开始时间" prop="plan_start_time">
<el-date-picker v-model="form.plan_start_time" clearable value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" style="width: 200px;" />
<el-form-item label="计划单号" prop="ext_shoporder_no">
<el-input v-model="form.ext_shoporder_no" style="width: 200px;" />
</el-form-item>
<el-form-item label="计划结束时间" prop="plan_end_time">
<el-date-picker v-model="form.plan_end_time" clearable value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" style="width: 200px;" />
<el-form-item label="打印名称" prop="print_type">
<el-input v-model="form.print_type" style="width: 200px;" />
</el-form-item>
<el-form-item label="实际开始时间">
<el-date-picker v-model="form.real_start_time" clearable value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" style="width: 200px;" />
<el-form-item label="打印使用单位" prop="print_dm">
<el-input v-model="form.print_dm" style="width: 200px;" />
</el-form-item>
<el-form-item label="实际结束时间">
<el-date-picker v-model="form.real_end_time" clearable value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" style="width: 200px;" />
<el-form-item label="打印物料名称" prop="print_name">
<el-input v-model="form.print_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="打印物料规格" prop="print_gg">
<el-input v-model="form.print_gg" style="width: 200px;" />
</el-form-item>
<el-form-item label="打印批次" prop="print_pc">
<el-input v-model="form.print_pc" style="width: 200px;" />
</el-form-item>
<el-form-item label="计划日期" prop="plan_date">
<el-date-picker v-model="form.plan_date" clearable value-format="yyyy-MM-dd " format="yyyy-MM-dd" type="date" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="form.vehicle_type"
@@ -202,7 +214,7 @@
clearable
>
<el-option
v-for="item in dict.MD_EVEHICLE_TYPE"
v-for="item in dict.MD_MTPVEHICLE_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -242,33 +254,47 @@
</el-table-column>
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="device_name" label="设备名称" width="120" />
<el-table-column prop="produceline_name" label="产线名称" />
<el-table-column prop="cust_name" label="客户名称" />
<el-table-column prop="seq_no" label="生产顺序" />
<el-table-column v-if="false" prop="produceline_name" label="产线名称" />
<el-table-column v-if="false" prop="cust_name" label="客户名称" />
<el-table-column prop="plan_qty" label="计划生产数量" width="120" />
<el-table-column prop="real_qty" label="实际生产数量" width="120" />
<el-table-column prop="plan_start_time" label="计划开始时间" width="150" />
<el-table-column prop="real_start_time" label="实际开始时间" width="150" />
<el-table-column prop="plan_end_time" label="计划结束时间" width="150" />
<el-table-column prop="real_end_time" label="实际结束时间" width="150" />
<el-table-column prop="producetask_finish_type" label="任务结束类型" width="120">
<el-table-column prop="plan_date" label="计划日期" width="150" />
<el-table-column prop="classes" label="班次" width="150" />
<el-table-column prop="ext_shoporder_no" label="外部计划单号" width="150" />
<el-table-column prop="print_type" label="打印名称" width="150" />
<el-table-column prop="print_dm" label="打印使用单位" width="150" />
<el-table-column prop="print_name" label="打印物料名称" width="150" />
<el-table-column prop="print_gg" label="打印物料规格" width="150" />
<el-table-column prop="print_pc" label=" 打印 批次" width="150" />
<el-table-column prop="print_type" label="打印名称" width="150" />
<el-table-column prop="yh_name" label="客户单位" width="150" />
<el-table-column prop="is_export" label="是否导入">
<template slot-scope="scope">
<el-tag
:type="scope.row.is_export === '0' ? 'primary' : 'success'"
disable-transitions
>
{{ isFull(scope.row.is_export) }}
</el-tag>
</template>
</el-table-column>
<el-table-column v-if="false" prop="producetask_finish_type" label="任务结束类型" width="120">
<template slot-scope="scope">
{{ dict.label.PRODUCETASK_STATUS_TYPE[scope.row.producetask_finish_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="载具类型" width="270">
<template slot-scope="scope">
{{ dict.label.MD_EVEHICLE_TYPE[scope.row.vehicle_type] }}
{{ dict.label.MD_MTPVEHICLE_TYPE[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="model" label="型号" />
<el-table-column prop="molten_pool" label="熔池" />
<el-table-column prop="stewing_time" label="静置时间" />
<el-table-column v-if="fasle" prop="stewing_time" label="静置时间" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="150" />
<el-table-column prop="update_optname" label="修改者" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column v-if="false" prop="update_optname" label="修改者" />
<el-table-column v-if="false" prop="update_time" label="修改时间" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -300,10 +326,46 @@ import UploadDialog from '@/views/wms/pdm/produceTask/UploadDialog'
import CopyDialog from '@/views/wms/pdm/produceTask/CopyDialog'
import SortDialog from '@/views/wms/pdm/produceTask/SortDialog'
const defaultForm = { producetask_id: null, producetask_code: null, producetask_status: null, material_id: null, device_id: null, produceline_id: null, cust_id: null, seq_no: null, plan_qty: null, real_qty: null, plan_start_time: null, real_start_time: null, plan_end_time: null, real_end_time: null, producetask_finish_type: null, stand_hour: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, model: null, molten_pool: null }
const defaultForm = {
producetask_id: null,
producetask_code: null,
producetask_status: null,
material_id: null,
device_id: null,
produceline_id: null,
cust_id: null,
seq_no: null,
plan_qty: null,
real_qty: null,
plan_start_time: null,
real_start_time: null,
plan_end_time: null,
real_end_time: null,
producetask_finish_type: null,
stand_hour: null,
remark: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
is_delete: null,
model: null,
molten_pool: null,
classes: null,
ext_shoporder_no: null,
print_type: null,
print_dm: null,
print_name: null,
print_gg: null,
print_pc: null,
yh_name: null,
is_export: 0
}
export default {
name: 'Producetask',
dicts: ['PRODUCETASK_STATUS', 'PRODUCETASK_STATUS_TYPE', 'MD_EVEHICLE_TYPE'],
dicts: ['PRODUCETASK_STATUS', 'PRODUCETASK_STATUS_TYPE', 'MD_MTPVEHICLE_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog, CopyDialog, SortDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -344,11 +406,8 @@ export default {
plan_qty: [
{ required: true, message: '计划生产数量不能为空', trigger: 'blur' }
],
plan_start_time: [
{ required: true, message: '计划开始时间不能为空', trigger: 'blur' }
],
plan_end_time: [
{ required: true, message: '计划结束时间不能为空', trigger: 'blur' }
plan_date: [
{ required: true, message: '计划生产日期不能为空', trigger: 'blur' }
],
stand_hour: [
{ required: true, message: '静置时间不能为空', trigger: 'blur' }
@@ -452,6 +511,13 @@ export default {
this.crud.toQuery()
})
},
isFull(val) {
if (val === '1') {
return '是'
} else {
return '否'
}
},
getCust() {
crudProducetask.getCust().then(res => {
this.custList = res

2
wms/qd/src/views/wms/sch/point/index.vue
View File

@@ -243,7 +243,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" width="130" />
<el-table-column prop="point_name" label="点位名称" width="130" />
<el-table-column prop="point_name" label="点位名称" width="180" />
<el-table-column prop="area_type" label="所属区域" width="130">
<template slot-scope="scope">
{{ dict.label.sch_area_type[scope.row.area_type] }}

2
wms/qd/src/views/wms/st/ivt/index.vue
View File

@@ -117,8 +117,6 @@
{{ fun(scope.row.ivt_qty) }}
</template>
</el-table-column>
<el-table-column prop="unit_name" label="单位" />
<el-table-column prop="mix_seq" label="黏次" />
<el-table-column v-permission="[]" label="操作" width="100px" align="center" fixed="right">
<!-- <template slot-scope="scope">
<el-button :disabled="scope.row.stationary_state === '1'" type="primary">静止完成</el-button>