Skip to content

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

update:修改生产工单加上小包数

parent 7b497ea8
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 19 deletions
pages/mes/prodReport/index.vue
View file @ da9ead87
......@@ -115,27 +115,27 @@
<view>
<scroll-view style="max-height:600px;" scroll-y="true" class="scroll-Y">
<view class="feedback-card" v-for="(feedback,i) in feedbackForms" :key="i">
<u-form label-width="100px" :model="feedback" :rules="rules">
<u-form label-width="80px" :model="feedback" :rules="rules" labelAlign="right">
<u-row>
<u-col span="6">
<u-form-item label="任务单号" prop="quantity">
<u-form-item label="任务单号:" prop="quantity">
{{ feedback.taskCode }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="工序" prop="nickName">
<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">
<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-form-item label="报工人:" prop="nickName">
<u-input v-model="feedback.nickName"></u-input>
<u-button
@tap="getCode(feedback)"
......@@ -148,12 +148,12 @@
<u-row>
<u-col span="6">
<u-form-item label="编排单号" prop="quantity">
<u-form-item label="编排单号:" prop="quantity">
{{ feedback.arrangeCode }}
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="生产工单" prop="workorderId">
<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>
......@@ -161,19 +161,19 @@
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="合格品数量" prop="quantityQualify">
<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-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-row>
<u-row>
<u-col span="6">
<u-form-item label="是否打印" prop="print">
<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>
......@@ -183,7 +183,7 @@
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item v-if="feedback.whether=='1'" label="打印内容" prop="printContents">
<u-form-item v-if="feedback.whether=='1'" label="打印内容:" prop="printContents">
{{feedback.printContents}}
<!-- <u-input v-model="feedback."></u-input> -->
</u-form-item>
......@@ -192,24 +192,29 @@
<view v-if="feedback.isLastProcess">
<u-row>
<u-col span="6">
<u-form-item label="工单指令" prop="workorderSoDirectiveId">
<u-form-item label="工单指令:" prop="workorderSoDirectiveId">
<uni-data-select v-model="feedback.workorderSoDirectiveId" :localdata="feedback.directiveList"></uni-data-select>
</u-form-item>
</u-col>
<u-col span="6">
<u-form-item label="工单SIZE" prop="workorderSoSizeItemId">
<u-form-item label="工单SIZE:" prop="workorderSoSizeItemId">
<uni-data-select v-model="feedback.workorderSoSizeItemId" :localdata="feedback.sizeList"></uni-data-select>
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col span="6">
<u-form-item label="净重(KG)" prop="netWeight">
<u-number-box :min="0" :positive-integer="false" :input-width="190" v-model="feedback.netWeight"></u-number-box>
<u-col span="3">
<u-form-item label="净重(KG):" prop="netWeight">
<u-number-box :min="0" :positive-integer="false" :input-width="150" v-model="feedback.netWeight"></u-number-box>
</u-form-item>
</u-col>
<u-col span="3">
<u-form-item label="小包数:" prop="minPackageNum">
<u-number-box :min="0" :positive-integer="false" :input-width="150" v-model="feedback.minPackageNum"></u-number-box>
</u-form-item>
</u-col>
<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-button
@tap="getPrintTemplate(feedback)"
......@@ -225,11 +230,11 @@
<view v-if="feedback.isLastProcess">
<u-tabs :list="listTabPro" :is-scroll="false" :show-bar="false" :current="feedback.currentTabPro" @change="handleChangeTabPro($event, feedback)"></u-tabs>
<!-- 指令列表 -->
<view v-show="feedback.currentTabPro === 0" class="feedback-card">
<view v-show="feedback.currentTabPro === 0">
<zb-table :columns="feedback.tableDirectiveColumn" :stripe="true" :border="true" :data="feedback.tableDirectiveData"></zb-table>
</view>
<!-- SIZE列表 -->
<view v-show="feedback.currentTabPro === 1" class="feedback-card">
<view v-show="feedback.currentTabPro === 1">
<zb-table :columns="feedback.tableSizeColumn" :stripe="true" :border="true" :data="feedback.tableSizeData"></zb-table>
</view>
</view>
......@@ -1610,6 +1615,7 @@ export default {
workorderSoDirectiveId: '',
workorderSoSizeItemId: '',
netWeight: 0,
minPackageNum: 0,
workorderList: [],
workorderOption: [],
directiveList:[],
......@@ -1781,6 +1787,7 @@ export default {
workorderSoDirectiveId: item.workorderSoDirectiveId,
workorderSoSizeItemId: item.workorderSoSizeItemId,
netWeight: item.netWeight,
minPackageNum: item.minPackageNum,
printContents: item.whether=='1'?item.printContents: null
})
.then((res) => {
......
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