Commit 09695334 authored by tanjunxin's avatar tanjunxin

fix: 余料退料添加副产品标识

parent 6508ee13
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name" : "mes-pda", "name" : "mes-pda",
"appid" : "__UNI__FB0FD5F", "appid" : "__UNI__FB0FD5F",
"description" : "MES-PDA", "description" : "MES-PDA",
"versionName" : "1.2.3", "versionName" : "1.2.4",
"versionCode" : 123, "versionCode" : 124,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
......
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
均摊明细 均摊明细
</u-button> </u-button>
</view> </view>
<view class="item input">退料数量:<uni-easyinput v-model="num" trim="all" type="text" <view class="item input">退料数量:<uni-easyinput v-model="num" trim="all" type="number"
@input="handleChange"></uni-easyinput>/PCS @input="handleChange"></uni-easyinput>/PCS
</view> </view>
<view class="item">申请数量:{{ batchNum }}/PCS</view> <view class="item">申请数量:{{ batchNum }}/PCS</view>
<view class="item">是否副产品:{{ item.coproduct == "Y" ? '是' : '否' }}</view>
</view> </view>
<view class="listBottom"> <view class="listBottom">
<view class="bottomTitle" @tap="show = !show"> <view class="bottomTitle" @tap="show = !show">
...@@ -27,13 +28,15 @@ ...@@ -27,13 +28,15 @@
</view> </view>
</view> </view>
<view v-if="show" class="bottomBox"> <view v-if="show" class="bottomBox">
<view class="bottomItem" v-for="(ele, idx) in sapList"> <view class="bottomItem" v-for="(ele, idx) in sapList" :key="idx">
<view class="items">{{ ele.batchNo }}</view> <view class="items">{{ ele.batchNo }}</view>
<view class="items">{{ ele.sapItemCode }}<br>{{ele.itemName}}</view> <view class="items">{{ ele.sapItemCode }}<br>{{ele.itemName}}</view>
<view class="items">PL号:<br> <view class="items">PL号:<br>
<view class="items" v-for="p in ele.plNum.split('|')"> <template v-if="ele.plNum">
{{ p }} <view class="items" v-for="(p, i) in ele.plNum.split('|')" key="i">
</view> {{ p }}
</view>
</template>
</view> </view>
<view class="items">批次数量:{{ ele.backNum }}/PCS</view> <view class="items">批次数量:{{ ele.backNum }}/PCS</view>
<view class="items">生产日期:{{ ele.produceTime }}</view> <view class="items">生产日期:{{ ele.produceTime }}</view>
...@@ -42,7 +45,7 @@ ...@@ -42,7 +45,7 @@
</view> </view>
<u-popup class="oddments-popup" v-model="visible" mode="center" :mask-close-able="false"> <u-popup class="oddments-popup" v-model="visible" mode="center" :mask-close-able="false">
<scroll-view scroll-y="true" style="height: 600rpx;"> <scroll-view scroll-y="true" style="height: 600rpx;">
<view class="content" v-for="(ele, idx) in pordList"> <view class="content" v-for="(ele, idx) in pordList" :index="idx">
<view class="item">生产单号:{{ ele.workorderCode }}</view> <view class="item">生产单号:{{ ele.workorderCode }}</view>
<view class="item">{{ ele.sapItemCode }}<br>{{ele.itemName}}</view> <view class="item">{{ ele.sapItemCode }}<br>{{ele.itemName}}</view>
<view class="item">工单计划数:{{ ele.quantity }}/PCS</view> <view class="item">工单计划数:{{ ele.quantity }}/PCS</view>
...@@ -141,7 +144,12 @@ ...@@ -141,7 +144,12 @@
this.$u.toast("退料数量不可以超过申请数量!"); this.$u.toast("退料数量不可以超过申请数量!");
} else { } else {
this.sapList.forEach(ele => { this.sapList.forEach(ele => {
ele.ERFMG = (val * (ele.quantity / this.totalNum)).toFixed(2); if (ele.coproduct == "Y") {
ele.ERFMG = val;
} else {
ele.ERFMG = (val * (ele.quantity / this.totalNum)).toFixed(2);
}
ele.COPRODUCT = ele.coproduct;
}) })
} }
// } // }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</view> </view>
<ContentLoadingMore class="cardbox" :list='chargaArr'> <ContentLoadingMore class="cardbox" :list='chargaArr'>
<scroll-view scroll-y="true" style="height: 680rpx;"> <scroll-view scroll-y="true" style="height: 680rpx;">
<view class="cardContent" v-for="(item, index) in chargaArr"> <view class="cardContent" v-for="(item, index) in chargaArr" :key="index">
<PutwayItem :item='item' :list='chargaArr' @delGonds="delGonds" /> <PutwayItem :item='item' :list='chargaArr' @delGonds="delGonds" />
</view> </view>
</scroll-view> </scroll-view>
......
This diff is collapsed.
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