|
|
@@ -8,79 +8,82 @@
|
|
|
更换设备
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <u-list @scrolltolower="scrolltolower" class="z_list2">
|
|
|
|
|
|
+ <view class="material rx-ss" v-for="(item, index) in list" :key='index'>
|
|
|
|
|
|
- <view class="material rx-ss" v-for="(item, index) in list" :key='index'>
|
|
|
-
|
|
|
- <view class="left rx-ss" @click="getDelete(index)" v-if='workOrderId'>
|
|
|
- <uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
|
|
|
- </view>
|
|
|
- <view class="content_table">
|
|
|
- <view class="item">
|
|
|
- <view class="lable rx-cc">工位名称</view>
|
|
|
- <view class="content">
|
|
|
- {{ item.workstationName || (item.extInfo && item.extInfo.workstationName) }}
|
|
|
- </view>
|
|
|
+ <view class="left rx-ss" @click="getDelete(index)" v-if='workOrderId'>
|
|
|
+ <uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
|
|
|
</view>
|
|
|
+ <view class="content_table">
|
|
|
+ <view class="item">
|
|
|
+ <view class="lable rx-cc">工位名称</view>
|
|
|
+ <view class="content">
|
|
|
+ {{ item.workstationName || (item.extInfo && item.extInfo.workstationName) }}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
|
|
|
- <view class="item">
|
|
|
- <view class="lable rx-cc">设备编码</view>
|
|
|
- <view class="content">
|
|
|
- {{ item.code }}
|
|
|
+ <view class="item">
|
|
|
+ <view class="lable rx-cc">设备编码</view>
|
|
|
+ <view class="content">
|
|
|
+ {{ item.code }}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
|
|
|
- <view class="item">
|
|
|
- <view class="lable rx-cc">设备名称</view>
|
|
|
- <view class="content">{{ item.name }}</view>
|
|
|
- </view>
|
|
|
+ <view class="item">
|
|
|
+ <view class="lable rx-cc">设备名称</view>
|
|
|
+ <view class="content">{{ item.name }}</view>
|
|
|
+ </view>
|
|
|
|
|
|
|
|
|
|
|
|
- <view class="item rx-sc">
|
|
|
- <view class="rx ww50">
|
|
|
- <view class="lable rx-cc">固资编码</view>
|
|
|
- <view class="content">{{ item.extInfo.fixCode }} </view>
|
|
|
+ <view class="item rx-sc">
|
|
|
+ <view class="rx ww50">
|
|
|
+ <view class="lable rx-cc">固资编码</view>
|
|
|
+ <view class="content">{{ item.extInfo.fixCode }} </view>
|
|
|
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
|
|
|
|
|
|
- <view class="rx ww50">
|
|
|
- <view class="lable ww80 rx-cc">编号</view>
|
|
|
- <view class="content">{{ item.extInfo.codeNumber }}</view>
|
|
|
+ <view class="rx ww50">
|
|
|
+ <view class="lable ww80 rx-cc">编号</view>
|
|
|
+ <view class="content">{{ item.extInfo.codeNumber }}</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
</view>
|
|
|
|
|
|
- </view>
|
|
|
|
|
|
|
|
|
+ <view class="item">
|
|
|
+
|
|
|
+ <view class="lable rx-cc">炉次号</view>
|
|
|
+ <view class="content content_num">
|
|
|
+ <input class="uni-input" v-model="item.extInfo.heatNumber"></input>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view v-if="clientEnvironmentId == 2" class="lable rx-cc"
|
|
|
+ :style="Object.prototype.hasOwnProperty.call(item.extInfo, 'turnoverList') && item.extInfo.turnoverList.length > 0 ? 'color: #E6A23C' : 'color: #157A2C'"
|
|
|
+ @click="handleStorage(index)">货位</view>
|
|
|
|
|
|
- <view class="item">
|
|
|
-
|
|
|
- <view class="lable rx-cc">炉次号</view>
|
|
|
- <view class="content content_num">
|
|
|
- <input class="uni-input" v-model="item.extInfo.heatNumber"></input>
|
|
|
</view>
|
|
|
-
|
|
|
- <view v-if="clientEnvironmentId == 2" class="lable rx-cc"
|
|
|
- :style="Object.prototype.hasOwnProperty.call(item.extInfo, 'turnoverList') && item.extInfo.turnoverList.length > 0 ? 'color: #E6A23C' : 'color: #157A2C'"
|
|
|
- @click="handleStorage(index)">货位</view>
|
|
|
|
|
|
- </view>
|
|
|
-
|
|
|
- <view class="item" v-if="clientEnvironmentId == 2 && Object.prototype.hasOwnProperty.call(item, 'equipmentLabelJson') && item.equipmentLabelJson.length != 0 && item.equipmentLabelJson[0].SBFL == 1">
|
|
|
- <view class="lable rx-cc">是否封炉</view>
|
|
|
- <view class="content">
|
|
|
- <u-checkbox-group v-model="item.isSBFL" size="15px" >
|
|
|
- <u-checkbox labelSize="15px" iconSize="10px" activeColor="#157A2C" name="true" label="是"></u-checkbox>
|
|
|
- </u-checkbox-group>
|
|
|
+ <view class="item"
|
|
|
+ v-if="clientEnvironmentId == 2 && Object.prototype.hasOwnProperty.call(item, 'equipmentLabelJson') && item.equipmentLabelJson.length != 0 && item.equipmentLabelJson[0].SBFL == 1">
|
|
|
+ <view class="lable rx-cc">是否封炉</view>
|
|
|
+ <view class="content">
|
|
|
+ <u-checkbox-group v-model="item.isSBFL" size="15px">
|
|
|
+ <u-checkbox labelSize="15px" iconSize="10px" activeColor="#157A2C" name="true"
|
|
|
+ label="是"></u-checkbox>
|
|
|
+ </u-checkbox-group>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
|
|
|
|
|
|
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
|
|
|
+ </u-list>
|
|
|
<SearchPopup mode="center" v-if='popupShow'>
|
|
|
<template v-slot:list>
|
|
|
|
|
|
@@ -89,8 +92,8 @@
|
|
|
<view class="tab_item" :style="tabAct == idxx ? 'color: #E6A23C' : ''"
|
|
|
v-for="(idItem, idxx) in turnoverList" :key="idxx" @click="handTab(idxx)">
|
|
|
{{ idItem.name }}{{ idxx + 1 }}
|
|
|
- <uni-icons style="margin-left: 10rpx;" custom-prefix="iconfont" @click.native="handDel(idxx)" v-if="!isDetails"
|
|
|
- type="icon-shanchu" size="16" color="#fa3534"></uni-icons>
|
|
|
+ <uni-icons style="margin-left: 10rpx;" custom-prefix="iconfont" @click.native="handDel(idxx)"
|
|
|
+ v-if="!isDetails" type="icon-shanchu" size="16" color="#fa3534"></uni-icons>
|
|
|
</view>
|
|
|
|
|
|
<view class="tab_add" @click="handTabAdd()" v-if="!isDetails">新增</view>
|
|
|
@@ -104,16 +107,14 @@
|
|
|
<view class="search_list">
|
|
|
<u-form labelPosition="left" :model="idItem" labelWidth="160" labelAlign="left"
|
|
|
class="baseForm">
|
|
|
-
|
|
|
+
|
|
|
<u-form-item label="周转车:" class="required-form" borderBottom prop="">
|
|
|
<zxz-uni-data-select :localdata="turnover" v-model="idItem.turnoverId" dataValue='id'
|
|
|
format='{name}-{code}' dataKey="id" filterable :clear='false'
|
|
|
@change="e => changeTurnover(e, idxx)" v-if="!isDetails"></zxz-uni-data-select>
|
|
|
- <text v-else>{{ idItem.turnoverName}} </text>
|
|
|
+ <text v-else>{{ idItem.turnoverName}} </text>
|
|
|
</u-form-item>
|
|
|
- <view class="rx-bs" style="margin-top: 6rpx;" v-if="ishuoWei">
|
|
|
|
|
|
- </view>
|
|
|
|
|
|
</u-form>
|
|
|
</view>
|
|
|
@@ -132,7 +133,75 @@
|
|
|
<view class="tr row rx-sc" v-for="(it, idx) in idItem.positionList" :key='idx'>
|
|
|
<view class="tr row rx-sc">
|
|
|
<view class="item ww10">
|
|
|
- {{ it.code }}
|
|
|
+ {{ it.code }}
|
|
|
+ </view>
|
|
|
+ <view class="item ww25 "
|
|
|
+ :class="{'color157': it.workOrderCode === wordItem.code}">
|
|
|
+ {{ it.workOrderCode }}
|
|
|
+ </view>
|
|
|
+ <view class="item ww25 "
|
|
|
+ :class="{'color157': it.workOrderCode === wordItem.code}">
|
|
|
+ {{ it.categoryCode }}
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="item ww20 ">
|
|
|
+ <text>{{ it.quantity }} </text>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="item ww20">
|
|
|
+ <input
|
|
|
+ :class="['uni-input', wordItem.code == it.workOrderCode && it.quantity > 0 ? 'content_num' : '']"
|
|
|
+ v-model="it.feedNum" type="digit"
|
|
|
+ :disabled="it.quantity <= 0 || wordItem.code != it.workOrderCode || isDetails"
|
|
|
+ @blur="Number(it.feedNum) > Number(it.quantity) ? it.feedNum = Number(it.quantity) : ''"></input>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </u-list>
|
|
|
+
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
+ <u-line color="#2979ff" style="margin: 16rpx 0;"></u-line>
|
|
|
+
|
|
|
+ <!-- 卸车 -->
|
|
|
+ <view class="search_list">
|
|
|
+ <u-form labelPosition="left" :model="idItem" labelWidth="200" labelAlign="left"
|
|
|
+ class="baseForm">
|
|
|
+
|
|
|
+ <u-form-item label="卸到周转车:" class="required-form" borderBottom prop="">
|
|
|
+ <zxz-uni-data-select :localdata="unloadTurnover" v-model="idItem.unloadTurnoverId"
|
|
|
+ dataValue='id' format='{name}-{code}' dataKey="id" filterable :clear='false'
|
|
|
+ @change="e => changeUnloadTurnover(e, idxx, idItem)"
|
|
|
+ v-if="!isDetails"></zxz-uni-data-select>
|
|
|
+ <text v-else>{{ idItem.unloadTurnoverName}} </text>
|
|
|
+ </u-form-item>
|
|
|
+
|
|
|
+
|
|
|
+ </u-form>
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
+ <view class="content_table2">
|
|
|
+ <view class="head row rx-sc">
|
|
|
+ <view class="item ww10">货位</view>
|
|
|
+ <view class="item ww25">工单编号</view>
|
|
|
+ <view class="item ww25">产品编码</view>
|
|
|
+ <view class="item ww20">数量</view>
|
|
|
+ <view class="item ww20">投料</view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <view class="table">
|
|
|
+ <u-list @scrolltolower="scrolltolower" class="z_list">
|
|
|
+ <view class="tr row rx-sc" v-for="(it, idx) in idItem.unloadPositionList" :key='idx'>
|
|
|
+ <view class="tr row rx-sc">
|
|
|
+ <view class="item ww10">
|
|
|
+ {{ it.code }}
|
|
|
</view>
|
|
|
<view class="item ww25 "
|
|
|
:class="{'color157': it.workOrderCode === wordItem.code}">
|
|
|
@@ -165,11 +234,6 @@
|
|
|
|
|
|
</view>
|
|
|
|
|
|
-
|
|
|
- <u-line color="#2979ff" style="margin: 16rpx 0;"></u-line>
|
|
|
- 卸货功能
|
|
|
-
|
|
|
-
|
|
|
</view>
|
|
|
|
|
|
|
|
|
@@ -246,9 +310,16 @@
|
|
|
name: '周转车',
|
|
|
turnoverId: '',
|
|
|
turnoverName: '',
|
|
|
- positionList: []
|
|
|
+ positionList: [],
|
|
|
+
|
|
|
+ unloadTurnoverId: '',
|
|
|
+ unloadTurnoverName: '',
|
|
|
+ unloadPositionList: []
|
|
|
}],
|
|
|
|
|
|
+ unloadTurnover: [],
|
|
|
+
|
|
|
+
|
|
|
tabAct: 0
|
|
|
|
|
|
|
|
|
@@ -272,7 +343,12 @@
|
|
|
handleStorage(idx) {
|
|
|
this.listIndex = idx || 0
|
|
|
|
|
|
- this.turnoverList = JSON.parse(JSON.stringify(this.list[0].extInfo.turnoverList)) || this.turnoverList
|
|
|
+ if (Object.prototype.hasOwnProperty.call(this.list[0].extInfo, 'turnoverList')) {
|
|
|
+ this.unloadTurnover = this.turnover
|
|
|
+
|
|
|
+ this.turnoverList = JSON.parse(JSON.stringify(this.list[0].extInfo.turnoverList)) || this.turnoverList
|
|
|
+ }
|
|
|
+
|
|
|
this.popupShow = true
|
|
|
|
|
|
|
|
|
@@ -364,7 +440,35 @@
|
|
|
return
|
|
|
}
|
|
|
this.turnoverList.splice(idx, 1)
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+ changeUnloadTurnover(e, idxx, idItem) {
|
|
|
+
|
|
|
+
|
|
|
+ let _arr = idItem.positionList
|
|
|
+ let unloadArr = e.extInfo.positionList || []
|
|
|
+
|
|
|
+
|
|
|
+ for (let obj1 of unloadArr) {
|
|
|
+ for (let obj2 of _arr) {
|
|
|
+ if (obj1.code === obj2.code && obj2.workOrderCode === this.wordItem.code && !obj1.workOrderCode && !obj1.quantity) {
|
|
|
+ obj1.workOrderCode = obj2.workOrderCode;
|
|
|
+ obj1.categoryCode = obj2.categoryCode;
|
|
|
+ obj1.quantity = obj2.quantity;
|
|
|
+ obj1.feedNum = obj2.feedNum;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ this.$set(this.turnoverList[idxx], 'unloadTurnoverName', e.name + '-' + e.code)
|
|
|
+ this.$set(this.turnoverList[idxx], 'unloadPositionList', JSON.parse(JSON.stringify(unloadArr)))
|
|
|
+ this.$forceUpdate()
|
|
|
+
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -426,7 +530,7 @@
|
|
|
|
|
|
|
|
|
.content_table {
|
|
|
- width: 680rpx;
|
|
|
+ width: 674rpx;
|
|
|
border: 2rpx solid $border-color;
|
|
|
margin-bottom: 10rpx;
|
|
|
|
|
|
@@ -606,7 +710,11 @@
|
|
|
|
|
|
|
|
|
.z_list {
|
|
|
- max-height: 500rpx;
|
|
|
+ max-height: 350rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .z_list2 {
|
|
|
+ max-height: 700rpx;
|
|
|
}
|
|
|
|
|
|
.content_num {
|
ysy