zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去掉工位

agv
李俊城 4 weeks ago
parent
4d96be6fc5
commit
95ebe667dd
5 changed files with 10 additions and 309 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      fe/PDA/pages/request/assembleIssueRequest.vue
  2. 63
      fe/PDA/pages/request/coatingIssueRequest.vue
  3. 66
      fe/PDA/pages/request/injectionIssueRequest.vue
  4. 64
      fe/PDA/pages/request/injectionPlanRequest.vue
  5. 63
      fe/PDA/pages/request/kittingIssueRequest.vue

63
fe/PDA/pages/request/assembleIssueRequest.vue
View File

@ -19,25 +19,6 @@
</view> </view>
</view> </view>
<view class="uni-list" v-if="itemList.length>0">
<view class=""
style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center; margin-bottom: 20rpx; ">
工位关系
</view>
<view class="uni-flex" style="flex-wrap: wrap; margin: 10rpx;" >
<view style="width: 30%; display: flex; flex-direction: row;" v-for="(item, index) in workStationList" :key="index">
<view class="uni-flex" style="flex-direction: row; margin: 12rpx;" @click="checkeClick(item.value)">
<view class="">
<checkbox :value="item.value" :checked="item.checked" />
</view>
<view class="">
{{item.name}}
</view>
</view>
</view>
</view>
</view>
<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail"> <scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
@ -115,7 +96,6 @@
<script> <script>
import { import {
assembleIssueRequest, assembleIssueRequest,
getWorkStationByLocation
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -146,7 +126,6 @@
return { return {
itemList: [], itemList: [],
dataContent: {}, dataContent: {},
workStationList: [],
}; };
}, },
props: { props: {
@ -169,23 +148,6 @@
}, },
methods: { methods: {
checkeClick(value) {
for (let i = 0; i < this.workStationList.length; i++) {
this.workStationList[i].checked = false
}
for (let i = 0; i < this.workStationList.length; i++) {
if (this.workStationList[i].value === value) {
if (this.workStationList[i].checked == true) {
this.workStationList[i].checked = false
} else {
this.workStationList[i].checked = true
}
}
}
this.$forceUpdate()
},
openScanPopup() { openScanPopup() {
this.$refs.scanPopup.openScanPopup() this.$refs.scanPopup.openScanPopup()
}, },
@ -197,26 +159,6 @@
this.itemList.push(result) this.itemList.push(result)
this.$forceUpdate() this.$forceUpdate()
getWorkStationByLocation(result.locationCode).then(res => {
if (res && res.length > 0) {
this.workStationList = []
res.forEach(item => {
this.workStationList.push({
value: item.code,
name: item.name,
checked: false
})
})
scanSuccessAudio()
} else {
scanFailedAudio()
this.showMessage("获取工位失败")
}
}).catch(error => {
scanFailedAudio()
this.showMessage("获取工位失败")
})
}, },
@ -250,10 +192,9 @@
}, },
setParams() { setParams() {
var workStation = this.workStationList.find(r => r.checked == true)
var param = { var param = {
worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN, worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
remark: workStation ? workStation.value : "", remark: "",
extraProperties: {}, extraProperties: {},
activeDate: getISODateTime(), activeDate: getISODateTime(),
autoSubmit: true, autoSubmit: true,
@ -268,7 +209,7 @@
this.itemList.forEach(res => { this.itemList.forEach(res => {
var data = { var data = {
remark: workStation ? workStation.value : "", remark: "",
qty:res.qty, qty:res.qty,
itemCode: res.partCode, itemCode: res.partCode,
itemName: res.partName, itemName: res.partName,

63
fe/PDA/pages/request/coatingIssueRequest.vue
View File

@ -19,25 +19,6 @@
</view> </view>
</view> </view>
<view class="uni-list" v-if="itemList.length>0">
<view class=""
style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center; margin-bottom: 20rpx; ">
工位关系
</view>
<view class="uni-flex" style="flex-wrap: wrap; margin: 10rpx;" >
<view style="width: 30%; display: flex; flex-direction: row;" v-for="(item, index) in workStationList" :key="index">
<view class="uni-flex" style="flex-direction: row; margin: 12rpx;" @click="checkeClick(item.value)">
<view class="">
<checkbox :value="item.value" :checked="item.checked" />
</view>
<view class="">
{{item.name}}
</view>
</view>
</view>
</view>
</view>
<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail"> <scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
@ -115,7 +96,6 @@
<script> <script>
import { import {
coatingIssueRequest, coatingIssueRequest,
getWorkStationByLocation
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -146,7 +126,6 @@
return { return {
itemList: [], itemList: [],
dataContent: {}, dataContent: {},
workStationList: [],
}; };
}, },
props: { props: {
@ -169,23 +148,6 @@
}, },
methods: { methods: {
checkeClick(value) {
for (let i = 0; i < this.workStationList.length; i++) {
this.workStationList[i].checked = false
}
for (let i = 0; i < this.workStationList.length; i++) {
if (this.workStationList[i].value === value) {
if (this.workStationList[i].checked == true) {
this.workStationList[i].checked = false
} else {
this.workStationList[i].checked = true
}
}
}
this.$forceUpdate()
},
openScanPopup() { openScanPopup() {
this.$refs.scanPopup.openScanPopup() this.$refs.scanPopup.openScanPopup()
}, },
@ -196,26 +158,6 @@
result.defaultHandleQty=result.qty result.defaultHandleQty=result.qty
this.itemList.push(result) this.itemList.push(result)
this.$forceUpdate() this.$forceUpdate()
getWorkStationByLocation(result.locationCode).then(res => {
if (res && res.length > 0) {
this.workStationList = []
res.forEach(item => {
this.workStationList.push({
value: item.code,
name: item.name,
checked: false
})
})
scanSuccessAudio()
} else {
scanFailedAudio()
this.showMessage("获取工位失败")
}
}).catch(error => {
scanFailedAudio()
this.showMessage("获取工位失败")
})
}, },
@ -249,11 +191,10 @@
}, },
setParams() { setParams() {
var workStation = this.workStationList.find(r => r.checked == true)
var param = { var param = {
worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN, worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
remark: workStation ? workStation.value : "", remark: "",
extraProperties: {}, extraProperties: {},
activeDate: getISODateTime(), activeDate: getISODateTime(),
autoSubmit: true, autoSubmit: true,
@ -268,7 +209,7 @@
this.itemList.forEach(res => { this.itemList.forEach(res => {
var data = { var data = {
remark: workStation ? workStation.value : "", remark: "",
qty:res.qty, qty:res.qty,
itemCode: res.partCode, itemCode: res.partCode,
itemName: res.partName, itemName: res.partName,

66
fe/PDA/pages/request/injectionIssueRequest.vue
View File

@ -19,25 +19,6 @@
</view> </view>
</view> </view>
<view class="uni-list" v-if="itemList.length>0">
<view class=""
style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center; margin-bottom: 20rpx; ">
工位关系
</view>
<view class="uni-flex" style="flex-wrap: wrap;justify-content: space-between; margin: 10rpx;" >
<view style="width: 30%; display: flex; flex-direction: row;" v-for="(item, index) in workStationList" :key="index">
<view class="uni-flex" style="flex-direction: row; margin: 12rpx;" @click="checkeClick(item.value)">
<view class="">
<checkbox :value="item.value" :checked="item.checked" />
</view>
<view class="">
{{item.name}}
</view>
</view>
</view>
</view>
</view>
<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail"> <scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
@ -115,7 +96,6 @@
<script> <script>
import { import {
injectionIssueRequest, injectionIssueRequest,
getWorkStationByLocation
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -146,7 +126,6 @@
return { return {
itemList: [], itemList: [],
dataContent: {}, dataContent: {},
workStationList: [],
}; };
}, },
props: { props: {
@ -170,25 +149,6 @@
methods: { methods: {
checkeClick(value) {
for (let i = 0; i < this.workStationList.length; i++) {
this.workStationList[i].checked = false
}
for (let i = 0; i < this.workStationList.length; i++) {
if (this.workStationList[i].value === value) {
if (this.workStationList[i].checked == true) {
this.workStationList[i].checked = false
} else {
this.workStationList[i].checked = true
}
}
}
this.$forceUpdate()
},
openScanPopup() { openScanPopup() {
this.$refs.scanPopup.openScanPopup() this.$refs.scanPopup.openScanPopup()
}, },
@ -199,27 +159,6 @@
result.defaultHandleQty = result.qty result.defaultHandleQty = result.qty
this.itemList.push(result) this.itemList.push(result)
this.$forceUpdate() this.$forceUpdate()
// result.locationCode APA
getWorkStationByLocation(result.locationCode).then(res => {
if (res && res.length > 0) {
this.workStationList = []
res.forEach(item => {
this.workStationList.push({
value: item.code,
name: item.name,
checked: false
})
})
scanSuccessAudio()
} else {
scanFailedAudio()
this.showMessage("获取工位失败")
}
}).catch(error => {
scanFailedAudio()
this.showMessage("获取工位失败")
})
}, },
clear() { clear() {
@ -252,10 +191,9 @@
}, },
setParams() { setParams() {
var workStation = this.workStationList.find(r => r.checked == true)
var param = { var param = {
worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN, worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
remark: workStation ? workStation.value : "", remark: "",
extraProperties: {}, extraProperties: {},
activeDate: getISODateTime(), activeDate: getISODateTime(),
autoSubmit: true, autoSubmit: true,
@ -270,7 +208,7 @@
this.itemList.forEach(res => { this.itemList.forEach(res => {
var data = { var data = {
remark: workStation ? workStation.value : "", remark: "",
qty: res.qty, qty: res.qty,
itemCode: res.partCode, itemCode: res.partCode,
itemName: res.partName, itemName: res.partName,

64
fe/PDA/pages/request/injectionPlanRequest.vue
View File

@ -16,25 +16,6 @@
</view> </view>
</view> </view>
<view class="uni-list" v-if="showList.length>0">
<view class=""
style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center; margin-bottom: 20rpx; ">
工位关系
</view>
<view class="uni-flex" style="flex-wrap: wrap;justify-content: space-between; margin: 10rpx;" >
<view style="width: 50%; display: flex; flex-direction: row;" v-for="(item, index) in workStationList" :key="item.value">
<view class="uni-flex" style="flex-direction: row; margin: 12rpx;" @click="checkeClick(item.value)">
<view class="">
<checkbox :value="item.value" :checked="item.checked" />
</view>
<view class="">
{{item.name}}
</view>
</view>
</view>
</view>
</view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
@ -86,7 +67,6 @@
injectionIssuePlanRequestItemCategoryName, injectionIssuePlanRequestItemCategoryName,
injectionIssuePlanRequestItemCategory, injectionIssuePlanRequestItemCategory,
locations, locations,
getWorkStationByLocation,
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -123,7 +103,6 @@
toLocationInfo: null, toLocationInfo: null,
tabIndex: 0, tabIndex: 0,
customStyle: "white-space: normal;word-break:break-all", customStyle: "white-space: normal;word-break:break-all",
workStationList: [],
}; };
@ -157,23 +136,6 @@
} }
}, },
methods: { methods: {
checkeClick(value) {
for (let i = 0; i < this.workStationList.length; i++) {
this.workStationList[i].checked = false
}
for (let i = 0; i < this.workStationList.length; i++) {
if (this.workStationList[i].value === value) {
if (this.workStationList[i].checked == true) {
this.workStationList[i].checked = false
} else {
this.workStationList[i].checked = true
}
}
}
this.$forceUpdate()
},
getCategoryListName() { getCategoryListName() {
uni.showLoading({ uni.showLoading({
title: "加载中", title: "加载中",
@ -226,26 +188,6 @@
uni.hideLoading(); uni.hideLoading();
if (res) { if (res) {
this.toLocationInfo = res this.toLocationInfo = res
getWorkStationByLocation(res.code).then(res => {
if (res && res.length > 0) {
this.workStationList = []
res.forEach(item => {
this.workStationList.push({
value: item.code,
name: item.name,
checked: false
})
})
scanSuccessAudio()
} else {
scanFailedAudio()
this.showMessage("获取工位失败")
}
}).catch(error => {
scanFailedAudio()
this.showMessage("获取工位失败")
})
} else { } else {
scanFailedAudio() scanFailedAudio()
this.showMessage('目标库位【' + locationCode + '】不存在'); this.showMessage('目标库位【' + locationCode + '】不存在');
@ -284,7 +226,6 @@
this.toLocationInfo = null, this.toLocationInfo = null,
this.tabIndex = 0; this.tabIndex = 0;
this.$refs.comCollapseLocation.clearLocation(); this.$refs.comCollapseLocation.clearLocation();
this.workStationList=[]
}, },
submit(item) { submit(item) {
@ -304,9 +245,8 @@
title: "提交中...", title: "提交中...",
mask: true mask: true
}); });
var workStation = this.workStationList.find(r => r.checked == true)
var params = { var params = {
remark: workStation ? workStation.value : "", remark: "",
worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN, worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
activeDate: getISODateTime(), activeDate: getISODateTime(),
useOnTheWayLocation: false, useOnTheWayLocation: false,
@ -316,7 +256,7 @@
] ]
} }
var item = { var item = {
remark: workStation ? workStation.value : "", remark: "",
itemCode: checked[0].code, itemCode: checked[0].code,
itemName: checked[0].name, itemName: checked[0].name,
itemDesc1: checked[0].desc1, itemDesc1: checked[0].desc1,

63
fe/PDA/pages/request/kittingIssueRequest.vue
View File

@ -19,25 +19,6 @@
</view> </view>
</view> </view>
<view class="uni-list" v-if="itemList.length>0">
<view class=""
style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center; margin-bottom: 20rpx; ">
工位关系
</view>
<view class="uni-flex" style="flex-wrap: wrap; margin: 10rpx;" >
<view style="width: 30%; display: flex; flex-direction: row;" v-for="(item, index) in workStationList" :key="index">
<view class="uni-flex" style="flex-direction: row; margin: 12rpx;" @click="checkeClick(item.value)">
<view class="">
<checkbox :value="item.value" :checked="item.checked" />
</view>
<view class="">
{{item.name}}
</view>
</view>
</view>
</view>
</view>
<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail"> <scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
@ -116,7 +97,6 @@
<script> <script>
import { import {
kittingIssueRequest, kittingIssueRequest,
getWorkStationByLocation
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -147,7 +127,6 @@
return { return {
itemList: [], itemList: [],
dataContent: {}, dataContent: {},
workStationList: [],
}; };
}, },
props: { props: {
@ -173,23 +152,6 @@
openScanPopup() { openScanPopup() {
this.$refs.scanPopup.openScanPopup() this.$refs.scanPopup.openScanPopup()
}, },
checkeClick(value) {
for (let i = 0; i < this.workStationList.length; i++) {
this.workStationList[i].checked = false
}
for (let i = 0; i < this.workStationList.length; i++) {
if (this.workStationList[i].value === value) {
if (this.workStationList[i].checked == true) {
this.workStationList[i].checked = false
} else {
this.workStationList[i].checked = true
}
}
}
this.$forceUpdate()
},
getScanResult(result) { getScanResult(result) {
this.dataContent = result; this.dataContent = result;
@ -197,26 +159,6 @@
result.defaultHandleQty = result.qty result.defaultHandleQty = result.qty
this.itemList.push(result) this.itemList.push(result)
this.$forceUpdate() this.$forceUpdate()
getWorkStationByLocation(result.locationCode).then(res => {
if (res && res.length > 0) {
this.workStationList = []
res.forEach(item => {
this.workStationList.push({
value: item.code,
name: item.name,
checked: false
})
})
scanSuccessAudio()
} else {
scanFailedAudio()
this.showMessage("获取工位失败")
}
}).catch(error => {
scanFailedAudio()
this.showMessage("获取工位失败")
})
}, },
@ -250,10 +192,9 @@
}, },
setParams() { setParams() {
var workStation = this.workStationList.find(r => r.checked == true)
var param = { var param = {
worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN, worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
remark: workStation ? workStation.value : "", remark: "",
extraProperties: {}, extraProperties: {},
activeDate: getISODateTime(), activeDate: getISODateTime(),
autoSubmit: true, autoSubmit: true,
@ -268,7 +209,7 @@
this.itemList.forEach(res => { this.itemList.forEach(res => {
var data = { var data = {
remark: workStation ? workStation.value : "", remark: "",
qty: res.qty, qty: res.qty,
itemCode: res.partCode, itemCode: res.partCode,
itemName: res.partName, itemName: res.partName,

Write Preview
Loading…
Cancel
Save