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

多个功能修改

Browse Source
This commit is contained in:
caill
2025-06-12 18:20:58 +08:00
parent 32dbc00bbe
commit 89c0f32aa6
12 changed files with 407 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pages/outbound/shelf-bind-2nd.vue
View File

@@ -34,6 +34,7 @@
<th>站点编码</th>
<th>站点名称</th>
<th>绑定状态</th>
<th>任务锁定</th>
<th>绑定货架号</th>
</tr>
</thead>
@@ -42,6 +43,7 @@
<td>{{e.code}}</td>
<td>{{e.name}}</td>
<td>{{e.remark}}</td>
<td>{{$getStatusText({ '00': '未锁定', '10': '入库锁', '20': '出库锁' }, e.lock_type)}}</td>
<td>{{e.vehicle_code}}</td>
</tr>
</tbody>
@@ -50,10 +52,11 @@
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
<button v-if="dataList.length > 0 && dataList[0].lock_type === '00'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('1')">绑定</button>
<button v-if="dataList.length > 0 && dataList[0].lock_type !== '00'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('0')">解绑</button>
<button v-if="!dataList.length" class="zd-col-16 button-primary button-info">绑定/解绑</button>
<button class="zd-col-5 button-primary" @tap="toEmpty">清空</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_pointUnbind">CTU站点解绑</button>
<button v-if="dataList.length > 0 && dataList[0].lock_type === '00'" class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('1')">货架绑定</button>
<button v-if="dataList.length > 0 && dataList[0].lock_type !== '00'" class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('0')">货架解绑</button>
<button v-if="!dataList.length" class="zd-col-8 button-primary button-info">货架绑定/解绑</button>
</view>
</view>
</template>
@@ -61,7 +64,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {getPointStatus, bindOrUnbind} from '@/utils/getData2.js'
import {getPointStatus, bindOrUnbind, pointUnbind} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -86,10 +89,14 @@
}
},
async _getPointStatus (e) {
let res = await getPointStatus(e)
this.dataList = []
this.dataList.push(res)
this.val2 = res.vehicle_code
try {
let res = await getPointStatus(e)
this.dataList = []
this.dataList.push(res)
this.val2 = res.vehicle_code
} catch (e) {
this.dataList = []
}
},
toEmpty () {
this.val1 = ''
@@ -119,6 +126,26 @@
} catch (e) {
this.disabled = false
}
},
async _pointUnbind () {
try {
this.disabled = true
if (!this.val1 || !this.val2) {
this.disabled = false
return
}
let res = await pointUnbind(this.val1, this.val2)
if (res.code === '200') {
this._getPointStatus(this.val1)
}
this.disabled = false
uni.showToast({
title: res.msg,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
}
}
}

37
pages/outbound/stock-list.vue
View File

@@ -8,18 +8,42 @@
<view class="zd-col-7">
<span class="filter_label">仓库</span>
</view>
<view class="zd-col-24 filter_select">
<view class="zd-col-17 filter_select">
<uni-data-select v-model="index" :localdata="options"></uni-data-select>
</view>
</view>
<view class="zd-row">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料编码</span>
</view>
<view class="zd-col-24 filter_select">
<view class="zd-col-17 filter_select">
<input type="text" class="filter_input" v-model="val1">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">仓位编码</span>
</view>
<view class="zd-col-17 filter_select">
<input type="text" class="filter_input" v-model="val4">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料批次</span>
</view>
<view class="zd-col-17 filter_select">
<input type="text" class="filter_input" 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-17 filter_select">
<input type="text" class="filter_input" v-model="val3">
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
<view class="slide_new">
@@ -71,7 +95,10 @@
title: '',
val1: '',
options: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}],
index: '',
index: 'FStockId',
val2: '',
val3: '',
val4: '',
dataList: [],
pkId: '',
pkObj: {},
@@ -97,7 +124,7 @@
this._structattrPage()
},
async _structattrPage () {
let res = await structattrPage(this.pageNum + '', this.pageSize + '', this.index, this.val1, true)
let res = await structattrPage(this.pageNum + '', this.pageSize + '', this.index, this.val1, true, this.val2, this.val3, this.val4)
if (res.code === '200') {
this.totalCount = res.totalElements
if (res.totalElements > 0) {

7
pages/outbound/stock-out-store.vue
View File

@@ -1,6 +1,6 @@
<template>
<view class="zd_container">
<!-- 库存出库 -->
<!-- 盘点出库 -->
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
@@ -46,7 +46,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageMaterConfirm">出库确认</button>
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageMaterConfirm">确认出库</button>
</view>
</view>
</template>
@@ -80,6 +80,9 @@
} else if (this.currentData.stor_code === 'FStockId') {
this.val1 = '料箱库'
}
if (!this.currentData.product_area) {
this.currentData.product_area = 'A1'
}
this.$store.dispatch('setPublicObj', '')
}
},