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

rev:结构变更

Browse Source
This commit is contained in:
zhangzhiqiang
2023-07-09 10:21:13 +08:00
parent a37aaf90f3
commit 586436419b
116 changed files with 635 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
View File

@@ -123,6 +123,44 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.package_ext.is_used_fxx"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
<el-input v-model="form.package_ext.unboxing_device_code" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
<el-input v-model="form.package_ext.ealing_device_code" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.package_ext.is_foreward"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="包装模版" prop="package_model">
<el-input v-model="form.package_ext.package_model" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱数量" prop="demol_num">
<el-input v-model="form.package_ext.demol_num" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
<el-input v-model="form.package_ext.order_bag_num" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="码盘模版" prop="stack_model">
<el-input v-model="form.package_ext.stack_model" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
<div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
@@ -184,7 +222,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
name: 'ViewDialog',
components: { },
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE' ],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT' ],
mixins: [crud()],
props: {
dialogShow: {
@@ -256,9 +294,12 @@ export default {
open() {
this.getworkprocedure()
this.getMaterialClass()
crudProduceshiftorder.reportQuery3({ workorder_id: this.form.workorder_id }).then(res => {
crudProduceshiftorder.reportQuery3({ workorder_code: this.form.workorder_code }).then(res => {
this.tableData = res.content
})
if (this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.parse(this.form.package_ext)
}
},
formatBoolean: function(row, column) {
alert(row)

22
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -379,6 +379,18 @@
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
<el-select
v-model="form.package_ext.unboxing_device_code" style="width: 200px" >
<el-option v-for="item in cxj" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
<el-select
v-model="form.package_ext.ealing_device_code" style="width: 200px" >
<el-option v-for="item in zxj" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
<el-radio
v-for="item in dict.IS_OR_NOT"
@@ -433,12 +445,12 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column prop="workorder_id" label="工单id" width="160px">
<el-table-column prop="workorder_id" label="工单id" width="160px"></el-table-column>
<el-table-column prop="workorder_code" label="工单编号" width="100px" >
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_id }}</el-link>
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="workorder_code" label="工单编号" width="85px" />
<el-table-column prop="workorder_status" label="工单状态">
<template slot-scope="scope">
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
@@ -450,7 +462,7 @@
<el-table-column prop="outupperlimit_qty" label="满筐数量" />
<el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
<el-table-column prop="real_qty" label="报工总数" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')" />
<el-table-column
@@ -630,6 +642,8 @@ export default {
},
data() {
return {
zxj: [ { value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
cxj: [ { value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_1', label: '一线2号拆箱机' }],
trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
deviceList: [],
classes3: [],