Skip to content

M
mes-pad
Commit b554c254 authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

parents af93c3f6 da9ead87
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 24 deletions
pages/mes/prodReport/index.vue
View file @ b554c254
...@@ -115,27 +115,27 @@ ...@@ -115,27 +115,27 @@
<view> <view>
<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="100px" :model="feedback" :rules="rules"> <u-form label-width="80px" :model="feedback" :rules="rules" labelAlign="right">
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="任务单号" prop="quantity"> <u-form-item label="任务单号:" prop="quantity">
{{ feedback.taskCode }} {{ feedback.taskCode }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
<u-form-item label="工序" prop="nickName"> <u-form-item label="工序:" prop="nickName">
{{ feedback.processName }} {{ feedback.processName }}
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="报工总数量" prop="quantity"> <u-form-item label="报工总数量:" prop="quantity">
{{ feedback.quantityQualify + feedback.quantityUnqualify }} {{ feedback.quantityQualify + feedback.quantityUnqualify }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <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-input v-model="feedback.nickName"></u-input>
<u-button <u-button
@tap="getCode(feedback)" @tap="getCode(feedback)"
...@@ -148,12 +148,12 @@ ...@@ -148,12 +148,12 @@
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="编排单号" prop="quantity"> <u-form-item label="编排单号:" prop="quantity">
{{ feedback.arrangeCode }} {{ feedback.arrangeCode }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
<u-form-item label="生产工单" prop="workorderId"> <u-form-item label="生产工单:" prop="workorderId">
<uni-data-select v-model="feedback.workorderId" <uni-data-select v-model="feedback.workorderId"
:localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select> :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
</u-form-item> </u-form-item>
...@@ -161,19 +161,19 @@ ...@@ -161,19 +161,19 @@
</u-row> </u-row>
<u-row> <u-row>
<u-col span="6"> <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-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityQualify"></u-number-box>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <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-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityUnqualify"></u-number-box>
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="是否打印" prop="print"> <u-form-item label="是否打印:" prop="print">
<view class="uni-list-item__extra"> <view class="uni-list-item__extra">
<u-radio-group v-model="feedback.whether"> <u-radio-group v-model="feedback.whether">
<u-radio :name="1">是</u-radio> <u-radio :name="1">是</u-radio>
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <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}} {{feedback.printContents}}
<!-- <u-input v-model="feedback."></u-input> --> <!-- <u-input v-model="feedback."></u-input> -->
</u-form-item> </u-form-item>
...@@ -192,24 +192,29 @@ ...@@ -192,24 +192,29 @@
<view v-if="feedback.isLastProcess"> <view v-if="feedback.isLastProcess">
<u-row> <u-row>
<u-col span="6"> <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> <uni-data-select v-model="feedback.workorderSoDirectiveId" :localdata="feedback.directiveList"></uni-data-select>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <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> <uni-data-select v-model="feedback.workorderSoSizeItemId" :localdata="feedback.sizeList"></uni-data-select>
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-row> <u-row>
<u-col span="6"> <u-col span="3">
<u-form-item label="净重(KG)" prop="netWeight"> <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-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-form-item>
</u-col> </u-col>
<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 <u-button
@tap="getPrintTemplate(feedback)" @tap="getPrintTemplate(feedback)"
...@@ -225,11 +230,11 @@ ...@@ -225,11 +230,11 @@
<view v-if="feedback.isLastProcess"> <view v-if="feedback.isLastProcess">
<u-tabs :list="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-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> <zb-table :columns="feedback.tableDirectiveColumn" :stripe="true" :border="true" :data="feedback.tableDirectiveData"></zb-table>
</view> </view>
<!-- SIZE列表 --> <!-- 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> <zb-table :columns="feedback.tableSizeColumn" :stripe="true" :border="true" :data="feedback.tableSizeData"></zb-table>
</view> </view>
</view> </view>
...@@ -1282,10 +1287,10 @@ export default { ...@@ -1282,10 +1287,10 @@ export default {
this.curTaskInfo = row; this.curTaskInfo = row;
this.getMaterialUsageRecordList(); this.getMaterialUsageRecordList();
}, },
getCode(row){ getCode(row){
this.usePersonData = row this.usePersonData = row
this.userTempVisible=true; this.userTempVisible=true;
}, },
toggleAllSelection(checked, arr) { toggleAllSelection(checked, arr) {
// console.log(arr, 'this.tableSelectData'); // console.log(arr, 'this.tableSelectData');
this.tableSelectData = arr; this.tableSelectData = arr;
...@@ -1533,7 +1538,7 @@ export default { ...@@ -1533,7 +1538,7 @@ export default {
attr1: this.stopReason attr1: this.stopReason
}) })
.then((res) => { .then((res) => {
if (res.code === 200) {showToast || true if (res.code === 200) {
const showToast = showToast === false? false: true const showToast = showToast === false? false: true
if(showToast) { if(showToast) {
this.$u.toast('变更成功'); this.$u.toast('变更成功');
...@@ -1610,6 +1615,7 @@ export default { ...@@ -1610,6 +1615,7 @@ export default {
workorderSoDirectiveId: '', workorderSoDirectiveId: '',
workorderSoSizeItemId: '', workorderSoSizeItemId: '',
netWeight: 0, netWeight: 0,
minPackageNum: 0,
workorderList: [], workorderList: [],
workorderOption: [], workorderOption: [],
directiveList:[], directiveList:[],
...@@ -1781,6 +1787,7 @@ export default { ...@@ -1781,6 +1787,7 @@ export default {
workorderSoDirectiveId: item.workorderSoDirectiveId, workorderSoDirectiveId: item.workorderSoDirectiveId,
workorderSoSizeItemId: item.workorderSoSizeItemId, workorderSoSizeItemId: item.workorderSoSizeItemId,
netWeight: item.netWeight, netWeight: item.netWeight,
minPackageNum: item.minPackageNum,
printContents: item.whether=='1'?item.printContents: null printContents: item.whether=='1'?item.printContents: null
}) })
.then((res) => { .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