Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts: # mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
<!-- 搜索 -->
|
||||
<el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px">
|
||||
<el-form-item label="工单编码">
|
||||
<el-input v-model="query.workorder_code" style="width: 200px;" clearable/>
|
||||
<el-input v-model="query.workorder_code" style="width: 200px;" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="班次类型" prop="shift_type_scode">
|
||||
<el-select
|
||||
@@ -47,11 +47,11 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-dropdown split-button type="primary" class="filter-item" @click="report()">
|
||||
<i class="el-icon-search el-icon--left"/>查询
|
||||
<i class="el-icon-search el-icon--left" />查询
|
||||
</el-dropdown>
|
||||
</el-form>
|
||||
</div>
|
||||
<crudOperation v-show="false" :permission="permission"/>
|
||||
<crudOperation v-show="false" :permission="permission" />
|
||||
</div>
|
||||
<!--表格渲染-->
|
||||
|
||||
@@ -63,66 +63,59 @@
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column prop="workorder_code" label="工单编号"/>
|
||||
<el-table-column prop="seq_number" label="报工顺序号"/>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="workorder_code" label="工单编号" />
|
||||
<el-table-column prop="seq_number" label="报工顺序号" />
|
||||
<el-table-column prop="shift_type_scode" label="班次类型">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="product_area" label="生产车间"/>
|
||||
<el-table-column prop="device_code" label="设备编码" align="center"/>
|
||||
<el-table-column prop="needproduct_qty" label="待生产数"/>
|
||||
<el-table-column prop="product_area" label="生产车间" />
|
||||
<el-table-column prop="device_code" label="设备编码" align="center" />
|
||||
<el-table-column prop="needproduct_qty" label="待生产数" />
|
||||
<el-table-column prop="report_qty" label="报工数量">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.report_qty"/>
|
||||
</template>
|
||||
<el-input v-model="scope.row.report_qty"/></template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="nok_qty" label="报废数量">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.nok_qty"/>
|
||||
</template>
|
||||
<el-input v-model="scope.row.nok_qty" /></template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="repare_qty" label="报修数量">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.repare_qty"/>
|
||||
</template>
|
||||
<el-input v-model="scope.row.repare_qty" /></template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="person_finish_qty" label="人员期末数量"/>
|
||||
<el-table-column prop="operatetime_start" label="开工时间"/>
|
||||
<el-table-column prop="operatetime_end" label="完工时间"/>
|
||||
<el-table-column prop="person_finish_qty" label="人员期末数量" />
|
||||
<el-table-column prop="operatetime_start" label="开工时间" />
|
||||
<el-table-column prop="operatetime_end" label="完工时间" />
|
||||
<el-table-column prop="report_status" label="报工状态">
|
||||
<template slot-scope="scope">
|
||||
{{ reportStatus[scope.row.report_status - 1].label }}
|
||||
{{ reportStatus[scope.row.report_status-1].label }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="produce_person_name" label="操作人" align="center"/>
|
||||
<el-table-column prop="confirm_name" label="审核人" align="center"/>
|
||||
<el-table-column prop="confirm_time" label="审核时间" align="center"/>
|
||||
<el-table-column prop="produce_person_name" label="操作人" align="center" />
|
||||
<el-table-column prop="confirm_name" label="审核人" align="center" />
|
||||
<el-table-column prop="confirm_time" label="审核时间" align="center" />
|
||||
<el-table-column label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px"
|
||||
type="text" @click="reportApprove(scope.row)">提交审核
|
||||
</el-button>
|
||||
<el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination/>
|
||||
<pagination />
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudReport from '@/views/wms/product_manage/workorder/produceshiftorder'
|
||||
import CRUD, {presenter, header, form} from '@crud/crud'
|
||||
import CRUD, { presenter, header, form } from '@crud/crud'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
|
||||
const defaultForm = {
|
||||
sale_id: null,
|
||||
const defaultForm = { sale_id: null,
|
||||
is_report: null,
|
||||
workorder_id: null,
|
||||
workorder_code: null,
|
||||
@@ -155,36 +148,29 @@ const defaultForm = {
|
||||
material_name: null,
|
||||
device_id: null,
|
||||
is_canupdate_update: null,
|
||||
material_spec: null
|
||||
}
|
||||
material_spec: null }
|
||||
|
||||
export default {
|
||||
name: 'ReportDialog',
|
||||
components: {crudOperation, pagination, rrOperation},
|
||||
components: { crudOperation, pagination, rrOperation },
|
||||
dicts: ['product_area'],
|
||||
cruds() {
|
||||
return [
|
||||
CRUD({
|
||||
title: '报工审核',
|
||||
url: '/api/produceWorkorder/reportQuery2',
|
||||
query: {},
|
||||
idField: 'macoperate_id',
|
||||
crudMethod: {...crudReport}
|
||||
})
|
||||
CRUD({ title: '报工审核', url: '/api/produceWorkorder/reportQuery2', query: {}, idField: 'macoperate_id', crudMethod: { ...crudReport }})
|
||||
]
|
||||
},
|
||||
mixins: [presenter(), header(), form(defaultForm)],
|
||||
data() {
|
||||
return {
|
||||
trueorfalse: [{value: true, label: '是'}, {value: false, label: '否'}],
|
||||
reportStatus: [{value: '1', label: '创建记录'}, {value: '2', label: '报工完成'}, {value: '3', label: '审核完成'}],
|
||||
trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
|
||||
reportStatus: [{ value: '1', label: '创建记录' }, { value: '2', label: '报工完成' }, { value: '3', label: '审核完成' }],
|
||||
queryTypeOptions: [
|
||||
{key: 'name', display_name: '字典名称'},
|
||||
{key: 'description', display_name: '描述'}
|
||||
{ key: 'name', display_name: '字典名称' },
|
||||
{ key: 'description', display_name: '描述' }
|
||||
],
|
||||
rules: {
|
||||
material_spec: [
|
||||
{required: true, message: '请输入编码', trigger: 'blur'}
|
||||
{ required: true, message: '请输入编码', trigger: 'blur' }
|
||||
]
|
||||
},
|
||||
permission: {
|
||||
@@ -196,7 +182,7 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
report() {
|
||||
crudReport.reportQuery({workorder_code: this.form.workorder_code, is_report: this.form.is_report}).then(res => {
|
||||
crudReport.reportQuery({ workorder_code: this.form.workorder_code, is_report: this.form.is_report }).then(res => {
|
||||
this.tableData = res.content
|
||||
})
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user