|
|
@@ -13,7 +13,12 @@
|
|
|
<deviceBom v-if='item.equipmentList.length != 0' :workOrderId='item.workOrderId'
|
|
|
:list='item.equipmentList' @scanIt='scanIt'></deviceBom>
|
|
|
|
|
|
- {{ item.turnover}}
|
|
|
+ <turnoverBom v-if='item.turnover.length != 0' :list='item.turnover' :wordItem='item' pattern='job'
|
|
|
+ >
|
|
|
+ </turnoverBom>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<view class="operate_box rx-sc">
|
|
|
<u-button size="small" class="u-reset-button" type="success"
|
|
|
@click="handAdd(item.workOrderId)">手动添加</u-button>
|
|
|
@@ -62,13 +67,16 @@
|
|
|
import inspectionBom from '../components/inspectionBom.vue'
|
|
|
import deviceBom from '../../feeding/components/deviceBom.vue'
|
|
|
import diagramLast from '../components/diagramLast.vue'
|
|
|
+
|
|
|
+ import turnoverBom from '../../sample/components/turnoverBom.vue'
|
|
|
|
|
|
export default {
|
|
|
components: {
|
|
|
workOrderBom,
|
|
|
inspectionBom,
|
|
|
deviceBom,
|
|
|
- diagramLast
|
|
|
+ diagramLast,
|
|
|
+ turnoverBom
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -114,14 +122,14 @@
|
|
|
if (f.rootCategoryLevelId == 4) {
|
|
|
equipmentList = equipmentList.concat(f)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (f.rootCategoryLevelId == 7) {
|
|
|
turnover = turnover.concat(f)
|
|
|
}
|
|
|
})
|
|
|
|
|
|
this.$set(m, 'equipmentList', equipmentList)
|
|
|
- this.$set(m, 'turnover', turnover)
|
|
|
+ this.$set(m, 'turnover', turnover)
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -141,14 +149,14 @@
|
|
|
|
|
|
this.List = res.map(m => {
|
|
|
m.workOrderId = m.id
|
|
|
-
|
|
|
+
|
|
|
m.equipmentList = [] // 设备
|
|
|
- m.turnover = [] // 周转车
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ m.turnover = [] // 周转车
|
|
|
+
|
|
|
|
|
|
- if (m.normalQuality != null || m.workOrderType == 2 ) {
|
|
|
+
|
|
|
+
|
|
|
+ if (m.normalQuality != null || m.workOrderType == 2) {
|
|
|
this.$set(m, 'normalQuality', {})
|
|
|
m.normalQuality.quantity = 0
|
|
|
m.normalQuality.inspectionId = this.inspectionId
|
|
|
@@ -183,7 +191,7 @@
|
|
|
|
|
|
|
|
|
getLastTreeByPid(this.inspectionId).then(res => {
|
|
|
-
|
|
|
+
|
|
|
this.inspectionList = res
|
|
|
|
|
|
this.inspectionList.push({
|
|
|
@@ -232,7 +240,7 @@
|
|
|
|
|
|
scanItData(result, id) {
|
|
|
scanLedger(result).then(res => {
|
|
|
-
|
|
|
+
|
|
|
let _arr = []
|
|
|
if (res.length == 1 && res[0].rootCategoryLevelId == 4) { // 设备
|
|
|
_arr = this.List
|
|
|
@@ -245,8 +253,8 @@
|
|
|
this.$forceUpdate()
|
|
|
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
if (res.length == 1 && res[0].rootCategoryLevelId == 7) { // 周转车
|
|
|
_arr = this.List
|
|
|
_arr.forEach((e, index) => {
|
|
|
@@ -256,9 +264,9 @@
|
|
|
})
|
|
|
this.List = _arr
|
|
|
this.$forceUpdate()
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
})
|
|
|
|
|
|
@@ -304,7 +312,7 @@
|
|
|
|
|
|
handAdd(id) {
|
|
|
console.log(id)
|
|
|
-
|
|
|
+
|
|
|
const storageKey = Date.now() + "";
|
|
|
uni.setStorageSync(storageKey, this.List || []);
|
|
|
uni.navigateTo({
|
ysy