This commit is contained in:
2026-01-08 10:56:44 +08:00
parent e733b759fe
commit afc569e771
17 changed files with 569 additions and 459 deletions

View File

@@ -11,6 +11,7 @@
<view class="zd-col-24 filter_select">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
@@ -21,12 +22,13 @@
<view class="zd-col-24 filter_select">
<search-box
v-model="val2"
@handleChange="handleChange"
/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">总数量</span>
<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>
@@ -53,21 +55,23 @@
<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.code}}</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.unit}}</td>
<td>{{e.gys}}</td>
<td>{{e.leibie}}</td>
<td>{{e.guige}}</td>
<td>{{e.xinghao}}</td>
<td>{{e.canuse_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>
</tr>
</tbody>
</table>
@@ -76,7 +80,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认合盘</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val2 || !dataList.length}" :disabled="disabled" @tap="_confirmInside">确认合盘</button>
</view>
</view>
</template>
@@ -84,7 +88,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
import {insideCodeInsert, queryPointVehicle, confirmInside} from '@/utils/getData3.js'
export default {
components: {
NavBar,
@@ -93,9 +97,7 @@
data() {
return {
title: '',
options: [],
num: null,
index: '',
val1: '',
val2: '',
dataList: [],
@@ -105,60 +107,13 @@
},
onLoad (options) {
this.title = options.title
this._queryPointInDownload()
},
methods: {
toScanAdd () {
uni.scanCode({
success: (res) => {
// console.log('扫码成功:', res.result);
if (res.result.includes(';')) {
const parts = res.result.split(';')
if (parts.length !== 5) {
uni.showToast({
title: '二维码格式不正确,请扫描符合格式的二维码',
icon: 'none'
})
return
}
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: parts[0],
material_code: parts[1],
material_name: parts[2],
qty: parts[3],
measure_unit_id: parts[4],
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
} else {
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: res.result,
material_code: '',
material_name: '',
qty: '',
measure_unit_id: ''
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
}
this._insideCodeInsert(res.result)
},
fail: (err) => {
console.log('扫码失败:', err)
@@ -178,29 +133,15 @@
toEmpty () {
this.val1 = ''
this.val2 = ''
this.num = null
this.dataList = []
this.disabled = false
},
async _queryPointInDownload () {
async _insideCodeInsert (e) {
try {
let res = await queryPointInDownload()
let res = await insideCodeInsert(e)
if (res) {
this.options = res.data
} else {
this.options = []
}
} catch (e) {
this.options = []
}
},
selectChange (e) {
this.index = e
},
async _queryPointInDtl () {
try {
let res = await queryPointInDtl(this.val1)
if (res && res.data.length > 0) {
this.dataList = [...res.data]
this.dataList.push(res.data)
} else {
this.dataList = []
}
@@ -208,14 +149,34 @@
this.dataList = []
}
},
async _packInConfirm () {
handleChange (e) {
if (e) {
this._queryPointVehicle(e)
}
},
async _queryPointVehicle (e) {
try {
let res = await queryPointVehicle(e)
if (res) {
if (this.val1) {
this.val2 = res.data.struct_code
}
if (this.val2) {
this.val1 = res.data.storagevehicle_code
}
} else {
}
} catch (e) {
}
},
async _confirmInside () {
this.disabled = true
if (!this.val1 || !this.index || !this.dataList.length) {
if (!this.val1 || !this.val2 || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await packInConfirm(this.val1, this.index, this.dataList)
let res = await confirmInside(this.num, this.val1, this.val2, this.dataList)
if (res) {
uni.showToast({
title: res.message,

View File

@@ -19,6 +19,7 @@
<view class="zd-col-24 filter_select">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
@@ -54,16 +55,16 @@
<tbody>
<tr v-for="(e, i) in dataList" :key="i">
<td>{{i+1}}</td>
<td>{{e.code}}</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.unit}}</td>
<td>{{e.gys}}</td>
<td>{{e.leibie}}</td>
<td>{{e.guige}}</td>
<td>{{e.xinghao}}</td>
<td>{{e.canuse_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>
</tr>
</tbody>
</table>
@@ -72,7 +73,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">送入</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val2 || !index || !dataList.length}" :disabled="disabled" @tap="_receiveConfirmIn">确认入库</button>
</view>
</view>
</template>
@@ -80,7 +81,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
import {queryReceiveSect, queryGroupDtl, receiveConfirmIn} from '@/utils/getData3.js'
export default {
components: {
NavBar,
@@ -100,20 +101,18 @@
},
onLoad (options) {
this.title = options.title
this._queryPointInDownload()
this._queryReceiveSect()
},
methods: {
toEmpty () {
this.val1 = ''
this.val2 = ''
this.dataList = []
this.checkedArr = []
this.allCheck = false
this.disabled = false
},
async _queryPointInDownload () {
async _queryReceiveSect () {
try {
let res = await queryPointInDownload()
let res = await queryReceiveSect()
if (res) {
this.options = res.data
} else {
@@ -126,9 +125,14 @@
selectChange (e) {
this.index = e
},
async _queryPointInDtl () {
handleChange (e) {
if (e) {
this._queryGroupDtl()
}
},
async _queryGroupDtl () {
try {
let res = await queryPointInDtl(this.val1)
let res = await queryGroupDtl(this.val1)
if (res && res.data.length > 0) {
this.dataList = [...res.data]
} else {
@@ -138,14 +142,14 @@
this.dataList = []
}
},
async _packInConfirm () {
async _receiveConfirmIn () {
this.disabled = true
if (!this.val1 || !this.index || !this.dataList.length) {
if (!this.val1 || !this.val2 || !this.index || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await packInConfirm(this.val1, this.index, this.dataList)
let res = await receiveConfirmIn(this.index, this.val1, this.val2, this.dataList)
if (res) {
uni.showToast({
title: res.message,

View File

@@ -37,14 +37,12 @@
<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>
@@ -60,8 +58,6 @@
<td>{{e.material_type_id}}</td>
<td>{{e.material_spec}}</td>
<td>{{e.material_model}}</td>
<td>{{e.struct_code}}</td>
<td>{{e.vehicle_code}}</td>
</tr>
</tbody>
</table>
@@ -70,7 +66,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认入库</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_confirmPalletAssemblyIn">确认入库</button>
</view>
</view>
</template>
@@ -78,7 +74,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
import {getPalletAssembly, confirmPalletAssemblyIn} from '@/utils/getData3.js'
export default {
components: {
NavBar,
@@ -87,9 +83,7 @@
data() {
return {
title: '',
options: [],
num: null,
index: '',
val1: '',
dataList: [],
// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -98,60 +92,13 @@
},
onLoad (options) {
this.title = options.title
this._queryPointInDownload()
},
methods: {
toScanAdd () {
uni.scanCode({
success: (res) => {
// console.log('扫码成功:', res.result);
if (res.result.includes(';')) {
const parts = res.result.split(';')
if (parts.length !== 5) {
uni.showToast({
title: '二维码格式不正确,请扫描符合格式的二维码',
icon: 'none'
})
return
}
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: parts[0],
material_code: parts[1],
material_name: parts[2],
qty: parts[3],
measure_unit_id: parts[4],
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
} else {
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: res.result,
material_code: '',
material_name: '',
qty: '',
measure_unit_id: ''
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
}
this._getPalletAssembly(res.result)
},
fail: (err) => {
console.log('扫码失败:', err)
@@ -173,26 +120,12 @@
this.dataList = []
this.disabled = false
},
async _queryPointInDownload () {
async _getPalletAssembly (e) {
try {
let res = await queryPointInDownload()
let res = await getPalletAssembly(e)
if (res) {
this.options = res.data
} else {
this.options = []
}
} catch (e) {
this.options = []
}
},
selectChange (e) {
this.index = e
},
async _queryPointInDtl () {
try {
let res = await queryPointInDtl(this.val1)
if (res && res.data.length > 0) {
this.dataList = [...res.data]
this.dataList.push(res.data)
this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
} else {
this.dataList = []
}
@@ -200,14 +133,14 @@
this.dataList = []
}
},
async _packInConfirm () {
async _confirmPalletAssemblyIn () {
this.disabled = true
if (!this.val1 || !this.index || !this.dataList.length) {
if (!this.val1 || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await packInConfirm(this.val1, this.index, this.dataList)
let res = await confirmPalletAssemblyIn(this.val1, this.dataList)
if (res) {
uni.showToast({
title: res.message,

View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">总数量</span>
<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>
@@ -34,7 +34,6 @@
<th>规格</th>
<th>型号</th>
<th>点位</th>
<th>载具</th>
</tr>
</thead>
<tbody>
@@ -44,14 +43,13 @@
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.pcsn}}</td>
<td>{{e.qty}}</td>
<td><input type="number" class="sin_input" v-model="e.qty" @blur="handleBlur(e)"></td>
<td>{{e.qty_unit_name}}</td>
<td>{{e.supp_name}}</td>
<td>{{e.material_type_id}}</td>
<td>{{e.material_spec}}</td>
<td>{{e.material_model}}</td>
<td>{{e.struct_code}}</td>
<td>{{e.vehicle_code}}</td>
</tr>
</tbody>
</table>
@@ -60,7 +58,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认出库</button>
<button class="zd-col-18 button-primary" :class="{'button-info': !num || !dataList.length}" :disabled="disabled" @tap="_directlyOutConfirm">确认出库</button>
</view>
</view>
</template>
@@ -68,7 +66,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
import {queryPointInDownload, directlyOutCodeInsert, directlyOutConfirm} from '@/utils/getData3.js'
export default {
components: {
NavBar,
@@ -90,57 +88,30 @@
this._queryPointInDownload()
},
methods: {
handleBlur (e) {
if (e.qty) {
if (e.qty < 0) {
e.qty = 0
} else {
e.qty = e.qty.replace(/[^0-9]/g, '')
e.qty = e.qty.replace(/^0+/, '') || '0'
if (e.qty > e.initialQty) {
e.qty = e.initialQty
}
this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
}
} else {
// uni.showToast({
// title: '数量必填',
// icon: 'none'
// })
}
},
toScanAdd () {
uni.scanCode({
success: (res) => {
// console.log('扫码成功:', res.result);
if (res.result.includes(';')) {
const parts = res.result.split(';')
if (parts.length !== 5) {
uni.showToast({
title: '二维码格式不正确,请扫描符合格式的二维码',
icon: 'none'
})
return
}
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: parts[0],
material_code: parts[1],
material_name: parts[2],
qty: parts[3],
measure_unit_id: parts[4],
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
} else {
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: res.result,
material_code: '',
material_name: '',
qty: '',
measure_unit_id: ''
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
}
this._directlyOutCodeInsert(res.result)
},
fail: (err) => {
console.log('扫码失败:', err)
@@ -177,11 +148,15 @@
selectChange (e) {
this.index = e
},
async _queryPointInDtl () {
async _directlyOutCodeInsert (e) {
try {
let res = await queryPointInDtl(this.val1)
if (res && res.data.length > 0) {
this.dataList = [...res.data]
let res = await directlyOutCodeInsert(e)
if (res) {
this.dataList.push(res.data)
this.dataList.forEach(e => {
e.initialQty = e.qty
})
this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
} else {
this.dataList = []
}
@@ -189,14 +164,14 @@
this.dataList = []
}
},
async _packInConfirm () {
async _directlyOutConfirm () {
this.disabled = true
if (!this.val1 || !this.index || !this.dataList.length) {
if (!this.num || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await packInConfirm(this.val1, this.index, this.dataList)
let res = await directlyOutConfirm(this.num, this.dataList)
if (res) {
uni.showToast({
title: res.message,