sov
This commit is contained in:
@@ -179,7 +179,7 @@ uni-button:after {
|
||||
align-content: flex-start;
|
||||
align-items: flex-start;
|
||||
width: calc(100% - 30px);
|
||||
height: calc(100% - 137px);/** 42+15*4+35 */
|
||||
height: calc(100% - 152px);/** 42+15*5+35 */
|
||||
margin: 15px auto;
|
||||
padding: 15px 15px 0 15px;
|
||||
overflow-y: auto;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name" : "pad-hl-hcx-four",
|
||||
"name" : "pad-hl-hcx-new",
|
||||
"appid" : "__UNI__80C78D1",
|
||||
"description" : "",
|
||||
"description" : "海亮缓存线平板系统",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
"transformPx" : false,
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<view class="submit">
|
||||
<button class="primary-button" :disabled="disabled" @click="toLogin">登 录</button>
|
||||
</view>
|
||||
<view class="scanBox">
|
||||
<view class="scanBox" @tap="toScan">
|
||||
<view class="iconfont scan_icon"></view>
|
||||
<text class="san_text">扫码登录</text>
|
||||
</view>
|
||||
@@ -49,6 +49,7 @@
|
||||
<script>
|
||||
import { RSAencrypt } from '@/utils/jsencrypt.js'
|
||||
import {handLogin} from '@/utils/getData2.js'
|
||||
import permision from "@/utils/permission.js"
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -138,7 +139,48 @@
|
||||
} catch (e) {
|
||||
this.disabled = false
|
||||
}
|
||||
},
|
||||
async toScan() {
|
||||
// #ifdef APP-PLUS
|
||||
let status = await this.checkPermission();
|
||||
if (status !== 1) {
|
||||
return;
|
||||
}
|
||||
// #endif
|
||||
uni.scanCode({
|
||||
success: (res) => {
|
||||
console.log(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>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<nav-bar title="缓存线-详情"></nav-bar>
|
||||
<nav-bar :inner2="true" @goIn="goIn" title="缓存线-详情"></nav-bar>
|
||||
<view class="search-confirm-wrap">
|
||||
<view class="search-wrap">
|
||||
<view class="search-item">
|
||||
@@ -110,6 +110,11 @@
|
||||
selectChange3(e) {
|
||||
this.index3 = e
|
||||
},
|
||||
goIn () {
|
||||
uni.navigateTo({
|
||||
url: `/pages/management/hcxcheck`
|
||||
})
|
||||
},
|
||||
toSearch () {
|
||||
this.dataList = []
|
||||
this._queryInstraction()
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<nav-bar title="缓存线盘点"></nav-bar>
|
||||
<view class="search-confirm-wrap">
|
||||
<view class="search-wrap">
|
||||
<view class="search-item">
|
||||
<view class="search-confirm-wrap search-confirm-wrap1">
|
||||
<view class="search-wrap search-wrap1">
|
||||
<view class="search-item search-item1">
|
||||
<label class="search-label">缓存线</label>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="confirm-button-wrap">
|
||||
<view class="confirm-button-wrap confirm-button-wrap1">
|
||||
<button class="confirm-button" @tap="toSearch()">刷 新</button>
|
||||
</view>
|
||||
</view>
|
||||
@@ -33,11 +33,79 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="material-wrap">
|
||||
<view class="material-item" v-for="(e, i) in dataList" :key="i" :class="['bg-gray', 'bg-green', 'bg-yellow','bg-red'][Number(e.status) - 1]">
|
||||
<view class="material-item" v-for="(e, i) in dataList" :key="i" :class="['bg-gray', 'bg-green', 'bg-yellow','bg-red'][Number(e.status) - 1]" @tap="toInfo(e)">
|
||||
<view class="material-title">{{e.vehicle_code}}</view>
|
||||
<view class="material-spec">{{e.material_spec}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="popup-bottom-wrap" :class="active === true ? 'addHeight' : 'delHeight'">
|
||||
<view class="search-confirm-wrap">
|
||||
<view class="search-wrap">
|
||||
<view class="search-item">
|
||||
<label class="search-label">料箱码</label>
|
||||
<view class="filter_input_wraper">
|
||||
<search-box
|
||||
v-model="val1"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">工序</label>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">物料</label>
|
||||
<view class="filter_input_wraper">
|
||||
<input type="text" class="search-input-l" v-model="val2">
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">名称</label>
|
||||
<view class="filter_input_wraper">
|
||||
<input type="text" class="search-input-l" v-model="val3">
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">规格</label>
|
||||
<view class="filter_input_wraper">
|
||||
<input type="text" class="search-input-l" v-model="val4">
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">数量</label>
|
||||
<view class="filter_input_wraper">
|
||||
<input type="number" class="search-input-l" v-model="val5">
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">重量</label>
|
||||
<view class="filter_input_wraper">
|
||||
<input type="number" class="search-input-l" v-model="val6">
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">层</label>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="search-item">
|
||||
<label class="search-label">位置</label>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="confirm-button-wrap">
|
||||
<button class="confirm-button" @tap="toSearch()">设为满框</button>
|
||||
<button class="confirm-button" :disabled="disabled" @tap="toSure()">设为空框</button>
|
||||
<button class="confirm-button" :disabled="disabled" @tap="toSure()">设为空位</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-show="active" class="overlay" @tap="closePop"></view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -51,7 +119,19 @@
|
||||
return {
|
||||
options1: [],
|
||||
index1: '',
|
||||
dataList: []
|
||||
options2: [],
|
||||
index2: '',
|
||||
options3: [],
|
||||
index3: '',
|
||||
val1: '',
|
||||
val2: '',
|
||||
val3: '',
|
||||
val4: '',
|
||||
val5: '',
|
||||
val6: '',
|
||||
dataList: [],
|
||||
active: false
|
||||
|
||||
};
|
||||
},
|
||||
created () {
|
||||
@@ -64,19 +144,51 @@
|
||||
selectChange1(e) {
|
||||
this.index1 = e
|
||||
},
|
||||
toInfo(e) {
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/management/hcxInfo`
|
||||
// })
|
||||
this.active = true
|
||||
},
|
||||
closePop () {
|
||||
this.active = false
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="stylus" scoped>
|
||||
@import '../../common/style/mixin.styl';
|
||||
.search-confirm-wrap
|
||||
.search-confirm-wrap1
|
||||
_fj()
|
||||
.search-wrap
|
||||
.search-wrap1
|
||||
width 48%
|
||||
.search-item
|
||||
.search-item1
|
||||
width calc(100% - 120px)
|
||||
.confirm-button-wrap
|
||||
.confirm-button-wrap1
|
||||
width auto
|
||||
justify-content flex-start
|
||||
.popup-bottom-wrap
|
||||
position fixed
|
||||
bottom 0
|
||||
left 0
|
||||
width 100%
|
||||
height 0
|
||||
z-index 100
|
||||
background-color #fff
|
||||
_fj()
|
||||
overflow hidden
|
||||
.overlay
|
||||
position fixed
|
||||
bottom 0
|
||||
left 0
|
||||
_wh(100%, 100%)
|
||||
background-color rgba(0,0,0,.7)
|
||||
z-index 99
|
||||
.addHeight
|
||||
transition height .2s linear
|
||||
height 315px
|
||||
.delHeight
|
||||
transition height .2s linear
|
||||
height 0
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user