Commit 9e2fefe9 authored by 沈翠玲's avatar 沈翠玲

生产报工增加补打

parent 7d5977ab
...@@ -35,6 +35,15 @@ export function addFeedback(data) { ...@@ -35,6 +35,15 @@ export function addFeedback(data) {
}) })
} }
//
export function taskWorkunitInfo(data) {
return request({
url: '/mes/pro/workorder/taskWorkunitInfo',
method: 'post',
data: data
})
}
// 修改生产报工记录 // 修改生产报工记录
export function updateFeedback(data) { export function updateFeedback(data) {
return request({ return request({
......
...@@ -91,6 +91,8 @@ ...@@ -91,6 +91,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)" <el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)"
v-hasPermi="['mes:pro:feedback:query']">查看</el-button> v-hasPermi="['mes:pro:feedback:query']">查看</el-button>
<el-button size="mini" type="text" @click="handleQrcode(scope.row)" v-if="!scope.isPackage"
v-hasPermi="['mes:pro:feedback:print']">补打</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:feedback:edit']">修改</el-button> v-hasPermi="['mes:pro:feedback:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
...@@ -251,7 +253,7 @@ ...@@ -251,7 +253,7 @@
</template> </template>
<script> <script>
import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, execute, listNextProcess } from "@/api/mes/pro/feedback"; import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, execute, listNextProcess, taskWorkunitInfo } from "@/api/mes/pro/feedback";
import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue" import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import UserSingleSelect from "@/components/userSelect/single.vue" import UserSingleSelect from "@/components/userSelect/single.vue"
...@@ -550,34 +552,34 @@ export default { ...@@ -550,34 +552,34 @@ export default {
}, },
/** 二维码打印 */ /** 二维码打印 */
handleQrcode() { async handleQrcode(row) {
let workunitName = ''; let workunitName = '';
let detail = [] let detail = []
if(this.selectRow.some(v => v.qrcode!=null)){ const res = await taskWorkunitInfo({
this.$message.warning('该数据是包装工序的报工,不能打印二维码') taskWorkunitId: row.taskWorkunitId
return })
let operNo = 0
if(res.code === 200) {
operNo = res.data.operNo
} }
this.selectRow.forEach((s, i) => { listNextProcess({ taskId: row.taskId }).then(workunit => {
workunitName = workunit.data.workunitName;
listNextProcess({ taskId: s.taskId }).then(workunit => { detail.push({
workunitName = workunit.data.workunitName; "barcode": row.workorderCode,
detail.push({ showText: '编排单号:'+row.arrangeCode+'\n报工次数:'+operNo+'\n数量:'+row.quantityQualify+'\n工单号:'+row.workorderCode+'\n下道工序机台:'+workunitName,
"barcode": s.workorderCode, "gp": 1
"showText": '编排单号' + s.arrangeCode + '\n工单号' + s.workorderCode + '\n数量' + s.quantityQualify + '\n下道工序机台:' + workunitName, })
"gp": i + 1 detail.push({
}) "barcode": row.workorderCode,
detail.push({ showText: '编排单号:'+row.arrangeCode+'\n报工次数:'+operNo+'\n数量:'+row.quantityQualify+'\n工单号:'+row.workorderCode+'\n下道工序机台:'+workunitName,
"barcode": s.workorderCode, "gp": 1
"showText": '编排单号' + s.arrangeCode + '\n工单号' + s.workorderCode + '\n数量' + s.quantityQualify + '\n下道工序机台:' + workunitName, })
"gp": i + 1 postPrintPdf(
}) "qrcode-50*50-2",
postPrintPdf( {
"qrcode-50*50-2", detail
{ }
detail );
}
);
});
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment