Skip to content

M
mes-pad
Commit 1a2e761d authored by 张海景's avatar 张海景
Browse files
Options

update:修改生产工单

parent c555fd10
Hide whitespace changes
Inline Side-by-side
Showing with 457 additions and 198 deletions
common/http.api.js
View file @ 1a2e761d
...@@ -70,16 +70,16 @@ const install = (Vue, vm) => { ...@@ -70,16 +70,16 @@ const install = (Vue, vm) => {
//生产报工 //生产报工
feedback: (params = {}) => feedback: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/protask/feedback', params), vm.$u.post(config.adminPath + '/mobile/pro/protask/feedback', params),
// 生产指令列表 //生产报工feedBackPackage
workOrderSoDirectiveApi: (params = {}) => feedBackPackage: (params = {}) =>
vm.$u.get( vm.$u.post(
config.adminPath + '/mes/pro/workOrderSoDirective/list', config.adminPath + '/mobile/pro/protask/feedBackPackage',
params params
), ),
// SIZE列表 // 生产指令列表
workOrderSoSizeItemApi: (params = {}) => workOrderSoDirectiveApi: (params = {}) =>
vm.$u.get( vm.$u.postJson(
config.adminPath + '/mes/pro/workOrderSoSizeItem/listDynamic', config.adminPath + '/mobile/pro/protask/listFeedBackPackage',
params params
), ),
//增加检验 //增加检验
......
pages/mes/prodReport/index.vue
View file @ 1a2e761d
...@@ -107,164 +107,258 @@ ...@@ -107,164 +107,258 @@
title="生产报工" title="生产报工"
@confirm="handleSubmitfeedback" @confirm="handleSubmitfeedback"
show-cancel-button show-cancel-button
:show-confirm-button="feedbackForms[0]&&feedbackForms[0].isPackage === '1'? false: true"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="proVisible" v-model="proVisible"
width="1800rpx" width="1800rpx"
> >
<view> <view>
<!-- 是否包装工序isPackage为1是 -->
<scroll-view style="max-height: 600px" scroll-y="true" class="scroll-Y"> <scroll-view style="max-height: 600px" scroll-y="true" class="scroll-Y">
<view class="feedback-card" v-for="(feedback, i) in feedbackForms" :key="i"> <view class="feedback-card" v-for="(feedback, i) in feedbackForms" :key="i">
<u-form label-width="80px" :model="feedback" :rules="rules" labelAlign="right"> <view v-if="feedback.isPackage === '1'" >
<u-row> <u-form label-width="80px" :model="feedback" :rules="rules" labelAlign="right">
<u-col span="6">
<u-form-item label="任务单号:" prop="quantity">
{{ feedback.taskCode }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="工序:" prop="nickName">
{{ feedback.processName }}
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="报工总数量:" prop="quantity">
{{ feedback.quantityQualify + feedback.quantityUnqualify }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="报工人:" prop="nickName">
<u-input v-model="feedback.nickName"></u-input>
<u-button @tap="getCode(feedback)" type="success" size="mini">报工人员</u-button>
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="编排单号:" prop="quantity">
{{ feedback.arrangeCode }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="生产工单:" prop="workorderId">
<uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="合格数量:" prop="quantityQualify">
<u-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityQualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="不良品数量:" prop="quantityUnqualify">
<u-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityUnqualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="报工时间:" prop="feedbackTime">
<uni-datetime-picker return-type="string" class="times" type="datetime" :clear-icon="false" v-model="feedback.feedbackTime" />
</u-form-item>
</u-col>
</u-row>
<u-row v-if="!feedback.isLastProcess">
<u-col span="6">
<u-form-item label="是否打印:" prop="print">
<view class="uni-list-item__extra">
<u-radio-group v-model="feedback.whether">
<u-radio :name="1">是</u-radio>
<u-radio :name="0">否</u-radio>
</u-radio-group>
</view>
</u-form-item>
</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>
<view v-if="feedback.isLastProcess">
<u-row> <u-row>
<!-- <u-col span="6"> <u-col span="4">
<u-form-item label="工单指令:" prop="workorderSoDirectiveId"> <u-form-item label="任务单号:" prop="quantity">
<uni-data-select v-model="feedback.workorderSoDirectiveId" :localdata="feedback.directiveList"></uni-data-select> {{ feedback.taskCode }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="4">
<u-form-item label="工单SIZE:" prop="workorderSoSizeItemId"> <u-form-item label="编排单号:" prop="quantity">
<uni-data-select v-model="feedback.workorderSoSizeItemId" :localdata="feedback.sizeList"></uni-data-select> {{ feedback.arrangeCode }}
</u-form-item> </u-form-item>
</u-col> --> </u-col>
<u-col span="2"> <u-col span="4">
<u-form-item label="包装数量:" prop="packNum"> <u-form-item label="工序:" prop="nickName">
{{feedback.packNum}} {{ feedback.processName }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="3"> </u-row>
<u-form-item label="包装类型:" prop="packType"> <u-row>
<dict-tag :options="dict.type.pro_pack_type" :value="feedback.packType" /> <u-col span="4">
<u-form-item label="报工总数量:" prop="quantity">
{{ feedback.quantity }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="2"> <u-col span="4">
<u-form-item label="包装单位:" prop="packUnitOfMeasure"> <u-form-item label="已报工数:" prop="quantity">
{{feedback.packUnitOfMeasure}} {{ feedback.quantityQualify + feedback.quantityUnqualify }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="5"> <u-col span="4">
<u-form-item label-width="150px" label="LOSS数是否单独包装:" prop="lossIndividuallyWrap"> <u-form-item label="报工人:" prop="nickName">
<dict-tag :options="dict.type.sap_yes_no" :value="feedback.lossIndividuallyWrap" /> {{feedback.nickName}}
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-row> <u-row>
<u-col span="3"> <u-col span="4">
<u-form-item label="净重(KG):" prop="netWeight"> <u-form-item label="包装类型:" prop="packType">
<u-number-box :min="0" :positive-integer="false" :input-width="150" v-model="feedback.netWeight"></u-number-box> <dict-tag :options="dict.type.pro_pack_type" :value="feedback.packType" />
</u-form-item>
</u-col>
<u-col span="3">
<u-form-item label="包装单位:" prop="packUnitOfMeasure">
{{feedback.packUnitOfMeasure}}
</u-form-item>
</u-col>
<u-col span="5">
<u-form-item label-width="150px" label="LOSS数是否单独包装:" prop="lossIndividuallyWrap">
<dict-tag :options="dict.type.sap_yes_no" :value="feedback.lossIndividuallyWrap" />
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="4">
<u-form-item label="生产工单:" prop="workorderId">
<uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
</u-form-item>
</u-col>
<u-col span="4">
<u-form-item label="不良品数量:" prop="quantityUnqualify">
<u-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityUnqualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="4">
<u-form-item label="报工时间:" prop="feedbackTime">
<uni-datetime-picker return-type="string" class="times" type="datetime" :clear-icon="false" v-model="feedback.feedbackTime" />
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row>
<u-row>
<u-col span="3">
<u-form-item label="包装数量:" prop="packNum">
<u-number-box :min="0" v-model="feedback.packNum"></u-number-box>
</u-form-item>
</u-col>
<u-col span="3"> <u-col span="3">
<u-form-item label="小包数:" prop="minPackageNum"> <u-form-item label="装箱数量:" prop="encasementNum">
<u-number-box :min="0" :positive-integer="true" :input-width="150" v-model="feedback.minPackageNum"></u-number-box> <u-number-box :min="0" v-model="feedback.encasementNum"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="检测人员:" prop="checkBy">
<u-input disabled v-model="feedback.checkBy"></u-input>
<u-button @tap="userVisible = true,useData = feedback;" type="success" size="mini">选择人员</u-button>
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row>
<u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="打印模板:" prop="printTemplate"> <u-form-item label="打印模板:" prop="printTemplate">
<u-input v-model="feedback.printTemplate" placeholder="请选择打印模板"></u-input> <u-input v-model="feedback.printTemplate" placeholder="请选择打印模板"></u-input>
<u-button @tap="getPrintTemplate(feedback)" type="success" style="margin-left: 20rpx" size="mini">选择打印模板</u-button> <u-button @tap="getPrintTemplate(feedback)" type="success" style="margin-left: 20rpx" size="mini">选择打印模板</u-button>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6">
<u-form-item label-width="120px" label="是否合并包装:" prop="mergePack">
<view class="uni-list-item__extra">
<u-radio-group v-model="feedback.mergePack">
<u-radio :name="1">是</u-radio>
<u-radio :name="0">否</u-radio>
</u-radio-group>
</view>
</u-form-item>
</u-col>
</u-row> </u-row>
</view> </u-form>
</u-form> <view>
<view v-if="feedback.isLastProcess"> <u-tabs :list="feedback.listTabPro" :is-scroll="false" :show-bar="false" :current="feedback.currentTabPro" @change="handleChangeTabPro($event, feedback)"></u-tabs>
<u-tabs :list="listTabPro" :is-scroll="false" :show-bar="false" :current="feedback.currentTabPro" @change="handleChangeTabPro($event, feedback)"></u-tabs> <!-- 报工列表 -->
<!-- 指令列表 --> <view v-if="feedback.tableOrderData.length">
<view v-show="feedback.currentTabPro === 0"> <zb-table :columns="tableOrderColumn" :stripe="true" :border="true" :data="feedback.tableOrderData">
<zb-table :columns="feedback.tableDirectiveColumn" :stripe="true" :border="true" :data="feedback.tableDirectiveData"> <template slot="reportQuantity" slot-scope="scope">
<template slot="reportQuantity" slot-scope="scope"> <!-- {{ scope.row }} -->
<!-- {{ scope.row }} --> <u-input v-model="scope.row.reportQuantity" type="number"></u-input>
<u-input v-model="scope.row.reportQuantity" type="number" @blur="handleChangeReportQuantity(feedback)"></u-input> </template>
</template> <template slot="netWeight" slot-scope="scope">
</zb-table> <!-- {{ scope.row }} -->
<u-input v-model="scope.row.netWeight" type="number"></u-input>
</template>
<template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
<!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
</template>
</zb-table>
</view> </view>
<!-- SIZE列表 --> <!-- 指令列表 -->
<view v-show="feedback.currentTabPro === 1"> <view v-if="feedback.tableDirectiveData.length">
<zb-table :columns="feedback.tableSizeColumn" :stripe="true" :border="true" :data="feedback.tableSizeData"> <zb-table :columns="tableDirectiveColumn" :stripe="true" :border="true" :data="feedback.tableDirectiveData">
<template slot="reportQuantity" slot-scope="scope"> <template slot="reportQuantity" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-input v-model="scope.row.reportQuantity" type="number" @blur="handleChangeReportQuantity(feedback)"></u-input> <u-input v-model="scope.row.reportQuantity" type="number"></u-input>
</template> </template>
</zb-table> <template slot="netWeight" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-input v-model="scope.row.netWeight" type="number"></u-input>
</template>
<template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
<!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
</template>
</zb-table>
</view>
<!-- SIZE列表 -->
<view v-if="feedback.tableSizeData.length">
<zb-table :columns="feedback.tableSizeColumn" :stripe="true" :border="true" :data="feedback.tableSizeData">
<template slot="reportQuantity" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-input v-model="scope.row.reportQuantity" type="number"></u-input>
</template>
<template slot="netWeight" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-input v-model="scope.row.netWeight" type="number"></u-input>
</template>
<template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} -->
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
</template>
</zb-table>
</view>
</view> </view>
</view> </view>
<view v-else>
<u-form label-width="80px" :model="feedback" :rules="rules" labelAlign="right">
<u-row>
<u-col span="6">
<u-form-item label="任务单号:" prop="quantity">
{{ feedback.taskCode }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="工序:" prop="nickName">
{{ feedback.processName }}
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="报工总数量:" prop="quantity">
{{ feedback.quantityQualify + feedback.quantityUnqualify }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="报工人:" prop="nickName">
<u-input v-model="feedback.nickName"></u-input>
<u-button @tap="getCode(feedback)" type="success" size="mini">报工人员</u-button>
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="编排单号:" prop="quantity">
{{ feedback.arrangeCode }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="生产工单:" prop="workorderId">
<uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="合格数量:" prop="quantityQualify">
<u-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityQualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="不良品数量:" prop="quantityUnqualify">
<u-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityUnqualify"></u-number-box>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="报工时间:" prop="feedbackTime">
<uni-datetime-picker return-type="string" class="times" type="datetime" :clear-icon="false" v-model="feedback.feedbackTime" />
</u-form-item>
</u-col>
</u-row>
</u-form>
</view>
</view> </view>
</scroll-view> </scroll-view>
</view>
</u-modal>
<u-modal
title="选择人员"
@confirm="chooseUser()"
show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="userVisible"
width="1300rpx"
>
<view class="feedback-card">
<user ref="userRef" v-if="userVisible" />
</view> </view>
</u-modal> </u-modal>
<u-modal <u-modal
...@@ -753,6 +847,7 @@ ...@@ -753,6 +847,7 @@
<script> <script>
import SearchInput from '@/components/ScanInput/index.vue'; import SearchInput from '@/components/ScanInput/index.vue';
import dModelList from './components/dModelList.vue'; import dModelList from './components/dModelList.vue';
import User from '@/components/User/User.vue';
import userPersonnel from './components/userPersonnel.vue'; import userPersonnel from './components/userPersonnel.vue';
import printTemplate from './components/printTemplate.vue'; import printTemplate from './components/printTemplate.vue';
import workunitList from './components/workunitList.vue'; import workunitList from './components/workunitList.vue';
...@@ -773,10 +868,88 @@ export default { ...@@ -773,10 +868,88 @@ export default {
UButton, UButton,
workunitList, workunitList,
AppScan, AppScan,
User,
ProogingSpecificationSheet ProogingSpecificationSheet
}, },
data() { data() {
return { return {
tableOrderColumn: [
{
name: 'quantity',
label: '派工数',
width: 170
},
{
name: 'feedbackQuantity',
label: '已包装数量',
width: 170
},
{
name: 'reportQuantity',
label: '本次报工',
width: 120,
type: 'slot',
slot: 'reportQuantity'
},
{
name: 'netWeight',
label: '净重',
width: 100,
type: 'slot',
slot: 'netWeight'
},
{
name: 'peration',
label: '操作',
width: 120,
type: 'slot',
slot: 'peration'
}
],
tableDirectiveColumn: [
{
name: 'clientCmd',
label: '指令号',
width: 120
},
{
name: 'quantity',
label: '派工数',
width: 100
},
{
name: 'packageNum',
label: '包装数',
width: 80
},
{
name: 'lossNum',
label: 'LOSS数',
width: 100
},
{
name: 'feedbackQuantity',
label: '已包装数',
width: 130
},
{
name: 'netWeight',
label: '净重',
width: 130,
type: 'slot',
slot: 'netWeight'
},
{
name: 'peration',
label: '操作',
width: 120,
type: 'slot',
slot: 'peration'
}
],
userVisible: false,
useData: {},
ProogingSpecificationSheetForm: {}, ProogingSpecificationSheetForm: {},
knifeTempAppScanVisible: false, knifeTempAppScanVisible: false,
knifeTempType: null, knifeTempType: null,
...@@ -787,6 +960,9 @@ export default { ...@@ -787,6 +960,9 @@ export default {
workunitName: null workunitName: null
}, },
listTabPro: [ listTabPro: [
{
name: '报工列表'
},
{ {
name: '指令列表' name: '指令列表'
}, },
...@@ -1187,20 +1363,6 @@ export default { ...@@ -1187,20 +1363,6 @@ export default {
uni.$off('taskStatusChanged'); uni.$off('taskStatusChanged');
}, },
methods: { methods: {
handleChangeReportQuantity(rows) {
let sum = 0
if (rows.tableSizeData.length > 0) {
sum += rows.tableSizeData.reduce((previousValue, item) => {
return previousValue + (item.reportQuantity?Number(item.reportQuantity): 0)
},0)
}
if(rows.tableDirectiveData.length > 0) {
sum += rows.tableDirectiveData.reduce((previousValue, item) => {
return previousValue + (item.reportQuantity?Number(item.reportQuantity): 0)
},0)
}
rows.quantityQualify = sum
},
handleSubmitConfirmlKnifeTemp() { handleSubmitConfirmlKnifeTemp() {
this.knifeTempVisible = true this.knifeTempVisible = true
this.$refs.appScan.closed() this.$refs.appScan.closed()
...@@ -1504,6 +1666,7 @@ export default { ...@@ -1504,6 +1666,7 @@ export default {
row.tableDirectiveData = []; row.tableDirectiveData = [];
row.tableSizeColumn = []; row.tableSizeColumn = [];
row.tableSizeData = []; row.tableSizeData = [];
row.tableOrderData = [];
row.packNum = '' row.packNum = ''
row.packType = '' row.packType = ''
row.packUnitOfMeasure = '' row.packUnitOfMeasure = ''
...@@ -1511,14 +1674,8 @@ export default { ...@@ -1511,14 +1674,8 @@ export default {
row.currentTabPro = 0 row.currentTabPro = 0
return; return;
} else { } else {
if (row.isLastProcess) { if (row.isPackage === '1') {
this.getWorkorderDirectiveList(id, index); this.getWorkorderDirectiveList(id, index);
this.getWorkorderSizeList(id, index);
row.packNum = items.packNum
row.packType = items.packType
row.packUnitOfMeasure = items.packUnitOfMeasure
row.lossIndividuallyWrap = items.lossIndividuallyWrap
row.currentTabPro = items.packType === '1'? 1 : 0
} }
} }
row.workorderId = id; row.workorderId = id;
...@@ -1597,14 +1754,6 @@ export default { ...@@ -1597,14 +1754,6 @@ export default {
item.printContents = res.rows[0].workorderCode; item.printContents = res.rows[0].workorderCode;
item.workorderId = res.rows[0].workorderId; item.workorderId = res.rows[0].workorderId;
item.workorderCode = res.rows[0].workorderCode; item.workorderCode = res.rows[0].workorderCode;
if (item.isLastProcess) {
this.getWorkorderDirectiveList(res.rows[0].workorderId, index);
this.getWorkorderSizeList(res.rows[0].workorderId, index);
item.packNum = res.rows[0].packNum
item.packType = res.rows[0].packType
item.packUnitOfMeasure = res.rows[0].packUnitOfMeasure
item.lossIndividuallyWrap = res.rows[0].lossIndividuallyWrap
}
item.packByDirective = res.rows[0].packByDirective; item.packByDirective = res.rows[0].packByDirective;
item.packBySize = res.rows[0].packBySize; item.packBySize = res.rows[0].packBySize;
} }
...@@ -1625,11 +1774,18 @@ export default { ...@@ -1625,11 +1774,18 @@ export default {
}; };
}); });
} }
return { return {
value: temp.workorderId, value: temp.workorderId,
text: temp.workorderCode text: temp.workorderCode
}; };
}); });
if (item.isPackage === '1'&&res.rows.length > 0) {
item.workorderId = res.rows[0].workorderId
item.packNum = res.rows[0].usagePackNum
item.encasementNum = res.rows[0].usageEncasementNum
this.getWorkorderDirectiveList(res.rows[0].workorderId, index)
}
}); });
}, },
...@@ -1774,6 +1930,10 @@ export default { ...@@ -1774,6 +1930,10 @@ export default {
this.printTemplateData = row; this.printTemplateData = row;
this.printTemplateVisible = true; this.printTemplateVisible = true;
}, },
chooseUser() {
console.log(this.$refs.userRef.tableSelectData, 'this.$refs.userRef.tableSelectData');
this.useData.checkBy = this.$refs.userRef.tableSelectData[0]?.userName;
},
handleSubmitPrintTemplate() { handleSubmitPrintTemplate() {
this.printTemplateData.printTemplate = this.$refs.printTemplateRef.tableSelectData[0].name; this.printTemplateData.printTemplate = this.$refs.printTemplateRef.tableSelectData[0].name;
this.printTemplateVisible = false; this.printTemplateVisible = false;
...@@ -1811,44 +1971,66 @@ export default { ...@@ -1811,44 +1971,66 @@ export default {
feedbackTime: this.parseTime(new Date()), feedbackTime: this.parseTime(new Date()),
whether: '', whether: '',
printTemplate: '', printTemplate: '',
tableDirectiveColumn: [ tableSizeData: [],
{ tableSizeColumn: [
name: 'clientCmd',
label: '指令号',
width: 170
},
{ {
name: 'lossNum', name: 'standardSizeIdx',
label: 'LOSS数', label: '序号',
width: 130 width: 60
}, },
{ {
name: 'sizeGroup', name: 'standardSize',
label: '尺码组', label: '标准SIZE',
width: 100 width: 100
}, },
{ {
name: 'quantity', name: 'quantity',
label: '数量', label: '派工数',
width: 100 width: 60
},
{
name: 'packageNum',
label: '包装数',
width: 60
}, },
{ {
name: 'quantityQualify', name: 'lossNum',
label: '已包装数量', label: 'LOSS数',
width: 130 width: 60
},
{
name: 'feedbackQuantity',
label: '已包装数',
width: 80
}, },
{ {
name: 'reportQuantity', name: 'reportQuantity',
label: '本次包装数量', label: '本次报工',
width: 130, width: 120,
type: 'slot', type: 'slot',
slot: 'reportQuantity' slot: 'reportQuantity'
}, },
{
name: 'netWeight',
label: '净重',
width: 100,
type: 'slot',
slot: 'netWeight'
},
{
name: 'peration',
label: '操作',
width: 120,
type: 'slot',
slot: 'peration'
}
], ],
listTabPro: [],
tableOrderData: [],
tableDirectiveData: [], tableDirectiveData: [],
tableSizeColumn: [], currentTabPro: 0,
tableSizeData: [], packNum:0,
currentTabPro: 0 encasementNum: 0
}; };
this.getWorkorderWithSizeAndDirective(feedback, index); this.getWorkorderWithSizeAndDirective(feedback, index);
this.feedbackForms.push(feedback); this.feedbackForms.push(feedback);
...@@ -1860,18 +2042,110 @@ export default { ...@@ -1860,18 +2042,110 @@ export default {
let row = this.feedbackForms[index]; let row = this.feedbackForms[index];
this.$u.api this.$u.api
.workOrderSoDirectiveApi({ .workOrderSoDirectiveApi({
workorderId: id "encasementNum": row.encasementNum,
"mergePack": row.mergePack || 0,
"packNum": row.packNum,
"quantity": row.quantity,
"workorderId": row.workorderId
}) })
.then((res) => { .then((res) => {
console.log(res, '88999res'); console.log(res, '88999res');
if (res.code === 200) { if (res.code === 200) {
row.tableDirectiveData = res.rows; if(res.data.directiveList) {
row.tableDirectiveData = res.data.directiveList.map(item => {
return {
...item,
reportQuantity: item.packageNum
}
})
row.listTabPro = [
{
name: '指令列表'
}
]
} else {
row.tableDirectiveData = []
}
if(res.data.orderPackageList) {
row.tableOrderData = res.data.orderPackageList.map(item => {
return {
...item,
reportQuantity: item.packageNum
}
})
row.listTabPro = [
{
name: '报工列表'
}
]
} else {
row.tableOrderData = []
}
if(res.data.sizeList) {
row.tableSizeData = res.data.sizeList.map(item => {
return {
...item,
reportQuantity: item.packageNum
}
})
row.listTabPro = [
{
name: 'SIZE列表'
}
]
row.tableSizeColumn[1].label = res.data.sizeColumnName
} else {
row.tableSizeData = []
}
} }
// row.tableDirectiveData = []
// row.tableSizeColumn = []
// row.tableSizeData = []
}); });
}, },
handleSubmitPackageFeedback(item, row) {
if ((item.printTemplate) && !this.vuex_printConnect) {
this.$u.toast('打印机连接失败');
return;
}
this.$u.api
.feedBackPackage({
taskWorkunitId: item.taskWorkunitId,
checkBy: item.checkBy,
encasementNum: item.encasementNum,
mergePack: item.mergePack,
packNum: item.packNum,
printTemplate: item.printTemplate,
quantityUnqualify: item.quantityUnqualify,
taskId: item.taskId,
workorderId: item.workorderId,
'reportData.netWeight': row.netWeight,
'reportData.reportQuantity': row.reportQuantity,
'reportData.qrcode': row.qrcode,
'reportData.workorderSoDirectiveId': row.workorderSoDirectiveId,
'reportData.workorderSoSizeItemId': row.workorderSoSizeItemId
})
.then((res) => {
if (res.code === 200) {
this.proVisible = false;
if (item.printTemplate) {
let params = {};
res.data.forEach((datas) => {
params = {
reportName: 'mysql:' + item.printTemplate,
values: {
packagePrint: datas
}
};
this.printPdfSocket(params);
});
}
if (!res.msg) {
this.$u.toast('上报成功');
} else {
this.$u.toast(res.msg);
}
this.getTaskList();
}
});
},
// 获取SIZE列表 // 获取SIZE列表
getWorkorderSizeList(id, index) { getWorkorderSizeList(id, index) {
let row = this.feedbackForms[index]; let row = this.feedbackForms[index];
...@@ -1956,18 +2230,6 @@ export default { ...@@ -1956,18 +2230,6 @@ export default {
this.$u.toast('打印机连接失败'); this.$u.toast('打印机连接失败');
return; return;
} }
console.log(item, 'item');
let formData = {}
item.tableDirectiveData.forEach((v,i)=> {
formData[`directiveReportData[${i}].workorderSoDirectiveId`] = v.workorderSoDirectiveId
formData[`directiveReportData[${i}].reportQuantity`] = v.reportQuantity
// return { workorderSoDirectiveId: v.workorderSoDirectiveId,reportQuantity: v.reportQuantity}
})
item.tableSizeData.forEach((v,i) => {
formData[`sizeReportData[${i}].workorderSoSizeItemId`] = v.workorderSoSizeItemId
formData[`sizeReportData[${i}].reportQuantity`] = v.reportQuantity
// return {workorderSoSizeItemId:v.workorderSoSizeItemId, reportQuantity: v.reportQuantity}
})
//工单 //工单
this.$u.api this.$u.api
.feedback({ .feedback({
...@@ -1998,9 +2260,6 @@ export default { ...@@ -1998,9 +2260,6 @@ export default {
feedbackTime: item.feedbackTime, feedbackTime: item.feedbackTime,
minPackageNum: item.minPackageNum, minPackageNum: item.minPackageNum,
printContents: item.whether == '1' ? item.printContents : null, printContents: item.whether == '1' ? item.printContents : null,
...formData
// directiveReportData: directData,
// sizeReportData: sizeData
}) })
.then((res) => { .then((res) => {
if (res.code === 200) { if (res.code === 200) {
......
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