Sfoglia il codice sorgente

Merge branch 'develop_szhj' of http://git.chelingzhu.com/jianguan-web/qpls-md-app into develop_szhj

chenrui 3 anni fa
parent
commit
7beeb7010c

+ 21 - 5
components/kk-printer/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="kk-printer">
 		<view class="kk-printer-btn">
-			<u-button @tap="handlePrintTap" shape="circle" :custom-style="{background:$config('primaryColor')}" type="primary">{{isPrinting?printingText:defaultText}}</u-button>
+			<u-button @tap="handlePrintTap" :loading="isPrinting" shape="circle" :custom-style="{background:$config('primaryColor')}" type="primary">{{isPrinting?printingText:defaultText}}</u-button>
 		</view>
 		<view class="kk-shadow" :class="isShowSearch?'show':''" @tap="handleSearchClose">
 			<view class="kk-modal" @tap.stop="doNothing">
@@ -10,9 +10,14 @@
 						<view class="filter-title">根据SRRI过滤设备</view>
 						<slider @change="handleSRRIChange" max='-20' min='-100' value="-95" show-value/>
 					</view> -->
-					<view class="kk-filter-wrap">
+					<!-- <view class="kk-filter-wrap">
 						<view class="filter-title">根据蓝牙名过滤</view>
 						<input type="text"  placeholder-class="kk-placeholder-class" placeholder="请输入蓝牙名字或设备ID搜索" v-model="filterName" />
+					</view> -->
+					<view>
+						<view>注意事项:</view>
+						<view>1、连接打印机之前,先打开手机蓝牙开关</view>
+						<view>2、请检查打印机是否已被其它手机连接,如果是请关闭其它手机蓝牙,然后再用您的手机连接</view>
 					</view>
 					<view class="kk-btn-wrap">
 						<view class="kk-btn-item confirm-btn" @tap="searchBtnTap" v-if="!isSearching">
@@ -47,13 +52,14 @@
 									</view>
 								</view>
 								<view>
-									<u-icon :size="60" color="#55aaff" name="plus-circle"></u-icon>
+									<!-- <u-icon :size="60" color="#55aaff" name="plus-circle"></u-icon> -->
+									<u-button @tap="handleConnectDevice(item)" :loading="isConnecting" shape="circle" size="mini" :custom-style="{background:$config('primaryColor')}" type="primary">{{isConnecting?'连接中':'连接'}}</u-button>
 								</view>
 							</view>
 						</view>
 					</view>
 					<view style="margin-top: 20upx;">
-						<view style="text-align: center;padding: 20upx;border:2upx solid #eee;border-radius: 15upx;" @tap="handleSearchClose">取消打印</view>
+						<view v-if="!isConnecting" style="text-align: center;padding: 20upx;border:2upx solid #eee;border-radius: 15upx;" @tap="handleSearchClose">取消打印</view>
 					</view>
 				</view>
 			</view>
@@ -73,6 +79,8 @@
 				isPrinting:false,
 				//是否正在搜索设备
 				isSearching:false,
+				// 是否正在连接
+				isConnecting: false,
 				//是否显示蓝牙列表
 				isShowSearch:false,
 				//按蓝牙名过滤
@@ -199,7 +207,9 @@
 				this.devicesList = res;
 			},
 			handleSearchClose(){
-				this.isShowSearch = false
+				if(!this.isConnecting){
+					this.isShowSearch = false
+				}
 			},
 			handleSRRIChange(e){
 				this.filterRSSI = e.detail.value
@@ -222,6 +232,8 @@
 				let name = device.name;
 				this.deviceId = deviceId;
 				console.log('deviceId',this.deviceId)
+				this.isConnecting = true
+				this.stopSearchBtnTap()
 				uni.onBLEConnectionStateChange(function(res){
 					console.log('连接',res)
 					if(res.connected){
@@ -234,15 +246,19 @@
 							verticalAlign:'center'
 						})
 					}
+					_this.isConnecting = false
 			    })
 				blesdk.createBLEConnection(deviceId, this.onConnectSuccess, this.onConnectFail);
 			},
 			onConnectSuccess(res){
 				this.stopSearchBtnTap()
+				this.isConnecting = false
 				blesdk.getBLEDeviceServices(this.deviceId, this.onGetServicesSuccess, this.onGetServicesFail);
 			},
 			onConnectFail(err){
 				console.log('链接失败',err)
+				this.isConnecting = false
+				blesdk.catchToast(err.res)
 			},
 			onGetServicesSuccess(res){
 				console.log('获取服务',res)

+ 6 - 3
components/kk-printer/utils/bluetoolth.js

@@ -82,7 +82,8 @@ export function createBLEConnection(deviceId, sucess, fail) {
 	//连接蓝牙设备
 	console.log('连接蓝牙设备', deviceId);
 	uniAsyncPromise("createBLEConnection", {
-			deviceId
+			deviceId,
+			timeout: 10000
 		})
 		.then(res => {
 			//连接成功可选择停止搜索蓝牙
@@ -312,12 +313,14 @@ export function catchToast(err) {
 		10006: '当前连接已断开',
 		10007: '当前特征值不支持此操作',
 		10008: '系统上报异常',
-		10009: '系统版本低于 4.3 不支持BLE'
+		10009: '系统版本低于 4.3 不支持BLE',
+		10012: '连接超时,请检查打印机是否被其它手机连接中'
 	};
 	let coode = err.errCode ? err.errCode.toString() : '';
 	let msg = errMsg[coode];
 	plus.nativeUI.toast(msg || coode, {
 		align: 'center',
-		verticalAlign: 'center'
+		verticalAlign: 'center',
+		duration:'long'
 	});
 }

+ 1 - 1
config/index.js

@@ -16,7 +16,7 @@ const getConfig = (theme) => {
 					loading: '努力加载中',
 					nomore: '没有了'
 				},
-			primaryColor: '#0485F6', // 主色调
+			primaryColor: '#335fb6', // 主色调
 			warringColor: '#f3bb12', // 警告
 			errorColor: '#E70012', // 错误
 			successColor: '#13C442', // 成功

+ 10 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -123,6 +123,14 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "证书/安卓/480-762.png",
+                    "xhdpi" : "证书/安卓/720-1240.png",
+                    "xxhdpi" : "证书/安卓/1080-1882.png"
+                }
             }
         }
     },

+ 39 - 0
package-lock.json

@@ -0,0 +1,39 @@
+{
+  "name": "qpls-md-app",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "qpls-md-app",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "moment": "^2.29.1",
+        "uview-ui": "^1.8.4"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/uview-ui": {
+      "version": "1.8.4",
+      "license": "MIT"
+    }
+  },
+  "dependencies": {
+    "moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+    },
+    "uview-ui": {
+      "version": "1.8.4"
+    }
+  }
+}

+ 1 - 0
package.json

@@ -14,6 +14,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "moment": "^2.29.1",
     "uview-ui": "^1.8.4"
   }
 }

+ 1 - 1
pages.json

@@ -243,7 +243,7 @@
 			},
 			{
 				"pagePath": "pages/index/index",
-				"text": "首页"
+				"text": "货架"
 			},
 			{
 				"pagePath": "pages/userCenter/index",

+ 2 - 0
pages/common/partList.vue

@@ -131,8 +131,10 @@
 						this.totalNums = this.totalNums + item.confirmQty
 					}else if(_this.pageType=='manualPrint'){  // 补货-手动打印
 						this.totalNums = this.totalNums + item.confirmQty
+						item.printQty = item.printQty ? item.printQty : 1
 					}else if(_this.pageType=='scanCodePrint'){  // 补货-扫码打印
 						this.totalNums = this.totalNums + item.confirmQty
+						item.printQty = item.printQty ? item.printQty : 1
 					}else if(_this.pageType=='replenishmentDetail'){  // 补货详情-已完成
 						this.totalNums = this.totalNums + item.putQty
 					}else if(_this.pageType=='replenishmentDetailc'){  // 补货详情-已取消

+ 19 - 10
pages/common/printTag/printTag.vue

@@ -29,6 +29,7 @@
 	import { shelfDetail } from '@/api/shelf'
 	import kkPrinter from '@/components/kk-printer/index.vue';
 	import {textFormat} from '@/libs/printTools.js'
+	import moment from 'moment'
 	export default {
 		components:{
 			kkPrinter
@@ -38,7 +39,8 @@
 				infoData: null,
 				fromPage: '',
 				printInfo: null,
-				printNum: 0
+				printNum: 0,
+				isParinting: false
 			}
 		},
 		onLoad(options) {
@@ -64,7 +66,7 @@
 			// 获取打印内容
 			getPrintContent(){
 				const _this = this
-				const myDate = new Date()
+				const nowDate = moment().format('YYYY-MM-DD HH:mm')
 				if(_this.fromPage == 'bdtq'){
 					_this.printInfo = {
 						dealerName: _this.$store.state.vuex_userData.orgName,
@@ -73,8 +75,8 @@
 						productName: _this.infoData.productEntity&&_this.infoData.productEntity.productName || '',
 						shelfPlaceCode: _this.infoData.shelfPlaceCode || '',
 						currentInven: _this.printNum,
-						printDate: myDate.toLocaleDateString() +' '+myDate.getHours() +':'+myDate.getMinutes() +':'+myDate.getSeconds(),
-						printUser: _this.$store.state.vuex_userData.username,
+						printDate: nowDate,
+						printUser: _this.$store.state.vuex_userData.userNameCN,
 						barCode: `dealerSn=${_this.$store.state.vuex_userData.orgSn}&shelfSn=${_this.infoData.shelfSn}&productSn=${_this.infoData.productEntity&&_this.infoData.productEntity.productSn}&productCode=${_this.infoData.productEntity&&_this.infoData.productEntity.code}&shelfPlaceCode=${_this.infoData.shelfPlaceCode}&shelfPlaceSn=${_this.infoData.shelfPlaceSn}`
 					}
 				}else if(_this.fromPage == 'smdy'){
@@ -85,8 +87,8 @@
 						productName: _this.infoData.productName || '',
 						shelfPlaceCode: _this.infoData.shelfPlaceCode || '',
 						currentInven: _this.printNum,
-						printDate: myDate.toLocaleDateString() +' '+myDate.getHours() +':'+myDate.getMinutes() +':'+myDate.getSeconds(),
-						printUser: _this.$store.state.vuex_userData.username,
+						printDate: nowDate,
+						printUser: _this.$store.state.vuex_userData.userNameCN,
 						barCode: `dealerSn=${_this.$store.state.vuex_userData.orgSn}&shelfSn=${_this.infoData.shelfSn}&productSn=${_this.infoData.productSn}&productCode=${_this.infoData.productCode}&shelfPlaceCode=${_this.infoData.shelfPlaceCode}&shelfPlaceSn=${_this.infoData.shelfPlaceSn}`
 					}
 				}
@@ -104,14 +106,18 @@
 					this.$refs.kkprinter.onPrintFail()
 					return
 				}
+				if(this.isParinting){
+					return
+				}
+				this.isParinting = true
 				let top = 10 // 距离顶部10点像素
-				const left = 32 // 距离左边
+				const left = 8 // 距离左边
 				const lightHeight = 24 // 行高3mm,1mm = 8点
 				const pageW = 40 // 页签宽度mm
 				const pageH = 30 // 页签高度mm
 				const maxFontNums = Math.floor((pageW*8-left*2)/lightHeight) // 每行最多字体数
 				let rightTop = 0
-				let rightLeft = Math.floor(maxFontNums*0.7)*lightHeight
+				let rightLeft = (Math.floor(maxFontNums*0.6)+1)*lightHeight
 				// 初始化打印机
 				const command = tsc.jpPrinter.createNew()
 				command.init()
@@ -124,14 +130,16 @@
 				top = top+10
 				rightTop = top
 				const lwidth = Math.floor(maxFontNums*0.6)
-				rightLeft = (lwidth + 1.5) * lightHeight
 				top = textFormat(command,this.printInfo.shelfName,lwidth,left,top,lightHeight,"left",1)
 				// 产品编码
 				top = top+10
 				top = textFormat(command,this.printInfo.productCode,lwidth,left,top,lightHeight,"left",1)
 				// 产品名称
-				top = top+5
+				top = top+10
 				top = textFormat(command,this.printInfo.productName,lwidth,left,top,lightHeight,"left",1)
+				// 打印人打印时间
+				top = top+10
+				top = textFormat(command,this.printInfo.printDate+' '+this.printInfo.printUser,lwidth,left,top,lightHeight,"left",1)
 				// 货位号
 				textFormat(command,this.printInfo.shelfPlaceCode,maxFontNums-lwidth,rightLeft,rightTop,lightHeight,"center",1)
 				// 二维码
@@ -145,6 +153,7 @@
 			onPrintSuccess(){
 				// uni.navigateBack()
 				this.$refs.kkprinter.onPrintSuccess()
+				this.isParinting = false
 			}
 		}
 	}

+ 4 - 4
pages/index/index.vue

@@ -38,8 +38,8 @@
 			this.theme = theme
 			uni.setTabBarItem({
 			  "index": 0,
-			  "iconPath": "static/"+theme+"/tabbar/stock.png",
-			  "selectedIconPath": "static/"+theme+"/tabbar/stock-active.png",
+			  "iconPath": "static/"+theme+"/tabbar/home.png",
+			  "selectedIconPath": "static/"+theme+"/tabbar/home-active.png",
 			})
 			uni.setTabBarItem({
 			  "index": 1,
@@ -48,8 +48,8 @@
 			})
 			uni.setTabBarItem({
 			  "index": 2,
-			  "iconPath": "static/"+theme+"/tabbar/home.png",
-			  "selectedIconPath": "static/"+theme+"/tabbar/home-active.png",
+			  "iconPath": "static/"+theme+"/tabbar/shelf.png",
+			  "selectedIconPath": "static/"+theme+"/tabbar/shelf-active.png",
 			})
 			uni.setTabBarItem({
 			  "index": 3,

+ 3 - 3
pages/login/forget-pass.vue

@@ -9,10 +9,10 @@
 					</view>
 					<view class="form-item flex-box justify_between">
 						<view><u-input v-model="form.verifyCode" :custom-style="{fontSize:'34upx'}" height="110" type="number" clearable maxlength="6" placeholder="请输入短信验证码" /></view>
-						<button class="getcode-btn" :style="{background:$config('fixedButtonColors')}" :disabled="isDisable" @click="getCodeValidate">{{nowVal}}</button>
+						<button class="getcode-btn" :style="{background:$config('primaryColor')}" :disabled="isDisable" @click="getCodeValidate">{{nowVal}}</button>
 					</view>
 					<view class="form-btn-con">
-						<button class="form-btn" :disabled="isDisabled" :style="{'background':isDisabled?'#e5e5e5':$config('buttonColors')}" @click="goStep">下一步</button>
+						<button class="form-btn" :disabled="isDisabled" :style="{'background':isDisabled?'#e5e5e5':$config('primaryColor')}" @click="goStep">下一步</button>
 					</view>
 				</view>
 				<view v-show="state == 1">
@@ -23,7 +23,7 @@
 						<u-input v-model="form.passwords" :custom-style="{fontSize:'34upx'}" height="110" type="password" :password-icon="true" maxlength="12" placeholder="请再次输入新密码"/>
 					</view>
 					<view class="form-btn-con">
-						<button class="form-btn" :disabled="isDisabledTwo" :style="{'background':isDisabledTwo?'#e5e5e5':$config('buttonColors')}" form-type="submit">提交</button>
+						<button class="form-btn" :disabled="isDisabledTwo" :style="{'background':isDisabledTwo?'#e5e5e5':$config('primaryColor')}" form-type="submit">提交</button>
 					</view>
 				</view>
 			</form>

+ 3 - 3
pages/login/login.scss

@@ -21,9 +21,9 @@
 	}
 	.logo{
 		display: block;
-		margin-bottom: 100upx;
+		margin-bottom: 120upx;
 		width: 160upx;
-		height: 48upx;
+		height: 160upx;
 	}
 	.login-title{
 		font-size: 40upx;
@@ -34,7 +34,7 @@
 		margin: 0 auto;
 		width: 100%;
 		.mt20{
-			margin-top: 30upx;
+			margin-top: 20upx;
 		}
 		.form-item{
 			position: relative;

+ 2 - 1
pages/login/login.vue

@@ -139,6 +139,7 @@ export default {
 			login(_this.form).then(res => {
 				uni.hideLoading();
 				if (res.status == 200) {
+					console.log(_this.fiterAuthCode(res.data.auth_user))
 					_this.$u.vuex('vuex_userData', _this.fiterAuthCode(res.data.auth_user));
 					_this.$u.vuex('vuex_token', res.data.access_token);
 					getApp().globalData.token = res.data.access_token;
@@ -164,7 +165,7 @@ export default {
 		toMain() {
 			// 跳转到首页
 			uni.switchTab({
-				url: '/pages/index/index'
+				url: '/pages/sales/index'
 			});
 		},
 		//  忘记密码

+ 1 - 1
pages/replenishmentManage/chooseTypeModal.vue

@@ -86,7 +86,7 @@
 		z-index: 9999999;
 		.modal-con{
 			width: 78%;
-			margin: 59% auto 0;
+			margin: 40vh auto 0;
 			background-color: #fff;
 			border-radius: 24upx;
 			.modal-title{

+ 1 - 0
pages/replenishmentManage/confirm.vue

@@ -133,6 +133,7 @@
 					if (res.status == 200) {
 						this.toashMsg(res.message)
 						uni.$emit('refreshBL')
+						uni.$emit("refreshBhList",'WAIT_OUT_STOCK')
 						uni.navigateBack()
 					}else{
 						this.toashMsg(res.message)

+ 11 - 8
pages/replenishmentManage/manualPrint.vue

@@ -45,7 +45,7 @@
 			this.getPartList()
 		},
 		onUnload() {
-			this.$refs.kkprinter.closeConnect()
+			// this.$refs.kkprinter.closeConnect()
 		},
 		methods: {
 			// 查询详情
@@ -81,17 +81,20 @@
 				this.allChecked = val
 			},
 			printOnce(opt,tsc,blesdk,data){
+				if(this.isParinting){
+					return
+				}
+				this.isParinting = true
 				const _this = this
 				const dealer = this.$store.state.vuex_userData
-				console.log(opt,data,'opt')
 				let top = 10 // 距离顶部10点像素
-				const left = 32 // 距离左边
+				const left = 8 // 距离左边
 				const lightHeight = 24 // 行高3mm,1mm = 8点
 				const pageW = 40 // 页签宽度mm
 				const pageH = 30 // 页签高度mm
 				const maxFontNums = Math.floor((pageW*8-left*2)/lightHeight) // 每行最多字体数
 				let rightTop = 0
-				let rightLeft = Math.floor(maxFontNums*0.7)*lightHeight
+				let rightLeft = (Math.floor(maxFontNums*0.6)+1)*lightHeight
 				// 初始化打印机
 				const command = tsc.jpPrinter.createNew()
 				command.init()
@@ -104,17 +107,16 @@
 				top = top+10
 				rightTop = top
 				const lwidth = Math.floor(maxFontNums*0.6)
-				rightLeft = (lwidth + 1.5) * lightHeight
 				top = textFormat(command,this.basicInfoData.shelfInfo.shelfName,lwidth,left,top,lightHeight,"left",1)
 				// 产品编码
 				top = top+10
 				top = textFormat(command,data.productCode,lwidth,left,top,lightHeight,"left",1)
 				// 产品名称
-				top = top+5
+				top = top+10
 				top = textFormat(command,data.product.name,lwidth,left,top,lightHeight,"left",1)
-				// 时间
+				// 时间,打印人
 				top = top+10
-				top = textFormat(command,this.$u.timeFormat(this.timestamp, 'yyyy-mm-dd hh:MM'),lwidth,left,top,lightHeight,"left",1)
+				top = textFormat(command,this.$u.timeFormat(this.timestamp, 'yyyy-mm-dd hh:MM')+" "+this.$store.state.vuex_userData.userNameCN,lwidth,left,top,lightHeight,"left",1)
 				// 货位号
 				textFormat(command,data.shelfPlaceCode,maxFontNums-lwidth,rightLeft,rightTop,lightHeight,"center",1)
 				// 二维码
@@ -137,6 +139,7 @@
 					}else{
 						_this.printIndex = 0
 						_this.$refs.kkprinter.onPrintSuccess()
+						_this.isParinting = false
 					}
 				});
 			},

+ 1 - 21
pages/replenishmentManage/outWarehousing.vue

@@ -33,7 +33,7 @@
 
 <script>
 	import printStickerModal from './printStickerModal.vue'
-	import { shelfReplenishDetail, shelfReplenishDetailList, shelfReplenishPutStock } from '@/api/shelfReplenish'
+	import { shelfReplenishDetail, shelfReplenishDetailList } from '@/api/shelfReplenish'
 	import partList from '@/pages/common/partList.vue'
 	export default {
 		components: { partList, printStickerModal },
@@ -92,26 +92,6 @@
 					}
 				})
 			},
-			// 确认签收 confirm
-			modalConfirm(){
-				const arr = []
-				this.partList.map((item, index) => {
-				  if (item.putQty || item.putQty == 0) {
-				    arr.push({ productSn: item.productSn, putQty: item.putQty })
-				  }
-				})
-				const params = {
-				  replenishBillSn: this.replenishBillSn,
-				  detailList: arr
-				}
-				shelfReplenishPutStock(params).then(res => {
-					if(res.status == 200){
-						uni.$emit('refreshBL')
-						uni.navigateBack()
-					}
-					this.toashMsg(res.message)
-				})
-			},
 			// 打印贴签 confirm
 			modalPrint(type){
 				this.printModal = false

+ 10 - 6
pages/replenishmentManage/replenishmentList.vue

@@ -85,12 +85,9 @@
 		onLoad(options) {
 			const _this = this
 			if(options&&options.billState){  // 指定单据状态
-				this.tabList.map((item,index) => {
-					if(item.status == options.billState){
-						_this.swiperCurrent = index
-						_this.current = index
-					}
-				})
+				const index = this.tabList.findIndex(item => item.status == options.billState)
+				_this.swiperCurrent = index
+				_this.current = index
 			}else{
 				_this.swiperCurrent = 0
 				_this.current = 0
@@ -98,6 +95,8 @@
 			// 监听整改完成后刷新事件
 			uni.$on('refreshBL', this.queryByTypeSum)
 			this.queryByTypeSum()
+			// 跳到指定tab
+			uni.$on('refreshBhList',this.refreshBhList)
 		},
 		onUnload() {
 			uni.$off('refreshBL')
@@ -205,6 +204,11 @@
 					}
 				})
 			},
+			refreshBhList(tab){
+				const _this = this
+				const index = this.tabList.findIndex(item => item.status == tab)
+				_this.tabsChange(index)
+			}
 		}
 	}
 </script>

+ 1 - 0
pages/replenishmentManage/scanCodePrint.vue

@@ -114,6 +114,7 @@
 				 
 				// 扫码成功后
 				this.barcode.onmarked = function(type, result) {
+					console.log(type,result)
 					_this.scanResult(result)
 				}
 				// 扫码识别出错

+ 6 - 1
pages/replenishmentManage/sendOutGoods.vue

@@ -105,7 +105,12 @@
 				  if (res.status == 200) {
 				    _this.toashMsg(res.message)
 					_this.chooseModal = false
-					uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=WAIT_OUT_STOCK' })
+					
+					uni.$emit('refreshBL')
+					uni.$emit("refreshBhList",'WAIT_CHECK')
+					uni.navigateBack({
+						delta:2
+					})
 				  }else{
 					  _this.toashMsg(res.message)
 				  }

+ 1 - 0
pages/replenishmentManage/signWarehousing.vue

@@ -117,6 +117,7 @@
 				shelfReplenishPutStock(params).then(res => {
 					if(res.status == 200){
 						uni.$emit('refreshBL')
+						uni.$emit("refreshBhList",'FINISH')
 						uni.navigateBack()
 					}
 					this.toashMsg(res.message)

+ 2 - 3
pages/stock/index.vue

@@ -25,8 +25,8 @@
 				<u-form-item label="只查看有库存"><u-switch slot="right" v-model="form.zeroQtyFlag"></u-switch></u-form-item>
 			</u-form>
 			<view class="form-footer-btn">
-				<u-button size="medium" hover-class="none" @click="handleClean">清空</u-button>
-				<u-button size="medium" hover-class="none" :custom-style="customBtnStyle" @click="handleSearch">查询</u-button>
+				<u-button size="medium" shape="circle" hover-class="none" @click="handleClean">清空</u-button>
+				<u-button size="medium" hover-class="none" shape="circle" :custom-style="customBtnStyle" @click="handleSearch">查询</u-button>
 			</view>
 		</view>
 		<!-- 产品品牌 -->
@@ -65,7 +65,6 @@
 					nowInd: 0
 				},
 				customBtnStyle: {  //  自定义按钮样式
-					borderColor: this.$config('primaryColor'),
 					backgroundColor: this.$config('primaryColor'),
 					color: '#fff'
 				},

+ 2 - 7
pages/userCenter/changePwd.vue

@@ -19,8 +19,8 @@
 		</view>
 		<!-- 消息提醒弹窗 -->
 		<view class="form-footer-btn">
-			<u-button size="medium" hover-class="none" @click="handleReset">重置</u-button>
-			<u-button size="medium" hover-class="none" :loading="loading" :custom-style="customBtnStyle" @click="handleSubmit">保存</u-button>
+			<u-button size="medium" shape="circle" hover-class="none" @click="handleReset">重置</u-button>
+			<u-button shape="circle" type="success" size="medium" hover-class="none" :loading="loading" :custom-style="{background:$config('primaryColor')}" @click="handleSubmit">保存</u-button>
 		</view>
 	</view>
 </template>
@@ -41,11 +41,6 @@
 				  oldPwd: ''
 				},
 				loading: false,
-				customBtnStyle: {  //  自定义按钮样式
-					borderColor: '#ed1c24',
-					backgroundColor: '#ed1c24',
-					color: '#fff'
-				},
 			}
 		},
 		methods:{

+ 1 - 1
pages/userCenter/index.vue

@@ -23,7 +23,7 @@
 		</view>
 		<!-- 退出 -->
 		<view class="user-btn">
-			<u-button type="success" :custom-style="{background:$config('primaryColor')}" hover-class="none" @click="quitOutSys" shape="circle">退出登录</u-button>
+			<u-button type="success" :custom-style="{background:$config('infoColor')}" hover-class="none" @click="quitOutSys" shape="circle">退出登录</u-button>
 		</view>
 	</view>
 </template>

BIN
static/default/logo.png


BIN
static/default/tabbar/shelf-active.png


BIN
static/default/tabbar/shelf.png


BIN
static/default/tabbar/stock-active.png


BIN
static/default/tabbar/user-active.png


BIN
证书/安卓/1080-1882.png


BIN
证书/安卓/480-762.png


BIN
证书/安卓/720-1240.png


BIN
证书/安卓/deskicon.png


BIN
证书/安卓/deskicon1.png