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

子卷

Browse Source
This commit is contained in:
caill
2022-12-16 15:57:13 +08:00
parent 7d2d2eb6e0
commit b6ccd9eb40
5 changed files with 127 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/ProductManage/ZjCasing.vue
View File

@@ -142,7 +142,11 @@
/** 选择器1 */
selectChange1(e) {
this.index1 = e
this._queryDeviceByarea(e)
if (e) {
this._queryDeviceByarea(e)
} else {
this.index2 = ''
}
},
/** 生产区域下拉框查询 */
async _queryProductArea () {

21
pages/ProductManage/ZjDelivery.vue
View File

@@ -98,7 +98,7 @@
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': checkArr.length === 0 || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled4" @tap="_shippingCheck">配送校验</button>
<button class="submit-button" :class="{'btn-disabled': !checkArr.length}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val3}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
<button class="submit-button" :class="{'btn-disabled': !val3}" :disabled="disabled3" @tap="_returnVehicle">载具送回</button>
<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
</view>
@@ -121,6 +121,8 @@
val3: '',
options1: [],
index1: '',
options2: [],
index2: '',
qty: '',
dataList: [],
disabled1: false,
@@ -138,7 +140,11 @@
/** 选择器1 */
selectChange1(e) {
this.index1 = e
this._queryDeviceByarea(e)
if (e) {
this._queryDeviceByarea(e)
} else {
this.index2 = ''
}
},
/** 生产区域下拉框查询 */
async _queryProductArea () {
@@ -192,7 +198,7 @@
/** 确认 */
async _shippingConfirm () {
this.disabled2 = true
if (!this.checkArr.length) {
if (!this.checkArr.length || !this.val3) {
this.disabled2 = false
return
}
@@ -200,6 +206,9 @@
let res = await shippingConfirm(this.checkArr, this.val3, this.val1)
this.disabled2 = false
this.checkArr = []
this.val1 = ''
this.val2 = ''
this.val3 = ''
this._queryMaterialInfo()
uni.showToast({
title: res.message,
@@ -222,11 +231,15 @@
}
try {
let res = await returnVehicle(this.val3, this.val1)
this.disabled3 = false
this.val1 = ''
this.val2 = ''
this.val3 = ''
this._queryMaterialInfo()
uni.showToast({
title: res.message,
icon: 'none'
})
this.disabled3 = false
} catch (e) {
this.disabled3 = false
}

69
pages/ProductManage/ZjInStore.vue
View File

@@ -4,9 +4,17 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">设备</view>
<view class="filter_label">区域</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val1">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">设备</span>
</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
</view>
</view>
<view class="filter_item">
@@ -14,13 +22,6 @@
<view class="filter_input_wraper">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
<view class="filter_search" :class="{'filter_search_disabled': !val1}" @tap="_devicePointQuery">查询</view>
</view>
<view class="filter_item">
<view class="filter_label">区域</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
@@ -29,7 +30,6 @@
<thead>
<tr>
<th>序号</th>
<th>订单号</th>
<th>子卷号</th>
<th>机台编号</th>
<th>分切组</th>
@@ -37,14 +37,12 @@
<th>配送完成</th>
<th>生产顺序</th>
<th>生产日期</th>
<th>订单号</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
<td>{{Number(i) + 1}}</td>
<td>{{e.mfg_order_name}}</td>
<td>{{e.container_name}}</td>
<td>{{e.point_code}}</td>
<td>{{e.split_group}}</td>
@@ -52,6 +50,7 @@
<td>{{e.is_child_ps_ok}}</td>
<td>{{e.manufacture_sort}}</td>
<td>{{e.manufacture_date}}</td>
<td>{{e.mfg_order_name}}</td>
</tr>
</tbody>
</table>
@@ -68,7 +67,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {devicePointQuery, queryProductArea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
import {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -76,11 +75,12 @@
},
data() {
return {
val1: '',
options1: [],
index1: '',
options2: [],
index2: '',
options3: [],
index3: '',
dataList: [],
pkId: '',
pkObj: {},
@@ -98,17 +98,15 @@
},
selectChange2(e) {
this.index2 = e
if (e) {
this._queryDeviceByarea(e)
} else {
this.index3 = ''
}
},
/** 点位下拉框查询 */
async _devicePointQuery () {
if (!this.val1) {
uni.showToast({
title: '请输入设备号',
icon: 'none'
})
return
}
let res = await devicePointQuery(this.val1)
async _devicePointQuery (e) {
let res = await devicePointQuery(e)
this.options1 = [...res.data]
},
/** 生产区域下拉框查询 */
@@ -116,9 +114,23 @@
let res = await queryProductArea()
this.options2 = [...res.data]
},
/** 选择器3 */
selectChange3(e) {
this.index3 = e
if (e) {
this._devicePointQuery(e)
} else {
this.index1 = ''
}
},
/** 设备下拉框 */
async _queryDeviceByarea (e) {
let res = await queryDeviceByarea(e)
this.options3 = [...res.data]
},
/** 初始化查询 */
async _queryMaterialInfo () {
let res = await queryMaterialInfo5(this.val1, this.index2)
let res = await queryMaterialInfo5(this.index3, this.index2)
this.dataList = [...res.data]
},
/** 确认 */
@@ -159,11 +171,4 @@
</script>
<style lang="stylus">
.slide_new table td:first-child, .slide_new table th:first-child
width 92rpx
.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
position sticky
left 89rpx
z-index 102
box-shadow 1px 0 2px rgba(0,0,0,.12)
</style>

63
pages/ProductManage/ZjOutStore.vue
View File

@@ -4,9 +4,17 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">设备</view>
<view class="filter_label">区域</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val1">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">设备</span>
</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index5" :localdata="options5" @change="selectChange5"></uni-data-select>
</view>
</view>
<view class="filter_item">
@@ -14,13 +22,6 @@
<view class="filter_input_wraper">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
<view class="filter_search" :class="{'filter_search_disabled': !val1}" @tap="_devicePointQuery">查询</view>
</view>
<view class="filter_item">
<view class="filter_label">区域</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
@@ -39,7 +40,6 @@
<tr>
<th>序号</th>
<th>选择</th>
<th>订单号</th>
<th>子卷号</th>
<th>机台编号</th>
<th>分切组</th>
@@ -52,13 +52,13 @@
<th>FRP管物料编码</th>
<th>FRP管物料描述</th>
<th>FRP管规格</th>
<th>订单号</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
<td>{{Number(i) + 1}}</td>
<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
<td>{{e.mfg_order_name}}</td>
<td>{{e.container_name}}</td>
<td>{{e.point_code}}</td>
<td>{{e.split_group}}</td>
@@ -71,6 +71,7 @@
<td>{{e.FRP_material}}</td>
<td>{{e.FRP_description}}</td>
<td>{{e.FRP_model}}</td>
<td>{{e.mfg_order_name}}</td>
</tr>
</tbody>
</table>
@@ -110,7 +111,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {devicePointQuery, queryProductArea, queryMaterialInfo4, outConfirm, conveyPointQuery, conveyConfirm} from '@/utils/getData2.js'
import {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo4, outConfirm, conveyPointQuery, conveyConfirm} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -118,7 +119,6 @@
},
data() {
return {
val1: '',
options1: [],
index1: '',
options2: [],
@@ -127,6 +127,8 @@
index3: '',
options4: [],
index4: '',
options5: [],
index5: '',
isV: '0',
dataList: [],
disabled1: false,
@@ -150,6 +152,11 @@
},
selectChange2(e) {
this.index2 = e
if (e) {
this._queryDeviceByarea(e)
} else {
this.index5 = ''
}
},
selectChange3(e) {
this.index3 = e
@@ -158,15 +165,8 @@
this.index4 = e
},
/** 点位下拉框查询 */
async _devicePointQuery () {
if (!this.val1) {
uni.showToast({
title: '请输入设备号',
icon: 'none'
})
return
}
let res = await devicePointQuery(this.val1)
async _devicePointQuery (e) {
let res = await devicePointQuery(e)
this.options1 = [...res.data]
},
/** 生产区域下拉框查询 */
@@ -175,6 +175,20 @@
this.options2 = [...res.data]
this.options3 = [...res.data]
},
/** 选择器5 */
selectChange5(e) {
this.index5 = e
if (e) {
this._devicePointQuery(e)
} else {
this.index1 = ''
}
},
/** 设备下拉框 */
async _queryDeviceByarea (e) {
let res = await queryDeviceByarea(e)
this.options5 = [...res.data]
},
/** 初始化查询 */
async _queryMaterialInfo () {
let res = await queryMaterialInfo4(this.index2)
@@ -270,11 +284,6 @@
.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
position sticky
left 89rpx
width 92rpx
z-index 102
.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
position sticky
left 176rpx
z-index 103
box-shadow 1px 0 2px rgba(0,0,0,.12)
</style>

52
utils/getData2.js
View File

@@ -83,16 +83,16 @@ export const authority = () => {
* 空管入库
*/
// 1.1生产区域下拉框查询
export const queryProductArea = () => request({
url:'api/pda/raw/queryProductArea',
data: {}
})
// export const queryProductArea = () => {
// let res = {
// data: [{value: '01', text: 'a'}, {value: '02', text: 'b'}]
// }
// return res
// }
// export const queryProductArea = () => request({
// url:'api/pda/raw/queryProductArea',
// data: {}
// })
export const queryProductArea = () => {
let res = {
data: [{value: '01', text: 'a'}, {value: '02', text: 'b'}]
}
return res
}
// 1.2空纸管库设备物料初始化查询
export const queryMaterialInfo1 = (code, mcode, area, option) => request({
url:'api/pda/empty/queryMaterialInfo',
@@ -139,12 +139,18 @@ export const casingConfirm = (row, qzz, code) => request({
}
})
//1.3设备下拉框
export const queryDeviceByarea = (area) => request({
url:'api/pda/casing/queryDeviceByarea',
data: {
product_area: area
// export const queryDeviceByarea = (area) => request({
// url:'api/pda/casing/queryDeviceByarea',
// data: {
// product_area: area
// }
// })
export const queryDeviceByarea = () => {
let res = {
data: [{value: '01', text: 'a'}, {value: '02', text: 'bc'}]
}
})
return res
}
/**
* 子卷配送
@@ -213,12 +219,18 @@ export const inConfirm = (code, rows) => request({
}
})
// 1.3点位查询
export const devicePointQuery = (code) => request({
url:'api/pda/in/devicePointQuery',
data: {
device_code: code
// export const devicePointQuery = (code) => request({
// url:'api/pda/in/devicePointQuery',
// data: {
// device_code: code
// }
// })
export const devicePointQuery = () => {
let res = {
data: [{value: '01', text: 'a'}, {value: '02', text: 'bc'}]
}
})
return res
}
/**
* 子卷出站