From f393d33f812b2614ce9e354d4858f0853a3d67d7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 07 二月 2023 08:17:32 +0800
Subject: [PATCH] Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms
---
pages/basics/pakin.vue | 8
pages/basics/piking.vue | 14
pages/basics/stockCheckv2.vue | 464 ++++++++++++++++++++++++++++++++++++++++++
pages/login/login.vue | 64 -----
pages/basics/matQuery.vue | 4
pages/index/index2.vue | 12 +
manifest.json | 2
pages.json | 9
pages/basics/stockCheck.vue | 8
App.vue | 65 +++++
10 files changed, 571 insertions(+), 79 deletions(-)
diff --git a/App.vue b/App.vue
index 24cb416..8b90a69 100644
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,7 @@
globalData: {
baseHttp: '',
baseUrll: '',
+ upVersion: 0,
},
onLaunch: function() {
Vue.prototype.ColorList = [{
@@ -122,10 +123,15 @@
let that = this;
uni.request({
url: that.baseUrll + "/mobile/appUpdate/queryUpdate",
- // data: {combParam: 'asd'},
method:'GET',
success(res) {
- console.log(res);
+ // 鏂癮pp鐗堟湰
+ that.upVersion = Number(res.data.data)
+ // 褰撳墠app鐗堟湰
+ let currentVersion = Number(that.version)
+ if(that.upVersion > currentVersion) {
+ that.downWgt(); //涓嬭浇鏂囦欢
+ }
}
})
return
@@ -181,6 +187,61 @@
});
complete: () => {}
},
+ downWgt() {
+ let that = this;
+ const downloadUrl = that.baseUrll + "/static/appupload/" + that.upVersion + ".apk"
+ uni.showLoading({
+ title: '鏇存柊涓�︹��'
+ })
+ // return
+ const downloadTask = uni.downloadFile({ //鎵ц涓嬭浇
+ url: downloadUrl, //涓嬭浇鍦板潃
+ timeout: 1000 * 30, //30绉掕秴鏃舵椂闂�
+ success: downloadResult => { //涓嬭浇鎴愬姛
+ console.log(downloadResult);
+ that.showdownLine = false
+ uni.hideLoading();
+ console.log('downloadResult.statusCode' + downloadResult.statusCode)
+ if (downloadResult.statusCode == 200) {
+ console.log('鏇存柊涓�')
+ uni.showModal({
+ title: '',
+ content: '鏇存柊鎴愬姛锛岀‘瀹氱幇鍦ㄩ噸鍚悧锛�',
+ confirmText: '閲嶅惎',
+ confirmColor: '#EE8F57',
+ success: function(res) {
+ if (res.confirm == true) {
+ plus.runtime.install( //瀹夎
+ downloadResult.tempFilePath, {
+ force: true
+ },
+ function(res) {
+ utils.showToast('鏇存柊鎴愬姛锛岄噸鍚腑');
+ plus.runtime.restart();
+ }
+ );
+ }
+ }
+ });
+ }
+ },
+ fail: err => {
+ uni.hideLoading();
+ that.showdownLine = false
+ that.$u.toast(err.errMsg)
+ console.log(err)
+ },
+ complete: com => {
+ console.log(com)
+ }
+ });
+
+ // 涓嬭浇杩涘害
+ downloadTask.onProgressUpdate(res => {
+ that.downloadNum = res.progress
+ console.log('涓嬭浇杩涘害' + that.downloadNum);
+ });
+ },
}
}
</script>
diff --git a/manifest.json b/manifest.json
index 07db100..ec24ad2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "20230129A",
+ "versionName" : "2023020501",
"versionCode" : 104,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages.json b/pages.json
index 91571fa..885d263 100644
--- a/pages.json
+++ b/pages.json
@@ -202,6 +202,15 @@
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/basics/stockCheckv2",
+ "style" :
+ {
+ "navigationBarTitleText": "琛ヨ揣",
+ "enablePullDownRefresh": false
+
+ }
}
diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 38aad6c..88a91f9 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -23,6 +23,10 @@
<view class="text-title"><input type="text" v-model="matData.memo"></view>
</view>
<view class="text-box">
+ <view class="text-title"><text>瀹㈡埛淇℃伅</text></view>
+ <view class="text-title"><input type="text" v-model="matData.cstmr"></view>
+ </view>
+ <view class="text-box">
<view class="text-title"><text>鏁伴噺</text></view>
<view class="text-title">
<view>
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 9093c46..1805797 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -156,7 +156,7 @@
searchBox: 'hide',
pick:'hide',
matnr:'',
- matList:[{}],
+ matList:[],
result: '',
enableQty:'',
count:'',
@@ -407,7 +407,7 @@
}
if (add) {
if(mat.batch === '' || mat.batch === null) {
- mat.batch = today
+ // mat.batch = today
}
this.matList.unshift(mat)
}
@@ -444,6 +444,7 @@
this.count = this.matList[index].anfme
this.batch = this.matList[index].batch
this.memo = this.matList[index].memo
+ this.cstmr = this.matList[index].cstmr
this.rowNum = index
this.eject()
},
@@ -459,6 +460,7 @@
this.matList[this.rowNum].anfme = this.count
this.matList[this.rowNum].batch = this.batch
this.matList[this.rowNum].memo = this.memo
+ this.matList[this.rowNum].cstmr = this.cstmr
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
@@ -639,7 +641,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 120rpx;
+ margin-bottom: 180rpx;
}
/* .data-list-left {
display: inline-block;
diff --git a/pages/basics/piking.vue b/pages/basics/piking.vue
index 2d585fb..7e52d73 100644
--- a/pages/basics/piking.vue
+++ b/pages/basics/piking.vue
@@ -43,8 +43,10 @@
<view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+ <view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
<view>
- <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
</view>
</view>
<view class="data-list-right">
@@ -456,7 +458,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 230rpx;
+ height: 240rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -464,13 +466,13 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 160rpx;
+ margin-bottom: 180rpx;
}
.data-list-left {
display: inline-block;
float: left;
margin-left: 6%;
- height: 180rpx;
+ height: 240rpx;
color: #676767;
}
.matnr {
@@ -480,8 +482,8 @@
display: inline-block;
float: right;
width: 200rpx;
- height: 230rpx;
- line-height: 230rpx;
+ height: 240rpx;
+ line-height: 240rpx;
}
.data-list-right label {
display: inline-block;
diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index 390b5b2..3266940 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -59,8 +59,10 @@
<view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+ <view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
<view>
- <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
</view>
</view>
<view class="data-list-right">
@@ -426,7 +428,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 230rpx;
+ height: 240rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -434,7 +436,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 160rpx;
+ margin-bottom: 180rpx;
}
.data-list-left {
display: inline-block;
diff --git a/pages/basics/stockCheckv2.vue b/pages/basics/stockCheckv2.vue
new file mode 100644
index 0000000..9c61095
--- /dev/null
+++ b/pages/basics/stockCheckv2.vue
@@ -0,0 +1,464 @@
+<template>
+ <view>
+ <scroll-view scroll-y>
+ <!-- <view class="pak-seach-box">
+ <view class="box-top">
+ <view class="color-block-blue"></view>
+ <text class="title">閫夋嫨绔欏彴</text>
+ </view>
+ <view>
+ <text class="item">鍑哄簱鍙�</text>
+ <view class="example-body">
+ <uni-combox @input="getCheckDetl" emptyTips="鏆傛棤鏁版嵁" :candidates="staNoList" v-model="staNo" placeholder="璇烽�夋嫨"></uni-combox>
+ </view>
+ </view>
+ </view> -->
+
+ <view class="square-2">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鎵樼洏鏉＄爜</text></view>
+ </view>
+ <view class="square-content">
+ <view class="content-input">
+ <input v-model="barcode" @input="search" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8"placeholder-style="line-height: 85rpx;">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode" ></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view class="square-2">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>娣诲姞鍟嗗搧</text></view>
+ </view>
+ <view class="square-content">
+ <view class="content-input-btn">
+ <input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
+ :focus="focus" placeholder-style="line-height: 85rpx;">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
+ </view>
+ <view class="content-btn">
+ <button class="cu-btn bg-blue pda-btn" @click="selectMat()">+鎻愬彇</button>
+ </view>
+ </view>
+ </view>
+ <view class="pak-data-box">
+ <view class="box-top">
+ <view class="color-block-blue"></view>
+ <text class="title">鍟嗗搧鍒楄〃</text>
+ <!-- <button class="cu-btn bg-blue" @click="selectMat()">+ 娣诲姞</button> -->
+ </view>
+ </view>
+ <view class="pak-data-box" v-show="matList.length === 0">
+ <view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
+ </view>
+ <checkbox-group>
+ <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
+ <view class="data-list-left">
+ <view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
+ <view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
+ <view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
+ <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+ <view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
+ <view>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
+ </view>
+ </view>
+ <view class="data-list-right">
+ <label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
+ <label><uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons></label>
+ </view>
+ </view>
+ </checkbox-group>
+ <view class="footer flex justify-around">
+ <view>
+ <button class="cu-btn lg" @click="resst()">閲嶇疆</button>
+ </view>
+ <view>
+ <button class="cu-btn lg pakin-btn bg-blue" @click="adjust()">纭</button>
+ </view>
+ </view>
+ </scroll-view>
+ <!-- <y-pop v-model="count" title="淇敼" :max="9999999" :show="show"></y-pop> -->
+ <view>
+ <!-- 淇敼鏁伴噺 -->
+ <uni-popup ref="revise" @change="change">
+ <view class="revise-box">
+ <view class="revise-box-top">
+ <view class="color-block-blue"></view>
+ <text class="title">淇敼</text>
+ </view>
+ <view class="change">
+ <view class="text-box">
+ <text>鏁伴噺锛歿{enableQty}}</text>
+ </view>
+ <view class="changeBox">
+ <view class="num-box">
+ <uni-number-box v-model="count" :min="minCount" :max="99999999" color="#747474" @change="changeValue"/>
+ </view>
+ </view>
+ </view>
+
+ <view class="revise-box-buttom">
+ <view>
+ <button class="cu-btn bg-blue" @click="confirm()">纭</button>
+ </view>
+ </view>
+
+ </view>
+ </uni-popup>
+ </view>
+ </view>
+</template>
+<script>
+ export default {
+ data() {
+ return {
+ commonUrl:null,
+ matList:[],
+ staNoList:[],
+ barcode: '',
+ staNo:'',
+ matnr:'',
+ enableQty:'',
+ count:15,
+ maxCount:'',
+ minCount:0,
+ rowNum:'',
+ show: false,
+ focus: false,
+
+ }
+ },
+ mounted(){
+ const UIP = uni.getStorageSync('UIP');
+ this.baseIP = UIP;
+ const UPORT = uni.getStorageSync('UPORT');
+ this.basePORT = UPORT
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.baseUrl = PROJ
+ this.getUrl()
+ },
+ methods: {
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+ },
+ // 鏍规嵁鎵樼洏鐮佹悳绱�
+ search() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + '/mobile/checkDetl/auth2',
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ data: {barcode: that.barcode},
+ method:'GET',
+ success(result) {
+ let res = result.data
+ if(res.code === 200){
+ for(var i = 0; i < res.data.length;i++){
+ that.matList.push(res.data[i])
+ }
+ } else if (res.code == 403) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({title: res.msg, icon: "none",position: 'top'})
+ }
+ }
+
+ })
+ },
+ selectMat() { // 閫夋嫨鍟嗗搧
+ let that = this
+ uni.vibrateShort();
+ uni.navigateTo({
+ url: "matSelect",
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ that.matnr = ''
+ },
+ },
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
+ },
+
+ });
+
+ }, // selectMat
+ findMat() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + '/mat/auth',
+ data: {
+ matnr:that.matnr
+ },
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ success(result) {
+ uni.vibrateShort();
+ let res = result.data
+ if (res.code === 200 && res.data) {
+ that.matData = res.data
+ uni.navigateTo({
+ url: "matQuery",
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ matList: function(data) {
+ that.checkMat(data.data)
+ },
+ },
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('matData', { data: that.matData })
+ }
+ });
+ }
+
+ }
+ });
+ }, // findMat
+ removeMatnr() {
+ this.matnr = ''
+ uni.vibrateShort();
+ this.focus = false;
+ this.$nextTick(function() {
+ this.focus = true;
+ });
+ },
+ revise(item,index) {
+ // var maxCount = this.matList[index].maxCount
+ // if (maxCount == undefined ) {
+ // this.matList[index]["maxCount"] = item.enableQty
+ // }
+ // this.enableQty = item.enableQty
+ // this.count = this.minCount
+ // this.maxCount = item.maxCount
+ this.count = this.matList[index].anfme
+ this.rowNum = index
+ this.eject()
+ // this.show = true
+ },
+ remove(item,index) {
+ this.matList[index].anfme = 0
+ uni.vibrateShort();
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ },
+ eject(type) {
+ this.type = type
+ // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
+ this.$refs.revise.open(type)
+ },
+ change(e) {
+ // console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
+ },
+ changeValue() {
+
+ },
+ confirm() {
+ this.matList[this.rowNum].anfme = this.count
+ this.$refs.revise.close()
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ },
+ resst() {
+ this.matList = []
+ this.staNo = ''
+ },
+ // 娣诲姞鍟嗗搧
+ addMat(mat) {
+ this.matList.unshift(mat)
+ },
+ checkMat(mat) {
+ var len = this.matList.length
+ var add = true
+ for (var i = 0; i < len; i++) {
+ if (mat.matnr == this.matList[i].matnr) {
+ this.matList[i].anfme += mat.anfme
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
+ }
+ if (add) {
+ this.matList.unshift(mat)
+ }
+ },
+ adjust() {
+ let that = this
+ var combMats = []
+ var combParam = {}
+ combParam['barcode'] = that.barcode
+ combParam['wrkDetls'] = that.matList
+ uni.request({
+ url: that.commonUrl + '/mobile/adjustNew/v2/auth',
+ method: 'POST',
+ data: JSON.stringify(combParam),
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.matList = []
+ that.barcode = ''
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ } else if (res.code == 403) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({title: res.msg, icon: "none",position: 'top'})
+ }
+ },
+ });
+ },
+ removeBarcode() {
+ this.barcode = ''
+ }
+ } // methods
+ } // exprot
+</script>
+<style>
+ .revise-box {
+ width: 500rpx;
+ height: 300rpx;
+ display: flex;
+ flex-direction: column;
+ border-radius: 20rpx;
+ background-color: #F1F1F1;
+ }
+ .change {
+ height: 150rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .revise-box-buttom {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .pak-seach-box {
+ background-color: #FFFFFF;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ width: 96%;
+ height: 200rpx;
+ border-radius: 20rpx;
+ }
+ .box-top{
+ display: block;
+ height: 80rpx;
+ width: 720rpx;
+ }
+ .color-block-blue {
+ background-color: #1E9FFF;
+ display: inline-block;
+ float: left;
+ margin: 30rpx 15rpx 0 15rpx;
+ width: 12rpx;
+ height: 40rpx;
+ border: 5rpx solid #1E9FFF;
+ border-radius: 20rpx;
+ }
+ .title {
+ display: inline-block;
+ float: left;
+ font-size: 34rpx;
+ font-weight: 700;
+ height: 50rpx;
+ line-height: 80rpx;
+ margin-top: 10rpx;
+ }
+ .item {
+ text-indent: 1em;
+ font-size: 16px;
+ display: inline-block;
+ margin-top: 40rpx;
+ }
+ .example-body {
+ position: fixed;
+ display: inline-block;
+ margin-top: 3.5%;
+ margin-left: 5%;
+ width: 70%;
+ z-index: 999;
+ }
+
+ .pak-data-box {
+ background-color: #F1F1F1;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ width: 96%;
+ height: 100rpx;
+ border-radius: 20rpx;
+ line-height: 100rpx;
+ }
+ .pak-data-box>.box-top {
+ background-color: #FFFFFF;
+ height: 100rpx;
+ border-radius: 20rpx 20rpx 20rpx 20rpx;
+ }
+ .pak-data-box button {
+ background-color: #1E9FFF;
+ color: #ffffff;
+ display: inline-block;
+ float: right;
+ width: 150rpx;
+ height: 80rpx;
+ margin: 10rpx 25rpx 0rpx 0rpx;
+ line-height: 80rpx;
+ }
+ .bg-false {
+ background-color: #FFFFFF;
+ }
+ .bg-true {
+ background-color: #ebebeb;
+ }
+ .data-list {
+ border-bottom: 1px solid #d8d8d8;
+ height: 250rpx;
+ margin: 15rpx;
+ border-radius: 20rpx;
+ }
+ .data-list:first-child {
+ margin-top: 20rpx;
+ }
+ .data-list:last-child {
+ margin-bottom: 180rpx;
+ }
+ .data-list-left {
+ display: inline-block;
+ float: left;
+ margin-left: 6%;
+ height: 180rpx;
+ color: #676767;
+ }
+ .matnr {
+ padding-top: 10rpx;
+ }
+ .data-list-right {
+ display: inline-block;
+ float: right;
+ width: 200rpx;
+ height: 230rpx;
+ line-height: 230rpx;
+ }
+ .data-list-right label {
+ display: inline-block;
+ float: left;
+ width: 100rpx;
+ height: 180rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/index/index2.vue b/pages/index/index2.vue
index f1b682e..78401de 100644
--- a/pages/index/index2.vue
+++ b/pages/index/index2.vue
@@ -80,11 +80,23 @@
cuIcon: 'safe'
},
{
+ title: '琛ヨ揣',
+ name: 'stockCheckv2',
+ color: 'blue',
+ cuIcon: 'safe'
+ },
+ {
title: '鎷ｆ枡鍑哄簱',
name: 'piking',
color: 'blue',
cuIcon: 'safe'
},
+ {
+ title: '琛ヨ揣',
+ name: 'stockCheckv2',
+ color: 'blue',
+ cuIcon: 'safe'
+ },
// {
// title: '骞充粨搴撳瓨鐩樼偣',
// name: 'manStoCheck',
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 71310b7..7145c5a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -202,70 +202,6 @@
},
},
methods: {
- downWgt() {
- let that = this;
- const downloadUrl = "http://192.168.4.188:8088/jfwms/static/appupload/android_debug.apk"
- console.log('url:' + downloadUrl)
- uni.showLoading({
- title: '鏇存柊涓�︹��'
- })
- // return
- const downloadTask = uni.downloadFile({ //鎵ц涓嬭浇
- url: downloadUrl, //涓嬭浇鍦板潃
- timeout: 1000 * 30, //30绉掕秴鏃舵椂闂�
- success: downloadResult => { //涓嬭浇鎴愬姛
- console.log(downloadResult);
- that.showdownLine = false
- uni.hideLoading();
- console.log('downloadResult.statusCode' + downloadResult.statusCode)
- if (downloadResult.statusCode == 200) {
- console.log('鏇存柊涓�')
- uni.showModal({
- title: '',
- content: '鏇存柊鎴愬姛锛岀‘瀹氱幇鍦ㄩ噸鍚悧锛�',
- confirmText: '閲嶅惎',
- confirmColor: '#EE8F57',
- success: function(res) {
- if (res.confirm == true) {
- plus.runtime.install( //瀹夎
- downloadResult.tempFilePath, {
- force: true
- },
- function(res) {
- utils.showToast('鏇存柊鎴愬姛锛岄噸鍚腑');
- plus.runtime.restart();
- }
- );
- }
- }
- });
- }
- },
- fail: err => {
- uni.hideLoading();
- that.showdownLine = false
- that.$u.toast(err.errMsg)
- console.log(err)
- },
- complete: com => {
- console.log(com)
- }
- });
-
- // 涓嬭浇杩涘害
- downloadTask.onProgressUpdate(res => {
- // that.$u.toast(res.progress)
- that.downloadNum = res.progress
- console.log('涓嬭浇杩涘害' + that.downloadNum);
- // console.log('宸茬粡涓嬭浇鐨勬暟鎹暱搴�' + res.totalBytesWritten);
- // console.log('棰勬湡闇�瑕佷笅杞界殑鏁版嵁鎬婚暱搴�' + res.totalBytesExpectedToWrite);
-
- // 婊¤冻娴嬭瘯鏉′欢锛屽彇娑堜笅杞戒换鍔°��
- // if (res.progress > 50) {
- // downloadTask.abort();
- // }
- });
- },
// 閰嶇疆 URL PORT 椤圭洰(jkwms)
config() {
this.$refs.popup.open("center")
--
Gitblit v1.9.1