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

包装入库需求修改，提交按钮样式修改

Browse Source
This commit is contained in:
caill
2024-06-03 13:44:31 +08:00
parent a5bd1aaa24
commit 3b4289f914
21 changed files with 227 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/style/layout.css
View File

@@ -273,7 +273,7 @@ uni-button:after {
width: 100%;
z-index: 200;
background-color: #fff;
padding-top: 10rpx;
padding: 10rpx 0;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
}
.submit-button {
@@ -285,8 +285,7 @@ uni-button:after {
padding: 0 22rpx;
background-color: #fff;
border: 1px solid #ff6a00;
margin: 0 40rpx 10rpx 0;
border-radius: 30rpx;
border-radius: 10rpx;
}
.btn-disabled, .submit-button[disabled] {
background-color: #c9c9c9;

83
common/style/reset.css
View File

@@ -41,3 +41,86 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
text-overflow: ellipsis;
white-space: nowrap;
}
.flexstart {
align-items: flex-start !important;
}
.jcflexstart {
justify-content: flex-start !important;
}
.zd-row {
display: flex;
justify-content: space-between;
align-items: center;
}
.zd-col-24 {
width: 100%;
}
.zd-col-23 {
width: 95.83333%
}
.zd-col-22 {
width: 91.66667%
}
.zd-col-21 {
width: 87.5%
}
.zd-col-20 {
width: 83.33333%
}
.zd-col-19 {
width: 79.16667%
}
.zd-col-18 {
width: 75%
}
.zd-col-17 {
width: 70.83333%
}
.zd-col-16 {
width: 66.66667%
}
.zd-col-15 {
width: 62.5%
}
.zd-col-14 {
width: 58.33333%
}
.zd-col-13 {
width: 54.16667%
}
.zd-col-12 {
width: 50%;
}
.zd-col-11 {
width: 45.83333%
}
.zd-col-10 {
width: 41.66667%
}
.zd-col-9 {
width: 37.5%
}
.zd-col-8 {
width: 33.33333%
}
.zd-col-7 {
width: 29.16667%
}
.zd-col-6 {
width: 25%
}
.zd-col-5 {
width: 20.83333%
}
.zd-col-4 {
width: 16.66667%
}
.zd-col-3 {
width: 12.5%
}
.zd-col-2 {
width: 8.33333%
}
.zd-col-1 {
width: 4.16667%
}

130
components/SearchBox.vue
View File

@@ -1,18 +1,16 @@
<template>
<view class="search_wraper">
<view class="zd-row scan_wraper">
<input
type="text"
class="filter_input search_input"
class="zd-col-24 search_input"
confirm-type="go"
:value="value"
:focus="focusState"
@blur="handleBlur($event)"
@input="handleChange($event)">
<view class="buttons_wraper">
<view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view>
<view class="iconfont icon_scan" :class="{'icon_scan_active': focusState === true}" @tap="toScan">&#xe6e2;</view>
<view class="iconfont icon_phone" @tap="toPhone">&#xe663;</view>
<view v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</view>
</view>
@focus="handleFocus"
@blur="handleBlur"
@confirm="handleSend">
<uni-icons v-show="value.length" class="mgr20" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
<uni-icons type="scan" size="22" :color="focusState ? '#D7592F' : '#666'" @tap="focusState=true"></uni-icons>
</view>
</template>
@@ -21,7 +19,6 @@
export default {
data() {
return {
cur: '',
focusState: false
};
},
@@ -30,109 +27,44 @@
event: 'input'
},
props: {
value: String,
seaShow: {
type: Boolean,
default: false
},
focused: {
type: Boolean,
default: false
}
value: String
},
mounted () {
if (this.focused) {
this.focusState = true
}
},
methods: {
handleChange ($event) {
this.cur = $event.target.value
this.$emit('input', this.cur)
this.$emit('handleChange', this.cur)
if (this.focusState) {
this.focusState = false
}
handleFocus () {
this.focusState = true
},
handleBlur () {
handleBlur (e) {
this.$emit('input', e.target.value)
if (e.target.value.length) {
this.$emit('handleChange', e.target.value)
}
this.focusState = false
},
toSearch () {
this.$emit('toSearch', this.cur)
},
toDel () {
this.cur = ''
this.$emit('input', '')
},
toScan () {
setTimeout(() => {
this.focusState = true
},0)
setTimeout(() => {
uni.hideKeyboard()
}, 300)
this.cur = ''
this.$emit('input', '')
},
async toPhone() {
// #ifdef APP-PLUS
let status = await this.checkPermission();
if (status !== 1) {
return;
handleSend (e) {
this.$emit('input', e.target.value)
if (e.target.value.length) {
this.$emit('handleChange', e.target.value)
}
// #endif
uni.scanCode({
success: (res) => {
this.$emit('input', res.result)
this.$emit('handleChange', res.result)
},
fail: (err) => {
// uni.showToast({
// title: '出错',
// icon: 'none'
// })
}
});
}
// #ifdef APP-PLUS
,
async checkPermission(code) {
let status = permision.isIOS ? await permision.requestIOS('camera') :
await permision.requestAndroid('android.permission.CAMERA');
if (status === null || status === 1) {
status = 1;
} else {
uni.showModal({
content: "需要相机权限",
confirmText: "设置",
success: function(res) {
if (res.confirm) {
permision.gotoAppSetting();
}
}
})
}
return status;
}
// #endif
}
}
</script>
<style lang="stylus">
<style lang="stylus" scoped>
@import '../common/style/mixin.styl';
.search_wraper
.scan_wraper
position relative
_wh(100%, 70rpx)
_wh(100%, 80rpx)
border: 1px solid #dcdfe6;
background-color: #fff;
border-radius: 10rpx;
padding: 0 10rpx
.search_input
padding-right: 160rpx;
.buttons_wraper
position absolute
top 0
right 10rpx
_wh(auto, 70rpx)
_fj(flex-end)
.icon_scan_active
color $red
height 80rpx;
_font(28rpx, 80rpx, #606266,,)
border: 0;
background-color: transparent;
</style>

110
components/SearchBox1.vue
View File

@@ -1,110 +0,0 @@
<template>
<view class="search_wraper">
<input
type="text"
class="filter_input search_input"
:value="value"
:focus="focused"
@input="handleChange($event)">
<view class="buttons_wraper">
<span class="iconfont icon-del" @tap="toDel">&#xe6dc;</span>
<span class="iconfont icon_scan" @tap="toScan">&#xe6e2;</span>
<span v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</span>
</view>
</view>
</template>
<script>
import permision from "@/utils/permission.js"
export default {
data() {
return {
cur: ''
};
},
model: {
prop: 'value',
event: 'input'
},
props: {
value: String,
seaShow: {
type: Boolean,
default: false
},
focused: {
type: Boolean,
default: false
}
},
methods: {
handleChange ($event) {
this.cur = $event.target.value
this.$emit('input', this.cur)
this.$emit('handleChange', this.cur)
},
toSearch () {
this.$emit('toSearch', this.cur)
},
toDel () {
this.$emit('input', '')
},
async toScan() {
// #ifdef APP-PLUS
let status = await this.checkPermission();
if (status !== 1) {
return;
}
// #endif
uni.scanCode({
success: (res) => {
this.$emit('input', res.result)
this.$emit('handleChange', res.result)
},
fail: (err) => {
// uni.showToast({
// title: '出错',
// icon: 'none'
// })
}
});
}
// #ifdef APP-PLUS
,
async checkPermission(code) {
let status = permision.isIOS ? await permision.requestIOS('camera') :
await permision.requestAndroid('android.permission.CAMERA');
if (status === null || status === 1) {
status = 1;
} else {
uni.showModal({
content: "需要相机权限",
confirmText: "设置",
success: function(res) {
if (res.confirm) {
permision.gotoAppSetting();
}
}
})
}
return status;
}
// #endif
}
}
</script>
<style lang="stylus">
@import '../common/style/mixin.styl';
.search_wraper
position relative
_wh(100%, 70rpx)
.search_input
padding-right: 160rpx;
.buttons_wraper
position absolute
top 0
right 0
_wh(auto, 70rpx)
</style>

2
pages/home/home.vue
View File

@@ -60,7 +60,7 @@
{menu_id: '5', icon: 'RF09', name: '人工分拣', path: '', sonTree: [
{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
{menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
// {menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
{menu_id: '4', name: '包装入库', path: '/pages/modules/package-instore'},
{menu_id: '5', name: '呼叫满料', path: '/pages/modules/call-full-mater'},
{menu_id: '6', name: '呼叫木盘', path: '/pages/modules/call-mupan'},

6
pages/modules/call-full-mater.vue
View File

@@ -25,9 +25,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_callingMaterialTaskShow">刷新</button>
<button class="submit-button" :disabled="disabled" @tap="toSure">呼叫满料</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_callingMaterialTaskShow">刷新</button>
<button class="zd-col-11 submit-button" :disabled="disabled" @tap="toSure">呼叫满料</button>
</view>
</view>
</template>

6
pages/modules/call-mupan.vue
View File

@@ -25,9 +25,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_callingWoodenPalletTaskShow">刷新</button>
<button class="submit-button" :disabled="disabled" @tap="toSure">呼叫木盘</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_callingWoodenPalletTaskShow">刷新</button>
<button class="zd-col-11 submit-button" :disabled="disabled" @tap="toSure">呼叫木盘</button>
</view>
</view>
</template>

6
pages/modules/empty-instore.vue
View File

@@ -25,9 +25,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_emptyDiskIntoStorageShow">刷新</button>
<button class="submit-button" :disabled="disabled" @tap="toSure">空盘入库</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_emptyDiskIntoStorageShow">刷新</button>
<button class="zd-col-11 submit-button" :disabled="disabled" @tap="toSure">空盘入库</button>
</view>
</view>
</template>

6
pages/modules/equip-inspection.vue
View File

@@ -25,9 +25,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="submit-button" @tap="toCancle">取消</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="zd-col-11 submit-button" @tap="toCancle">取消</button>
</view>
</view>
</template>

6
pages/modules/equip-operate.vue
View File

@@ -19,9 +19,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="submit-button" @tap="toCancle">取消</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="zd-col-11 submit-button" @tap="toCancle">取消</button>
</view>
</view>
</template>

6
pages/modules/forced-rest.vue
View File

@@ -35,9 +35,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_forcedRestingShow">刷新</button>
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
</view>
</view>
</template>

6
pages/modules/hunnian-carry.vue
View File

@@ -19,9 +19,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !val1 || !index1}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="submit-button" @tap="toCancle">取消</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !val1 || !index1}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="zd-col-11 submit-button" @tap="toCancle">取消</button>
</view>
</view>
</template>

6
pages/modules/hunnian-operate.vue
View File

@@ -25,9 +25,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_mixRequestInfo">刷新</button>
<button class="submit-button" :disabled="disabled" @tap="toSure">删除</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_mixRequestInfo">刷新</button>
<button class="zd-col-11 submit-button" :disabled="disabled" @tap="toSure">删除</button>
</view>
</view>
</template>

6
pages/modules/man-group.vue
View File

@@ -35,9 +35,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="submit-button" @tap="toCancle">取消</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="zd-col-11 submit-button" @tap="toCancle">取消</button>
</view>
</view>
</template>

76
pages/modules/package-instore.vue
View File

@@ -4,21 +4,51 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">托盘编码</view>
<view class="filter_label">钢托盘1编码</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
<search-box v-model="code1" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">物料数量</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="val2">
<input type="number" class="filter_input" v-model="num1">
</view>
</view>
<view class="filter_item">
<view class="filter_label">剩余数量</view>
<view class="filter_label">钢托盘2编码</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="val3">
<search-box v-model="code2" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">物料数量</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="num2">
</view>
</view>
<view class="filter_item">
<view class="filter_label">钢托盘3编码</view>
<view class="filter_input_wraper">
<search-box v-model="code3" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">物料数量</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="num3">
</view>
</view>
<view class="filter_item">
<view class="filter_label">木托盘编码</view>
<view class="filter_input_wraper">
<search-box v-model="code4" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">物料数量</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="num4">
</view>
</view>
</view>
@@ -47,9 +77,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_manualSortingPackingTaskShow">刷新</button>
<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_manualSortingPackingTaskShow">刷新</button>
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !(((code1 !== '' && num1 !== '') || (code2 !== '' && num2 !== '') || (code3 !== '' && num3 !== '')) && (code4 !== '' && num4 !== ''))}" :disabled="disabled" @tap="toSure">确认</button>
</view>
</view>
</template>
@@ -65,9 +95,14 @@
},
data() {
return {
val1: '',
val2: '',
val3: '0',
code1: '',
num1: '',
code2: '',
num2: '',
code3: '',
num3: '',
code4: '',
num4: '',
dataList: [],
disabled: false
};
@@ -84,16 +119,21 @@
/** 确认 */
async toSure () {
this.disabled = true
if (!this.val1 || !this.val2) {
if (!(((this.code1 !== '' && this.num1 !== '') || (this.code2 !== '' && this.num2 !== '') || (this.code3 !== '' && this.num3 !== '')) && (this.code4 !== '' && this.num4 !== ''))) {
this.disabled = false
return
}
try {
let res = await manualSortingPackingTask(this.val1, this.val2, this.val3)
let res = await manualSortingPackingTask(this.code1, this.num1, this.code2, this.num2, this.code3, this.num3, this.code4, this.num4)
this.disabled = false
this.val1 = ''
this.val2 = ''
this.val3 = '0'
this.code1 = ''
this.num2 = ''
this.code2 = ''
this.num2 = ''
this.code3 = ''
this.num3 = ''
this.code4 = ''
this.num4 = ''
this._manualSortingPackingTaskShow()
uni.showToast({
title: res.message,
@@ -107,5 +147,7 @@
}
</script>
<style lang="stylus">
<style lang="stylus" scoped>
.filter_label
width 100px
</style>

6
pages/modules/pallet-bind.vue
View File

@@ -19,9 +19,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
<button class="submit-button" @tap="toCancle">清空</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
<button class="zd-col-11 submit-button" @tap="toCancle">清空</button>
</view>
</view>
</template>

6
pages/modules/press-carry.vue
View File

@@ -29,9 +29,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="submit-button" @tap="toCancle">取消</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !index2}" :disabled="disabled1" @tap="toSure">确认</button>
<button class="zd-col-11 submit-button" @tap="toCancle">取消</button>
</view>
</view>
</template>

6
pages/modules/shelf-check.vue
View File

@@ -59,9 +59,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_shelfMaterialQuery">查询</button>
<button class="submit-button" :class="{'btn-disabled': !val1 || !index || (index === '2' && !val2) || (index === '3' && (!val2 || !val3 || !pkId))}" :disabled="disabled" @tap="toSure">确认</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_shelfMaterialQuery">查询</button>
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !val1 || !index || (index === '2' && !val2) || (index === '3' && (!val2 || !val3 || !pkId))}" :disabled="disabled" @tap="toSure">确认</button>
</view>
</view>
</template>

6
pages/modules/sort-schedue.vue
View File

@@ -33,9 +33,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure1">开工</button>
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="toSure2">完工</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure1">开工</button>
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="toSure2">完工</button>
</view>
</view>
</template>

6
pages/modules/surplus-mater-instore.vue
View File

@@ -39,9 +39,9 @@
</view>
</view>
</view>
<view class="submit-bar">
<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
<view class="zd-row submit-bar">
<button class="zd-col-11 submit-button" @tap="_forcedRestingShow">刷新</button>
<button class="zd-col-11 submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
</view>
</view>
</template>

11
utils/getData2.js
View File

@@ -126,12 +126,17 @@ export const manualSortingPackingTaskShow = () => request({
data: {}
})
// 确认
export const manualSortingPackingTask = (code, qty, sqty) => request({
export const manualSortingPackingTask = (code1, qty1, code2, qty2, code3, qty3, code, qty) => request({
url:'/api/pda/manualSorting/packingTask',
data: {
g_vehicle_code1: code1,
g_qty1: qty1,
g_vehicle_code2: code2,
g_qty2: qty2,
g_vehicle_code3: code3,
g_qty3: qty3,
vehicle_code: code,
qty: qty,
surplus_quantity: sqty
qty: qty
}
})