From 64a7f738aadbf552bfb1ce24c46b1924767bf526 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 05 九月 2023 16:00:16 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue b/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
index 3ac271f..e500034 100644
--- a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
+++ b/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
@@ -1,11 +1,11 @@
<template>
<view class="tl">
- <workOrderInfo :orederMessage="{proUserList:[]}" />
+ <workOrderInfo :orederMessage="info" />
<div class="tl_title">
<div class="tl_title_left">
<div class="tl_title_left_x"></div>
<span>鎶曟枡淇℃伅</span>
- <!-- <span>{{total == 0 ? '' : total}}{{formList[formList.length - 1].dw ? formList[formList.length - 1].dw : ''}}</span> -->
+ <!-- <span>{{total == 0 ? '' : total}}{{formList[formList.length - 1].dw ? formList[formList.length - 1].dw : ''}}</span> -->
<!-- <span>{{total == 0 ? '' : total}}{{formList[formList.length - 1].dw ? formList[formList.length - 1].dw : ''}}</span> -->
</div>
<div class="tl_title_right" @click="add">
@@ -47,29 +47,35 @@
</div>
</div>
</u-swipe-action-item>
- </u-swipe-action>
- <SelectMaterial ref="selectMaterial" @selectAction="getValue"/>
- <SelectMultipleMaterial ref="selectMultipleMaterial"/>
+ </u-swipe-action>
+ <SelectMaterial ref="selectMaterial" @selectAction="getValue" />
+ <!-- <SelectMultipleMaterial ref="selectMultipleMaterial" @selected="getMaterails"/> -->
</view>
</template>
<script>
- import workOrderInfo from '@/components/workOrderInfo.vue'
- import SelectMaterial from '@/components/selectMaterial.vue'
- import SelectMultipleMaterial from '@/components/SelectMultipleMaterial.vue'
-
+ import workOrderInfo from '@/components/workOrderInfo.vue'
+ import SelectMaterial from '@/components/selectMaterial.vue'
+ // import SelectMultipleMaterial from '@/components/SelectMultipleMaterial.vue'
+ import {
+ queryById,
+ createMaterial,
+ createMaterialStandard
+ } from '@/util/api/WorkOrderAPI'
import {
positiveInteger,
number
} from '@/common/config'
export default {
components: {
- workOrderInfo,
- SelectMaterial,
- SelectMultipleMaterial
+ workOrderInfo,
+ SelectMaterial,
+ // SelectMultipleMaterial
},
data() {
return {
+ deviceId: '',
+ workorderId: '',
// formList: [{
// id: Date.now(),
// toolingTypeId: '', // 宸ヨ绫诲瀷
@@ -82,6 +88,7 @@
// dw: '', // 鐗╂枡鍗曚綅
// unitAttribute: ''
// }],
+ info: {},
materialList: [{
id: '',
materialName: '',
@@ -100,11 +107,25 @@
}
}],
};
- },
+ },
+ onLoad(obj) {
+ this.workorderId = obj.id
+ queryById(this.workorderId)
+ .then(res => {
+ if (res.code === 200) {
+ this.info = res.data
+ this.deviceId = res.data.pgmodel.id
+ }
+ })
+ },
methods: {
- open1(index) {
- // this.$refs.selectMaterial.open({})
- this.$refs.selectMultipleMaterial.open({})
+ open1(index) {
+ // this.$refs.selectMaterial.open({})
+ this.index = index
+ this.$refs.selectMaterial.open({
+ workorderId: this.workorderId,
+ deviceId: this.deviceId
+ })
},
deleItem(index) {
if (this.materialList.length === 1) {
@@ -113,7 +134,7 @@
}
this.materialList.splice(index, 1)
},
- add() {
+ add() {
this.total += 1
this.materialList.unshift({
id: '',
@@ -149,10 +170,29 @@
})
this.materialList[index].num = ''
}
- },
- getValue(item) {
- console.log(item);
- }
+ },
+ getValue(v) {
+ for (let i = 0; i < this.materialList.length; i++) {
+ if (item.id === this.materialList[i].id) {
+ uni.$u.toast({
+ message: '涓嶈兘閲嶅閫夋嫨鐩稿悓鐗╂枡'
+ })
+ return
+ }
+ }
+ this.materialList[this.index].id = item.id
+ this.materialList[this.index].materialName = item.materialName
+ this.materialList[this.index].num = item.num
+ this.materialList[this.index].batch = item.batch
+ this.materialList[this.index].locationName = item.locationName
+ this.materialList[this.index].materialCode = item.materialCode
+ this.materialList[this.index].procedureName = item.procedureName
+ this.materialList[this.index].qualityType = item.qualityType
+ this.materialList[this.index].unitAttribute = item.unitAttribute
+ },
+ // getMaterails({materials}) {
+ // console.log(item);
+ // }
}
}
</script>
--
Gitblit v1.9.3