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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-08-03 15:30:36 +08:00
parent 0e68a529c7
commit c124635c6d
3 changed files with 142 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mes/qd/src/components/Crud/crud.js
View File

@@ -1,5 +1,5 @@
import { download, initData } from '@/api/data'
import { downloadFile, parseTime } from '@/utils/index'
import {download, initData} from '@/api/data'
import {downloadFile, parseTime} from '@/utils/index'
import Vue from 'vue'
/**
@@ -183,6 +183,16 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form)
callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
},
/**
* 启动复制新增
* @param {*} data 数据项
*/
toCopy(data) {
crud.resetForm(JSON.parse(JSON.stringify(data)))
crud.status.add = CRUD.STATUS.PREPARED
callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form)
callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
},
/**
* 启动编辑
* @param {*} data 数据项
@@ -387,7 +397,7 @@ function CRUD(options) {
/**
* 获取查询参数
*/
getQueryParams: function() {
getQueryParams: function () {
// 清除参数无值的情况
Object.keys(crud.query).length !== 0 && Object.keys(crud.query).forEach(item => {
if (crud.query[item] === null || crud.query[item] === '') crud.query[item] = undefined

92
mes/qd/src/views/wms/mps/produce/AddDialog.vue
View File

@@ -12,8 +12,9 @@
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button type="primary" @click="insertDtl">新增一行</el-button>
<el-button type="primary" @click="copyAdd">复制新增</el-button>
</span>
</div>
<el-table
@@ -21,9 +22,11 @@
:data="tableData"
style="width: 100%;"
border
highlight-current-row
@row-click="clickRow"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column align="center" label="操作" width="100" fixed="right">
<template scope="scope">
<el-button
@@ -70,25 +73,42 @@
<el-table-column prop="produce_date" label="生产日期" align="center" width="250px">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.produce_date" type="date" value-format="yyyy-MM-dd" />
<el-date-picker v-model="scope.row.produce_date" type="date" value-format="yyyy-MM-dd"/>
</template>
</el-table-column>
<el-table-column v-if="false" prop="material_id" label="物料标识" align="center" />
<el-table-column v-if="false" prop="material_id" label="物料标识" align="center"/>
<el-table-column prop="material_code" label="物料编码" align="center" width="190px">
<template scope="scope">
<el-input v-model="scope.row.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)"/>
</el-input>
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" align="center" width="250px" />
<el-table-column prop="material_spec" label="物料规格" align="center" width="150px" />
<el-table-column prop="material_name" label="物料名称" align="center" width="250px"/>
<el-table-column prop="material_spec" label="物料规格" align="center" width="150px"/>
<el-table-column show-overflow-tooltip prop="plan_qty" label="计划数量" align="center" width="100px">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.plan_qty" size="mini" />
<el-input v-show="!scope.row.edit" v-model="scope.row.plan_qty" size="mini"/>
<span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
</template>
</el-table-column>
<el-table-column prop="shift_type_scode" label="班次类型" align="center" width="110px">
<template slot-scope="scope">
<el-select
v-model="scope.row.shift_type_scode"
class="filter-item"
@change="(val)=>change(val,scope.$index,scope.row)"
:disabled="scope.row.edit"
>
<el-option
v-for="item in dict.PDM_BI_SHIFTTYPE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="planproducestart_date" label="计划开始时间" align="center" width="250px">
<template slot-scope="scope">
<el-date-picker
@@ -99,25 +119,9 @@
/>
</template>
</el-table-column>
<el-table-column prop="shift_type_scode" label="班次类型" align="center" width="110px">
<template slot-scope="scope">
<el-select
v-model="scope.row.shift_type_scode"
class="filter-item"
:disabled="scope.row.edit"
>
<el-option
v-for="item in dict.PDM_BI_SHIFTTYPE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="sale_id" label="销售单标识" align="center" width="150px">
<el-table-column prop="sale_id" label="销售单标识" align="center" width="150px">
<template scope="scope">
<el-input v-model="scope.row.sale_id" />
<el-input v-model="scope.row.sale_id"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="is_needmove" label="是否搬运" align="center" width="150px">
@@ -158,14 +162,14 @@
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import CRUD, {crud, header, presenter} from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
export default {
name: 'AddDtl',
components: { MaterDtl },
components: {MaterDtl},
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
mixins: [presenter(), header(), crud()],
props: {
@@ -178,6 +182,7 @@ export default {
return {
dialogVisible: false,
materType: '01',
current_row: null,
workprocedureList: [],
rows: [],
materialShow: false,
@@ -227,6 +232,14 @@ export default {
this.workprocedureList = res
})
},
copyAdd() {
if (!this.current_row) {
this.crud.notify('请选择一条工单进行复制！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
const row = JSON.parse(JSON.stringify(this.current_row))
this.tableData.push(row)
},
close() {
this.$emit('update:dialogShow', false)
this.$emit('AddChanged')
@@ -237,6 +250,20 @@ export default {
this.nowindex = index
this.nowrow = row
},
change(val, index, row) {
const d = new Date()
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
debugger
if (val === '02') {
row.planproducestart_date = [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
}
if (val === '01') {
row.planproducestart_date = [year, month, day].join('-') + ' ' + ['07', '30', '00'].join(':')
}
this.tableData.splice(index, 1, row)
},
setMaterValue(row) {
this.nowrow.material_id = row.material_id
this.nowrow.material_code = row.material_code
@@ -244,15 +271,16 @@ export default {
this.nowrow.material_spec = row.material_spec
this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
},
clickRow(row) {
debugger
this.current_row = row
},
dateFormatter(str) {
const d = new Date(str)
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
const hour = d.getHours() < 10 ? '0' + d.getHours() : d.getHours()
const minute = d.getMinutes() < 10 ? '0' + d.getMinutes() : d.getMinutes()
const second = d.getSeconds() < 10 ? '0' + d.getSeconds() : d.getSeconds()
return [year, month, day].join('-') + ' ' + [hour, minute, second].join(':')
return [year, month, day].join('-') + ' ' + ['07', '30', '00'].join(':')
},
deleteRow(index, rows) {
rows.splice(index, 1)

124
mes/qd/src/views/wms/mps/produce/index.vue
View File

@@ -118,11 +118,22 @@
class="filter-item"
/>
</el-form-item>
<rrOperation :crud="crud" />
<rrOperation :crud="crud"/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@click="crud.toCopy(crud.selections[0])"
>
复制新增
</el-button>
<el-button
slot="right"
class="filter-item"
@@ -192,10 +203,10 @@
</el-select>
</el-form-item>
<el-form-item label="生产日期" prop="produce_date">
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;"/>
</el-form-item>
<el-form-item v-if="false" label="物料标识" prop="material_id">
<el-input v-model="form.material_id" style="width: 200px;" />
<el-input v-model="form.material_id" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input
@@ -221,10 +232,10 @@
/>
</el-form-item>
<el-form-item label="物料单重" prop="material_weight">
<el-input v-model="form.material_weight" style="width: 200px;" />
<el-input v-model="form.material_weight" style="width: 200px;"/>
</el-form-item>
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" style="width: 200px;" />
<el-input v-model="form.plan_qty" style="width: 200px;"/>
</el-form-item>
<el-form-item label="计划开始时间" prop="planproducestart_date">
<el-date-picker
@@ -243,10 +254,10 @@
/>
</el-form-item>
<el-form-item v-if="crud.status.edit" label="报工数量" prop="report_qty">
<el-input v-model="form.report_qty" style="width: 200px;" />
<el-input v-model="form.report_qty" style="width: 200px;"/>
</el-form-item>
<el-form-item v-if="crud.status.edit" label="实际数量" prop="report_qty">
<el-input v-model="form.real_qty" style="width: 200px;" />
<el-input v-model="form.real_qty" style="width: 200px;"/>
</el-form-item>
<el-form-item label="班次类型" prop="shift_type_scode">
<el-select
@@ -265,7 +276,7 @@
</el-select>
</el-form-item>
<el-form-item label="销售单标识">
<el-input v-model="form.sale_id" style="width: 200px;" />
<el-input v-model="form.sale_id" style="width: 200px;"/>
</el-form-item>
<el-form-item label="是否搬运" prop="is_needmove">
<el-radio
@@ -301,14 +312,14 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识" />
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识"/>
<el-table-column prop="produceorder_code" label="工单编号" width="140px">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px" />
<el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px"/>
<el-table-column prop="order_status" label="工单状态">
<template slot-scope="scope">
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
@@ -319,22 +330,22 @@
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识" />
<el-table-column prop="produce_date" label="生产日期" width="100px" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column prop="report_qty" label="报工数量" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
<el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip />
<el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" :formatter="rounding" />
<el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150" />
<el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150" />
<el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150" />
<el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150" />
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识"/>
<el-table-column prop="produce_date" label="生产日期" width="100px"/>
<el-table-column prop="plan_qty" label="计划数量"/>
<el-table-column prop="real_qty" label="实际数量"/>
<el-table-column prop="report_qty" label="报工数量"/>
<el-table-column v-if="false" prop="material_id" label="物料标识"/>
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip/>
<el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip/>
<el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip/>
<el-table-column prop="material_weight" label="物料单重" :formatter="rounding"/>
<el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150"/>
<el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150"/>
<el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150"/>
<el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150"/>
<el-table-column prop="is_needmove" label="是否搬运">
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
@@ -345,10 +356,10 @@
{{ dict.label.PDM_BI_ORDERTYPE[scope.row.order_type_scode] }}
</template>
</el-table-column>
<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 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-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -359,7 +370,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<MaterDtl
:dialog-show.sync="materialShow"
@@ -367,21 +378,21 @@
:mater-opt-code="materType"
@setMaterValue="setMaterValue"
/>
<ViewDialog ref="child3" />
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
<ViewDialog ref="child3"/>
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable"/>
</div>
</template>
<script>
import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import CRUD, {presenter, header, form, crud} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import ViewDialog from '@/views/wms/mps/produce/ViewDialog'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
@@ -424,7 +435,7 @@ const defaultForm = {
}
export default {
name: 'Produceshiftorder',
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog },
components: {AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog},
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
cruds() {
@@ -440,7 +451,7 @@ export default {
query: {
order_status: '-1'
},
crudMethod: { ...crudProduceshiftorder }
crudMethod: {...crudProduceshiftorder}
})
},
data() {
@@ -454,40 +465,40 @@ export default {
permission: {},
rules: {
produceorder_code: [
{ required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
{required: true, message: '生产班次工单编号不能为空', trigger: 'blur'}
],
producedeviceorder_code: [
{ required: true, message: '机台工单号不能为空', trigger: 'blur' }
{required: true, message: '机台工单号不能为空', trigger: 'blur'}
],
shift_type_scode: [
{ required: true, message: '班次类型不能为空', trigger: 'blur' }
{required: true, message: '班次类型不能为空', trigger: 'blur'}
],
workprocedure_id: [
{ required: true, message: '工序标识不能为空', trigger: 'blur' }
{required: true, message: '工序标识不能为空', trigger: 'blur'}
],
produce_date: [
{ required: true, message: '生产日期不能为空', trigger: 'blur' }
{required: true, message: '生产日期不能为空', trigger: 'blur'}
],
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
{required: true, message: '计划数量不能为空', trigger: 'blur'}
],
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'change' }
{required: true, message: '物料编码不能为空', trigger: 'change'}
],
planproducestart_date: [
{ required: true, message: '计划生产开始时间不能为空', trigger: 'blur' }
{required: true, message: '计划生产开始时间不能为空', trigger: 'blur'}
],
order_status: [
{ required: true, message: '工单状态不能为空', trigger: 'blur' }
{required: true, message: '工单状态不能为空', trigger: 'blur'}
],
is_needmove: [
{ required: true, message: '是否搬运不能为空', trigger: 'blur' }
{required: true, message: '是否搬运不能为空', trigger: 'blur'}
],
order_type_scode: [
{ required: true, message: '工单类型不能为空', trigger: 'blur' }
{required: true, message: '工单类型不能为空', trigger: 'blur'}
],
is_canupdate_update: [
{ required: true, message: '不能为空', trigger: 'blur' }
{required: true, message: '不能为空', trigger: 'blur'}
]
}
}
@@ -521,10 +532,10 @@ export default {
})
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
loadChildNodes({action, parentNode, callback}) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
crudClassstandard.getClass({pid: parentNode.id}).then(res => {
parentNode.children = res.content.map(function (obj) {
if (obj.hasChildren) {
obj.children = null
}
@@ -567,7 +578,7 @@ export default {
},
// 强制完成
forceFinish(data) {
crudProduceshiftorder.forceFinish({ row: data }).then(res => {
crudProduceshiftorder.forceFinish({row: data}).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
@@ -599,13 +610,16 @@ export default {
},
// 下发
submits(row) {
crudProduceshiftorder.submits({ produceorder_id: row.produceorder_id }).then(res => {
crudProduceshiftorder.submits({produceorder_id: row.produceorder_id}).then(res => {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
add() {
this.addShow = true
},
copyAdd(data) {
this.crud.toCopy(data)
}
}
}