change
This commit is contained in:
@@ -128,8 +128,9 @@
|
||||
async _getTaskBucketGroupInfo () {
|
||||
try {
|
||||
let res = await getTaskBucketGroupInfo(this.val1)
|
||||
if (res && res.data.length > 0) {
|
||||
this.dataList = [...res.data]
|
||||
if (res) {
|
||||
this.dataList = [...res.data.row]
|
||||
console.log(this.dataList, 'dataList')
|
||||
this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
|
||||
} else {
|
||||
this.dataList = []
|
||||
|
||||
@@ -4,81 +4,38 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-6">
|
||||
<span class="filter_label">物料编码</span>
|
||||
</view>
|
||||
<view class="zd-col-13">
|
||||
<search-box v-model="materialData.material_code"/>
|
||||
</view>
|
||||
<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label">盒数</span>
|
||||
</view>
|
||||
<view class="zd-col-24">
|
||||
<input type="number" v-model="num" class="filter_input">
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label">当前点位</span>
|
||||
</view>
|
||||
<view class="zd-col-24 filter_select">
|
||||
<search-box
|
||||
v-model="val2"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label">载具</span>
|
||||
</view>
|
||||
<view class="zd-col-24 filter_select">
|
||||
<search-box
|
||||
v-model="val1"
|
||||
@handleChange="handleChange"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label filter_input_disabled">总数量</span>
|
||||
</view>
|
||||
<view class="zd-col-24">
|
||||
<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th>袋号</th>
|
||||
<th>物料编码</th>
|
||||
<th>物料名称</th>
|
||||
<th>批号</th>
|
||||
<th>出库数量</th>
|
||||
<th>单位</th>
|
||||
<th>供应商</th>
|
||||
<th>类别</th>
|
||||
<th>规格</th>
|
||||
<th>型号</th>
|
||||
<th>点位</th>
|
||||
<th>载具</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(e, i) in dataList" :key="i">
|
||||
<td>{{i+1}}</td>
|
||||
<td>{{e.bag_code}}</td>
|
||||
<td>{{e.material_code}}</td>
|
||||
<td>{{e.material_name}}</td>
|
||||
<td>{{e.pcsn}}</td>
|
||||
<td>{{e.qty}}</td>
|
||||
<td>{{e.qty_unit_name}}</td>
|
||||
<td>{{e.supp_name}}</td>
|
||||
<td>{{e.class_name}}</td>
|
||||
<td>{{e.material_spec}}</td>
|
||||
<td>{{e.material_model}}</td>
|
||||
<td>{{e.struct_code}}</td>
|
||||
<td>{{e.vehicle_code}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
|
||||
<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
|
||||
<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
|
||||
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
|
||||
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !materialData.material_code || !num}" :disabled="disabled" @tap="_palletizingDown">下料</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -86,7 +43,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
|
||||
import {palletizingDown} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -96,52 +53,40 @@
|
||||
return {
|
||||
title: '',
|
||||
val1: '',
|
||||
val2: '',
|
||||
materialData: {},
|
||||
num: null,
|
||||
dataList: [],
|
||||
disabled: false
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
this.title = options.title
|
||||
},
|
||||
onShow () {
|
||||
if (this.$store.getters.publicObj !== '') {
|
||||
this.materialData = this.$store.getters.publicObj
|
||||
this.$store.dispatch('setPublicObj', '')
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
toJump (name) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/hdyy/wbc/${name}`
|
||||
})
|
||||
},
|
||||
toEmpty () {
|
||||
this.val1 = ''
|
||||
this.val2 = ''
|
||||
this.num = null
|
||||
this.dataList = []
|
||||
this.materialData = {}
|
||||
this.disabled = false
|
||||
},
|
||||
selectChange (e) {
|
||||
this.index = e
|
||||
},
|
||||
handleChange (e) {
|
||||
if (e) {
|
||||
this._getGroupBucketInfo()
|
||||
}
|
||||
},
|
||||
async _getGroupBucketInfo () {
|
||||
try {
|
||||
let res = await getGroupBucketInfo(this.val1)
|
||||
if (res && res.data.length > 0) {
|
||||
this.dataList = [...res.data]
|
||||
this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
|
||||
} else {
|
||||
this.dataList = []
|
||||
}
|
||||
} catch (e) {
|
||||
this.dataList = []
|
||||
}
|
||||
},
|
||||
async _productionLine (type) {
|
||||
async _palletizingDown () {
|
||||
this.disabled = true
|
||||
if (!this.val1 || !this.val2) {
|
||||
if (!this.val1 || !this.materialData.material_code || !this.num) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await productionLine(this.val1, this.val2, type)
|
||||
let res = await palletizingDown(this.val1, this.materialData.material_code, this.num)
|
||||
if (res) {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
|
||||
@@ -138,8 +138,8 @@
|
||||
},
|
||||
methods: {
|
||||
async _authority () {
|
||||
// let res = await authority()
|
||||
let res = await allAuthority()
|
||||
let res = await authority()
|
||||
// let res = await allAuthority()
|
||||
if (res.code === '1') {
|
||||
this.menuList = [...res.result.rf_menu1.sonTree]
|
||||
} else {
|
||||
|
||||
@@ -20,7 +20,11 @@ export const handLogin = (user, password) => request({
|
||||
password: password
|
||||
}
|
||||
})
|
||||
|
||||
// 菜单
|
||||
export const authority = () => request({
|
||||
url:'api/pda/authority',
|
||||
data: {}
|
||||
})
|
||||
|
||||
// 打印删除
|
||||
export const printDelete = () => request({
|
||||
|
||||
@@ -315,7 +315,12 @@ export const manualOutbound = (row, cpoint, vcode, total, weight) => request({
|
||||
url:'api/pdaProduction/manualOutbound',
|
||||
data: {row: row, current_point: cpoint, vehicle_code: vcode, total: total, weight: weight}
|
||||
})
|
||||
|
||||
// 码垛下料
|
||||
// 下料
|
||||
export const palletizingDown = (dcode, mcode, qty) => request({
|
||||
url:'api/pdaProduction/palletizingDown',
|
||||
data: {device_code: dcode, material_code: mcode, qty: qty}
|
||||
})
|
||||
|
||||
// 收货入库
|
||||
// 获取物料信息 Copy
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import * as types from '../types'
|
||||
|
||||
const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.70:8011' : 'http://192.168.10.70:8011'
|
||||
const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.70:8011' : 'http://192.168.10.70:8011'
|
||||
const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.70:8011' : 'http://192.168.10.70:8011'
|
||||
const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.9:8011' : 'http://192.168.10.9:8011'
|
||||
const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.9:8011' : 'http://192.168.10.9:8011'
|
||||
const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.9:8011' : 'http://192.168.10.9:8011'
|
||||
const state = {
|
||||
baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
|
||||
acsUrl: uni.getStorageSync('acsUrl') || acsUrl,
|
||||
|
||||
Reference in New Issue
Block a user