root/hht-gaoce-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

page

Browse Source
This commit is contained in:
xiangxy
2024-03-07 13:42:45 +08:00
parent 5ac9389c98
commit 6858ccc787
5 changed files with 205 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pages.json
View File

@@ -56,6 +56,22 @@
}
}
,{
"path" : "pages/modules/rawmater-outstore",
"style" :
{
"navigationStyle": "custom"
}
}
,{
"path" : "pages/modules/zupan-unbind",
"style" :
{
"navigationStyle": "custom"
}
}
],
"globalStyle": {
// "pageOrientation": "landscape",

83
pages/modules/carry-task.vue Normal file
View File

@@ -0,0 +1,83 @@
<template>
<view class="zd_container">
<nav-bar title="搬运任务"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">起始点位</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val1">
</view>
</view>
<view class="filter_item">
<view class="filter_label">目标点位</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val2">
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar_new">
<button class="zd-col-5 submit-button_c" @tap="toClear">清空</button>
<button class="zd-col-13 submit-button_new" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_taskCarry">确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import {pointSearch, taskCarry} from '@/utils/getData1.js'
export default {
components: {
NavBar
},
data() {
return {
dataList: [],
disabled: false,
val1: '',
val2: ''
};
},
created () {
this._pointSearch1('ssx')
this._pointSearch2('yl')
},
methods: {
/** 点位查询1 */
async _pointSearch1 (a) {
let res = await pointSearch(a)
this.val1 = res.list.point_code
},
/** 点位查询2 */
async _pointSearch2 (a) {
let res = await pointSearch(a)
this.val2 = res.list.point_code
},
toClear () {
this.val1 = ''
this.val2 = ''
},
async _taskCarry () {
this.disabled = true
if (!this.val1 || !this.val2) {
this.disabled = false
return
}
try {
let res = await taskCarry(this.val1, this.val2)
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
}
}
}
</script>
<style lang="stylus">
</style>

65
pages/modules/rawmater-instore.vue
View File

@@ -18,7 +18,7 @@
<view class="filter_item">
<view class="filter_label">母托盘号</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="val3">
<input type="text" class="filter_input" v-model="val3">
</view>
</view>
<view class="filter_item">
@@ -28,38 +28,17 @@
</view>
</view>
</view>
<!-- <view class="item-wrapper">
<view class="item-wrap" v-for="(e, i) in dataList" :key="i">
<view class="zd-row mgb10">
<view class="zd-col-4 item-font-1">点位1:</view>
<view class="zd-col-9 item-font-2">{{e.point_name1}}</view>
<view class="zd-col-1 item-line-1"></view>
<view class="zd-col-9 item-font-3">{{e.point_name2}}</view>
</view>
<view class="zd-row mgb10">
<view class="zd-col-4 item-font-1">点位2:</view>
<view class="zd-col-9 item-font-2">{{e.point_name3}}</view>
<view class="zd-col-1 item-line-1"></view>
<view class="zd-col-9 item-font-3">{{e.point_name4}}</view>
</view>
<view class="zd-row">
<view class="zd-col-3 item-font-1">备注:</view>
<view class="zd-col-17 item-font-4">{{e.remark}}</view>
<view class="zd-col-4 item-status" :class="'item-status-' + e.task_status">{{textState(e.task_status)}}</view>
</view>
</view>
</view> -->
</view>
<view class="zd-row submit-bar_new">
<button class="zd-col-5 submit-button_c" @tap="toClear">清空</button>
<button class="zd-col-13 submit-button_new" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_coatedWireIntoStorageTask">确认</button>
<button class="zd-col-13 submit-button_new" :class="{'btn-disabled': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_yclrk">确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import {coatedWireIntoStorageTaskShow, coatedWireIntoStorageTask} from '@/utils/getData2.js'
import {pointSearch, yclrk} from '@/utils/getData1.js'
export default {
components: {
NavBar
@@ -75,47 +54,29 @@
};
},
created () {
this._coatedWireIntoStorageTaskShow()
this._pointSearch('ssx')
},
methods: {
textState (e) {
switch (e) {
case '1':
return '创建'
break
case '2':
return '创建完成'
break
case '3':
return '下发'
break
case '4':
return '执行中'
break
default:
return ''
break
}
},
/** grid查询 */
async _coatedWireIntoStorageTaskShow () {
let res = await coatedWireIntoStorageTaskShow()
this.dataList = [...res]
/** 点位查询 */
async _pointSearch (a) {
let res = await pointSearch(a)
this.val1 = res.list.point_code
},
toClear () {
this.val1 = ''
this.val2 = ''
this.val3 = ''
this.val4 = ''
},
async _coatedWireIntoStorageTask () {
async _yclrk () {
this.disabled = true
if (!this.val1 || !this.val2) {
if (!this.val1 || !this.val2 || !this.val3 || !this.val4) {
this.disabled = false
return
}
try {
let res = await coatedWireIntoStorageTask(this.val1, this.val2)
let res = await yclrk(this.val1, this.val2, this.val3, this.val4)
this.disabled = false
this._coatedWireIntoStorageTaskShow()
uni.showToast({
title: res.message,
icon: 'none'

51
pages/modules/rawmater-outstore.vue
View File

@@ -12,27 +12,27 @@
<view class="filter_item">
<view class="filter_label">回温模式</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val2">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label">回温时间</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="val4">
<input type="number" class="filter_input" v-model="val2">
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar_new">
<button class="zd-col-5 submit-button_c" @tap="toClear">清空</button>
<button class="zd-col-13 submit-button_new" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_coatedWireIntoStorageTask">确认</button>
<button class="zd-col-13 submit-button_new" :class="{'btn-disabled': !val1 || this.index1 || !val2}" :disabled="disabled" @tap="_yclck">确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import {coatedWireIntoStorageTaskShow, coatedWireIntoStorageTask} from '@/utils/getData2.js'
import {pointSearch, yclck} from '@/utils/getData1.js'
export default {
components: {
NavBar
@@ -41,54 +41,37 @@
return {
dataList: [],
disabled: false,
options1: [{value: '0',text: '普通'}, {value: '1',text: '快速'}],
index1: '',
val1: '',
val2: '',
val3: '',
val4: ''
val2: ''
};
},
created () {
this._coatedWireIntoStorageTaskShow()
this._pointSearch('yl')
},
methods: {
textState (e) {
switch (e) {
case '1':
return '创建'
break
case '2':
return '创建完成'
break
case '3':
return '下发'
break
case '4':
return '执行中'
break
default:
return ''
break
}
selectChange1 (e) {
this.index1 = e
},
/** grid查询 */
async _coatedWireIntoStorageTaskShow () {
let res = await coatedWireIntoStorageTaskShow()
this.dataList = [...res]
/** 点位查询 */
async _pointSearch (a) {
let res = await pointSearch(a)
this.val1 = res.list.point_code
},
toClear () {
this.val1 = ''
this.val2 = ''
},
async _coatedWireIntoStorageTask () {
async _yclck () {
this.disabled = true
if (!this.val1 || !this.val2) {
if (!this.val1 || this.index1 || !this.val2) {
this.disabled = false
return
}
try {
let res = await coatedWireIntoStorageTask(this.val1, this.val2)
let res = await yclck(this.val1, this.index1, this.val2)
this.disabled = false
this._coatedWireIntoStorageTaskShow()
uni.showToast({
title: res.message,
icon: 'none'

76
utils/getData1.js
View File

@@ -1 +1,77 @@
import request from './request.js'
/**
* 公共接口
*/
// 查询区域
export const regionSearch = () => request({
url:'api/pda/region',
data: {}
})
// 根据区域查询点位
export const pointSearch = (rcode) => request({
url:'api/pda/point',
data: {
region_code: rcode
}
})
// 查询各点位物料状态
export const dwztSearch = (rcode) => request({
url:'api/pda/dwzt',
data: {
region_code: rcode
}
})
/**
* 原材料入库
*/
// 原材料入库
export const yclrk = (spoint, stray, mtray, weight) => request({
url:'api/pda/yclrk',
data: {
start_point: spoint,
sub_tray: stray,
mother_tray: mtray,
weight: weight
}
})
/**
* 原材料出库
*/
// 原材料出库
export const yclck = (spoint, mode, time) => request({
url:'api/pda/yclck',
data: {
start_point: spoint,
mode: mode,
time: time
}
})
/**
* 搬运任务
*/
// 搬运任务
export const taskCarry = (spoint, npoint) => request({
url:'api/pda/task',
data: {
start_point: spoint,
next_point: npoint,
}
})
/**
* 组盘解绑
*/
// 组盘解绑
export const zpjb = (stray, mtray) => request({
url:'api/pda/zpjb',
data: {
sub_tray: stray,
mother_tray: mtray
}
})