This commit is contained in:
2022-10-28 10:58:29 +08:00
8 changed files with 114 additions and 43 deletions

View File

@@ -10,6 +10,7 @@
<view class="filter_input_wraper">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
@@ -23,6 +24,15 @@
/>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label filter_label_1"></span>
</view>
<view class="filter_input_wraper filter_input_wraper_1">
<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
<view class="filter_input_wraper_inn_text">虚拟库</view>
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
<view class="slide_new">
@@ -50,9 +60,8 @@
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !pkId || !val2}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_stPrint">补码</button>
<button class="submit-button" @tap="_boxQuery">查询</button>
</view>
</view>
</template>
@@ -70,6 +79,7 @@
return {
val1: '',
val2: '',
isV: '0',
dataList: [],
pkId: '',
pkObj: {},
@@ -77,24 +87,28 @@
disabled1: false
};
},
created () {
this._boxQuery()
},
methods: {
/** 虚拟库 */
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
handleChange (e) {
this._boxQuery(e)
},
/** 初始化查询 */
async _boxQuery () {
let res = await boxQuery(this.val1, this.val2, '2')
let res = await boxQuery(e, '2')
this.dataList = [...res.data]
},
/** 确认 */
async _stConfirm () {
this.disabled = true
if (!this.val2 || !this.pkId) {
if (!this.pkId) {
this.disabled = false
return
}
try {
let res = await stConfirm(this.pkObj, this.val2)
let res = await stConfirm(this.pkObj, this.val2, '2', this.isV)
uni.showToast({
title: res.message,
icon: 'none'
@@ -102,7 +116,7 @@
this.pkId = ''
this.pkObj = {}
this.disabled = false
this._boxQuery()
this._boxQuery(this.val1)
} catch (e) {
this.disabled = false

View File

@@ -10,6 +10,7 @@
<view class="filter_input_wraper">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
@@ -23,6 +24,21 @@
/>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label filter_label_1"></span>
</view>
<view class="filter_input_wraper filter_input_wraper_1">
<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
<view class="filter_input_wraper_inn_text">虚拟库</view>
</view>
</view>
<view class="filter_item">
<view class="filter_label">木箱料号</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val3">
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
<view class="slide_new">
@@ -50,8 +66,7 @@
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !pkId || !val2}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
<button class="submit-button" @tap="_boxQuery">查询</button>
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
</view>
</view>
</template>
@@ -69,30 +84,36 @@
return {
val1: '',
val2: '',
val3: '',
isV: '0',
dataList: [],
pkId: '',
pkObj: {},
disabled: false
};
},
created () {
this._boxQuery()
},
methods: {
/** 虚拟库 */
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
handleChange (e) {
this._boxQuery(e)
},
/** 初始化查询 */
async _boxQuery () {
let res = await boxQuery(this.val1, this.val2, '3')
async _boxQuery (e) {
let res = await boxQuery(e, '3')
this.dataList = [...res.data]
},
/** 确认 */
async _stConfirm () {
this.disabled = true
if (!this.val2 || !this.pkId) {
if (!this.pkId) {
this.disabled = false
return
}
try {
let res = await stConfirm(this.pkObj, this.val2)
let res = await stConfirm(this.pkObj, this.val2, '3', this.isV, this.val3)
uni.showToast({
title: res.message,
icon: 'none'
@@ -100,7 +121,7 @@
this.pkId = ''
this.pkObj = {}
this.disabled = false
this._boxQuery()
this._boxQuery(this.val1)
} catch (e) {
this.disabled = false

View File

@@ -10,6 +10,7 @@
<view class="filter_input_wraper">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
@@ -23,6 +24,15 @@
/>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label filter_label_1"></span>
</view>
<view class="filter_input_wraper filter_input_wraper_1">
<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
<view class="filter_input_wraper_inn_text">虚拟库</view>
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
<view class="slide_new">
@@ -50,8 +60,7 @@
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !pkId || !val2}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
<button class="submit-button" @tap="_boxQuery">查询</button>
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
</view>
</view>
</template>
@@ -69,30 +78,35 @@
return {
val1: '',
val2: '',
isV: '0',
dataList: [],
pkId: '',
pkObj: {},
disabled: false
};
},
created () {
this._boxQuery()
},
methods: {
/** 虚拟库 */
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
handleChange (e) {
this._boxQuery(e)
},
/** 初始化查询 */
async _boxQuery () {
let res = await boxQuery(this.val1, this.val2, '1')
async _boxQuery (e) {
let res = await boxQuery(e, '1')
this.dataList = [...res.data]
},
/** 确认 */
async _stConfirm () {
this.disabled = true
if (!this.val2 || !this.pkId) {
if (!this.pkId) {
this.disabled = false
return
}
try {
let res = await stConfirm(this.pkObj, this.val2)
let res = await stConfirm(this.pkObj, this.val2, '1', this.isV)
uni.showToast({
title: res.message,
icon: 'none'
@@ -100,7 +114,7 @@
this.pkId = ''
this.pkObj = {}
this.disabled = false
this._boxQuery()
this._boxQuery(this.val1)
} catch (e) {
this.disabled = false

View File

@@ -62,7 +62,7 @@
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_outconfirmInstor">确认出库</button>
<button class="submit-button" :class="{'btn-disabled': !pkId || !val1}" :disabled="disabled" @tap="_outconfirmInstor">确认出库</button>
<button class="submit-button" @tap="_outcoolIOQuery">查询</button>
</view>
</view>
@@ -104,18 +104,18 @@
},
/** 初始化查询 */
async _outcoolIOQuery () {
let res = await outcoolIOQuery(this.val2, this.index, this.val1)
let res = await outcoolIOQuery(this.val2, this.index)
this.dataList = [...res.data]
},
/** 确认 */
async _outconfirmInstor () {
this.disabled = true
if (!this.pkId) {
if (!this.pkId || !this.val1) {
this.disabled = false
return
}
try {
let res = await outconfirmInstor(this.pkObj)
let res = await outconfirmInstor(this.pkObj, this.val1)
uni.showToast({
title: res.message,
icon: 'none'

View File

@@ -24,7 +24,11 @@
export default {
data() {
return {
<<<<<<< HEAD
menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '入库确认'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDeliveryConfirm', name: '虚拟区发货确认'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}]
=======
menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}]
>>>>>>> 622a0f92be7f55d52a19e61e766a1a4fd6beb281
};
},
mounted () {