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-06-13 14:59:26 +08:00
parent 5d8a28be7e
commit 33d3de5b53
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
View File

@@ -101,7 +101,7 @@ const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240
export default {
name: 'SKdevice',
components: { crudOperation, pagination, rrOperation },
components: { crudOperation, pagination, rrOperation },
dicts: ['product_area'],
cruds() {
return [
@@ -139,7 +139,7 @@ export default {
this.notify('保存成功', 'success')
}).catch(() => {
})
}
},
}
}
</script>

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

@@ -393,7 +393,8 @@
<!-- <el-table-column prop="workprocedure_code" label="工序编码" />-->
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
<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_spec" label="物料规格" width="120" show-overflow-tooltip />
<el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip />

41
mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
View File

@@ -7,9 +7,9 @@
@close="close"
>
<div>
<el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px">
<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
@@ -42,8 +42,8 @@
v-model="query.is_report"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value="true"
inactive-valu="false"
active-value='true'
inactive-valu='false'
/>
</el-form-item>
<rrOperation :crud="crud" />
@@ -78,24 +78,25 @@
<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="报工数量">
<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></el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="nok_qty" label="报废数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.nok_qty></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="repare_qty" label="报修数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.repare_qty></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
<!-- <el-table-column prop="nok_qty" label="报废数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.nok_qty></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="repare_qty" label="报修数量" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model = scope.row.repare_qty></el-input>-->
<!-- </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="report_status" label="报工状态">
<el-table-column prop="report_status" label="报工状态" >
<template slot-scope="scope">
{{ reportStatus[scope.row.report_status-1].label }}
</template>
@@ -164,7 +165,7 @@ const defaultForm = { sale_id: null,
export default {
name: 'ViewDialog',
components: { crudOperation, pagination, rrOperation },
components: { crudOperation, pagination, rrOperation },
cruds() {
return [
CRUD({ title: '报工审核', url: '/api/produceWorkorder/reportQuery2', query: {}, idField: 'macoperate_id', crudMethod: { ...crudProduceshiftorder }})
@@ -259,7 +260,7 @@ export default {
const arr = []
arr.push(data)
crudProduceshiftorder.reportApprove(arr).then(res => {
// todo:刷新数据
//todo:刷新数据
})
},
setForm() {

4
mes/qd/src/views/wms/scheduler_manage/task/index.vue
View File

@@ -138,7 +138,7 @@
clearable
style="width: 60px"
/>
<el-button type="primary" @click="taskScheduler()">任务调度</el-button>
<el-button type="primary" @click="taskScheduler()">任务调度</el-button>
</span>
<crudOperation :permission="permission" />
@@ -157,7 +157,7 @@
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_spec" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter="acsTypeName" />
<el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
<el-table-column prop="point_code1" label="起点" width="100" />