This commit is contained in:
2023-09-01 16:25:18 +08:00
parent b3c6066a6f
commit d52313cae5
3 changed files with 119 additions and 147 deletions

View File

@@ -3,31 +3,44 @@
<nav-bar title="空箱出库"></nav-bar> <nav-bar title="空箱出库"></nav-bar>
<view class="zd_content"> <view class="zd_content">
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">设备号</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
</view>
<view class="filter_item"> <view class="filter_item">
<view class="filter_label_wraper"> <view class="filter_label_wraper">
<span class="filter_label">状态</span> <span class="filter_label">载具号</span>
</view> </view>
<view class="filter_input_wraper"> <view class="filter_input_wraper">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select> <search-box
v-model="val1"
@handleChange="handleChange"
/>
</view> </view>
</view> </view>
<view class="filter_item filter_item_1"> </view>
<view class="filter_label">备注</view> <view class="zd_wrapper grid-wraper">
<view class="filter_input_wraper filter_input_wraper_1"> <view class="slide_new">
<textarea class="filter_textarea" v-model="remark"></textarea> <table>
</view> <thead>
<tr>
<th>序号</th>
<th>选择</th>
<th>货位</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.struct_code}}</td>
<td>{{e.storagevehicle_code}}</td>
</tr>
</tbody>
</table>
</view> </view>
</view> </view>
</view> </view>
<view class="submit-bar"> <view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button> <button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled" @tap="toSure">出库确认</button>
<button class="submit-button" @tap="toCancle">取消</button> <button class="submit-button" @tap="_empOutgetIvt(val1)">查询</button>
</view> </view>
</view> </view>
</template> </template>
@@ -35,7 +48,7 @@
<script> <script>
import NavBar from '@/components/NavBar.vue' import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue' import SearchBox from '@/components/SearchBox.vue'
import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js' import {empOutgetIvt, empOutconfirm} from '@/utils/getData1.js'
export default { export default {
components: { components: {
NavBar, NavBar,
@@ -43,82 +56,50 @@
}, },
data() { data() {
return { return {
options1: [], val1: '',
index1: '', dataList: [],
options2: [], checkArr: [],
index2: '', disabled: false
remark: '',
disabled1: false
}; };
}, },
created () {
this._deviceInfo()
this._deviceStatus()
},
methods: { methods: {
/** 选择器 */ handleChange (e) {
selectChange1(e) { this._empOutgetIvt(e)
this.index1 = e
}, },
selectChange2(e) { /** grid查询 */
this.index2 = e async _empOutgetIvt (e) {
let res = await empOutgetIvt(e)
res.data.map(el => {
this.$set(el, 'checked', false)
})
this.dataList = [...res.data]
}, },
/** 获取设备下拉框 */ toCheck (e) {
async _deviceInfo () { e.checked = !e.checked
let res = await deviceInfo() this.checkArr = this.dataList.filter(i => { return i.checked === true })
this.options1 = [...res]
}, },
/** 获取设备状态下拉框 */ /** 确认 */
async _deviceStatus () {
let res = await deviceStatus()
this.options2 = [...res]
},
/** 确定 */
async toSure () { async toSure () {
this.disabled1 = true this.disabled = true
if (!this.index1) { if (!this.val1) {
uni.showToast({ this.disabled = false
title: '设备号不能为空',
icon: 'none'
})
this.disabled1 = false
return
}
if (!this.index2) {
uni.showToast({
title: '状态不能为空',
icon: 'none'
})
this.disabled1 = false
return return
} }
try { try {
let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '' let res = await empOutconfirm(this.checkArr)
let res = await deviceCheckVerify(this.index1, userName,this.remark, this.index2) this.disabled = false
this.disabled1 = false this.val1 = ''
this.index1 = ''
this.index2 = ''
this.remark = ''
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
icon: 'none' icon: 'none'
}) })
} catch (e) { } catch (e) {
this.disabled1 = false this.disabled = false
} }
},
toCancle () {
this.disabled1 = false
this.index1 = ''
this.index2 = ''
this.remark = false
} }
} }
} }
</script> </script>
<style lang="stylus" scoped> <style lang="stylus">
.filter_item_1, .filter_input_wraper_1
align-items: flex-start
height 210rpx
</style> </style>

View File

@@ -3,31 +3,54 @@
<nav-bar title="半成品出库"></nav-bar> <nav-bar title="半成品出库"></nav-bar>
<view class="zd_content"> <view class="zd_content">
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">设备号</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
</view>
<view class="filter_item"> <view class="filter_item">
<view class="filter_label_wraper"> <view class="filter_label_wraper">
<span class="filter_label">状态</span> <span class="filter_label">物料规格</span>
</view> </view>
<view class="filter_input_wraper"> <view class="filter_input_wraper">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select> <search-box
v-model="val1"
@handleChange="handleChange"
/>
</view> </view>
</view> </view>
<view class="filter_item filter_item_1"> </view>
<view class="filter_label">备注</view> <view class="zd_wrapper grid-wraper">
<view class="filter_input_wraper filter_input_wraper_1"> <view class="slide_new">
<textarea class="filter_textarea" v-model="remark"></textarea> <table>
</view> <thead>
<tr>
<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" :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.struct_code}}</td>
<td>{{e.material_spec}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.storagevehicle_code}}</td>
<td>{{e.canuse_qty}}</td>
<td>{{e.workprocedure_name}}</td>
</tr>
</tbody>
</table>
</view> </view>
</view> </view>
</view> </view>
<view class="submit-bar"> <view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button> <button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled" @tap="toSure">出库确认</button>
<button class="submit-button" @tap="toCancle">取消</button> <button class="submit-button" @tap="_iosOutgetIvt(val1)">查询</button>
</view> </view>
</view> </view>
</template> </template>
@@ -35,7 +58,7 @@
<script> <script>
import NavBar from '@/components/NavBar.vue' import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue' import SearchBox from '@/components/SearchBox.vue'
import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js' import {iosOutgetIvt, iosOutconfirm} from '@/utils/getData1.js'
export default { export default {
components: { components: {
NavBar, NavBar,
@@ -43,82 +66,50 @@
}, },
data() { data() {
return { return {
options1: [], val1: '',
index1: '', dataList: [],
options2: [], checkArr: [],
index2: '', disabled: false
remark: '',
disabled1: false
}; };
}, },
created () {
this._deviceInfo()
this._deviceStatus()
},
methods: { methods: {
/** 选择器 */ handleChange (e) {
selectChange1(e) { this._iosOutgetIvt(e)
this.index1 = e
}, },
selectChange2(e) { /** grid查询 */
this.index2 = e async _iosOutgetIvt (e) {
let res = await iosOutgetIvt(e)
res.data.map(el => {
this.$set(el, 'checked', false)
})
this.dataList = [...res.data]
}, },
/** 获取设备下拉框 */ toCheck (e) {
async _deviceInfo () { e.checked = !e.checked
let res = await deviceInfo() this.checkArr = this.dataList.filter(i => { return i.checked === true })
this.options1 = [...res]
}, },
/** 获取设备状态下拉框 */ /** 确认 */
async _deviceStatus () {
let res = await deviceStatus()
this.options2 = [...res]
},
/** 确定 */
async toSure () { async toSure () {
this.disabled1 = true this.disabled = true
if (!this.index1) { if (!this.val1) {
uni.showToast({ this.disabled = false
title: '设备号不能为空',
icon: 'none'
})
this.disabled1 = false
return
}
if (!this.index2) {
uni.showToast({
title: '状态不能为空',
icon: 'none'
})
this.disabled1 = false
return return
} }
try { try {
let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '' let res = await iosOutconfirm(this.checkArr)
let res = await deviceCheckVerify(this.index1, userName,this.remark, this.index2) this.disabled = false
this.disabled1 = false this.val1 = ''
this.index1 = ''
this.index2 = ''
this.remark = ''
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
icon: 'none' icon: 'none'
}) })
} catch (e) { } catch (e) {
this.disabled1 = false this.disabled = false
} }
},
toCancle () {
this.disabled1 = false
this.index1 = ''
this.index2 = ''
this.remark = false
} }
} }
} }
</script> </script>
<style lang="stylus" scoped> <style lang="stylus">
.filter_item_1, .filter_input_wraper_1
align-items: flex-start
height 210rpx
</style> </style>

View File

@@ -1,7 +1,7 @@
import request from './request.js' import request from './request.js'
/** /**
* 空箱出库 * 半成品出库
*/ */
// 1.1半成品出库页面 // 1.1半成品出库页面
export const iosOutgetIvt = (mspec) => request({ export const iosOutgetIvt = (mspec) => request({