Commit 33961f3a authored by chenzj's avatar chenzj

新增生产报工打印功能

parent 48be7531
...@@ -170,15 +170,21 @@ ...@@ -170,15 +170,21 @@
</u-row> </u-row>
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="是否打印" prop="printName"> <u-form-item label="是否打印" prop="print">
<view class="uni-list-item__extra"> <view class="uni-list-item__extra">
<u-radio-group v-model="feedback.printName"> <u-radio-group v-model="feedback.whether">
<u-radio :name="1"></u-radio> <u-radio :name="1"></u-radio>
<u-radio :name="0"></u-radio> <u-radio :name="0"></u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6">
<u-form-item v-if="feedback.whether=='1'" label="打印内容" prop="printContents">
{{feedback.printContents}}
<!-- <u-input v-model="feedback."></u-input> -->
</u-form-item>
</u-col>
</u-row> </u-row>
<view v-if="feedback.isLastProcess"> <view v-if="feedback.isLastProcess">
<u-row> <u-row>
...@@ -624,6 +630,7 @@ import SearchInput from '@/components/ScanInput/index.vue'; ...@@ -624,6 +630,7 @@ import SearchInput from '@/components/ScanInput/index.vue';
import dModelList from './components/dModelList.vue'; import dModelList from './components/dModelList.vue';
import userPersonnel from './components/userPersonnel.vue'; import userPersonnel from './components/userPersonnel.vue';
import UButton from '../../../uview-ui/components/u-button/u-button.vue'; import UButton from '../../../uview-ui/components/u-button/u-button.vue';
import { handleError } from "vue";
export default { export default {
name: 'ProdReport', name: 'ProdReport',
components: { components: {
...@@ -940,6 +947,7 @@ export default { ...@@ -940,6 +947,7 @@ export default {
applyNum: null, applyNum: null,
workorderCode: null workorderCode: null
}, },
userTempVisible: false, userTempVisible: false,
materialReturnFormVisible: false, materialReturnFormVisible: false,
...@@ -1261,6 +1269,7 @@ userTempVisible: false, ...@@ -1261,6 +1269,7 @@ userTempVisible: false,
const items = row.workorderList.find((item) => item.workorderId === id); const items = row.workorderList.find((item) => item.workorderId === id);
row.workorderCode = items.workorderCode; row.workorderCode = items.workorderCode;
row.printName = items.workorderCode; row.printName = items.workorderCode;
row.printContents =row.arrangeCode+row.workorderCode
row.sizeList = row.sizeData[id]; row.sizeList = row.sizeData[id];
row.directiveList = row.directiveData[id]; row.directiveList = row.directiveData[id];
row.packByDirective = items.packByDirective; row.packByDirective = items.packByDirective;
...@@ -1502,6 +1511,8 @@ userTempVisible: false, ...@@ -1502,6 +1511,8 @@ userTempVisible: false,
sizeList:[], sizeList:[],
directiveData: {}, directiveData: {},
sizeData: {}, sizeData: {},
printContents: item.arrangeCode,
whether: '',
}; };
this.getWorkorderWithSizeAndDirective(feedback); this.getWorkorderWithSizeAndDirective(feedback);
this.feedbackForms.push(feedback); this.feedbackForms.push(feedback);
...@@ -1556,7 +1567,7 @@ userTempVisible: false, ...@@ -1556,7 +1567,7 @@ userTempVisible: false,
return; return;
} }
} }
//如果工单 //工单
this.$u.api this.$u.api
.feedback({ .feedback({
taskWorkunitId: item.taskWorkunitId, taskWorkunitId: item.taskWorkunitId,
...@@ -1583,13 +1594,29 @@ userTempVisible: false, ...@@ -1583,13 +1594,29 @@ userTempVisible: false,
startTime: item.scheduleStartDate, startTime: item.scheduleStartDate,
workorderSoDirectiveId: item.workorderSoDirectiveId, workorderSoDirectiveId: item.workorderSoDirectiveId,
workorderSoSizeItemId: item.workorderSoSizeItemId, workorderSoSizeItemId: item.workorderSoSizeItemId,
netWeight: item.netWeight netWeight: item.netWeight,
}) printContents: item.whether=='1'?item.printContents: null
})
.then((res) => { .then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.open = false; this.open = false;
if (res.msg === '') { if (res.msg === '操作成功') {
this.$u.toast('上报成功'); this.$u.toast('上报成功');
if(item.whether=='1'){
this.printPdfSocket({
reportName: 'mysql:qrcode-50*50-2',
values: {
detail: [
{
barcode: item.printContents,
gp: item.printContents
},
],
},
})
}
} else { } else {
this.$u.toast(res.msg); this.$u.toast(res.msg);
} }
......
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