Bladeren bron

bug 修复

lilei 2 jaren geleden
bovenliggende
commit
d29d569f6e

+ 1 - 1
App.vue

@@ -7,7 +7,7 @@
 			token: '',
 			changeOrg:'',
 			version: '', // 当前版本号
-			buildType: 'dev', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
+			buildType: 'uat', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
 			envTips: '', // 环境文字提示
 			theme: 'default', // 主题,default
 			isIphoneXup: false //是否iphonex以及以上的版本

+ 2 - 2
pages/common/printTag/printTag.vue

@@ -53,14 +53,14 @@
 				printInfo: null,
 				printNum: 1,
 				isParinting: false,
-				numType: 1
+				numType: 2
 			}
 		},
 		onLoad(options) {
 			const _this = this
 			_this.fromPage = options.page
 			_this.infoData = options.data ? JSON.parse(options.data) : {};
-			_this.printNum = _this.fromPage == 'smdy' ? _this.infoData.confirmQty : _this.infoData.qty
+			_this.printNum = _this.fromPage == 'smdy' ? _this.infoData.confirmQty : _this.infoData.maxQty
 			_this.printNum = _this.printNum||1
 			console.log(_this.infoData)
 			// 保持屏幕常亮

+ 1 - 15
pages/index/index.vue

@@ -46,7 +46,7 @@
 					 </div>
 					 <div class="title">货架订单</div>
 				 </div>
-				 <div class="graid-box-1" @click="toPage('/pages/vinAnalyse/shelfList')" v-if="$hasPermissions('M_shelfOrder_mobile')">
+				 <div class="graid-box-1" @click="toPage('/pages/vinAnalyse/shelfList')" v-if="$hasPermissions('M_vinStatistics_mobile')">
 					 <div class="icon">
 						<u-icon name="fenxi" custom-prefix="iscm-icon" size="65"></u-icon>
 					 </div>
@@ -56,31 +56,17 @@
 					 <div class="title">打印ABC</div>
 				 </div> -->
 			 </div>
-			 <!-- 货架订单 -->
-			 <!-- <view class="sales-list"  v-if="$hasPermissions('M_shelfOrder_mobile')">
-			 	<view class="title">
-			 		<text class="title-name" @click="$refs.salesList.refash()">
-			 			货架订单 
-			 			<u-icon name="reload" color="#2979ff" size="28"></u-icon>
-			 		</text>
-			 		<view class="title-all" @click="toPage('/pages/shelfOrder/shelfOrder')">查看全部<u-icon name="arrow-right" color="rgb(144, 147, 153)" size="28"></u-icon></view>
-			 	</view>
-			 </view> -->
 		 </view>
-		 <!-- 销售单列表 -->
-		 <!-- <listComponent ref="salesList" :height="listHeight"  v-if="$hasPermissions('M_shelfOrder_mobile')" /> -->
 	</view>
 </template>
 <script>
 	import iconItemsList from '@/components/icon-items-list/icon-items-list.vue';
-	import listComponent from '@/pages/shelfOrder/listComponent.vue'
 	import { shelfReplenishStateCount } from '@/api/shelfReplenish'
 	import { queryStockCheckWaitStateNum } from '@/api/stockCheck'
 	import { xprhStoreApplyQueryPage } from '@/api/approveStore'
 	export default {
 		components: {
 			iconItemsList,
-			listComponent
 		},
 		data() {
 			return {

+ 1 - 1
pages/latePlay/chooseProduct.vue

@@ -48,7 +48,7 @@
 									  最大库容:<text class="pnums">{{item.maxQty}}{{item.productEntity&&item.productEntity.unit}}</text>
 									   / 当前库存:<text class="pnums">{{item.qty}}{{item.productEntity&&item.productEntity.unit}}</text>
 									</view>
-									<view v-if="item.qty" class="print" @click.stop="print(item)">
+									<view class="print" @click.stop="print(item)">
 										<u-image :src="`/static/${$config('themePath')}/icon_printer@3x.png`" width="45" height="45"></u-image>
 									</view>
 								</view>

+ 1 - 1
pages/sales/index.vue

@@ -119,7 +119,7 @@
 			  "index": 3,
 			  "iconPath": "static/"+theme+"/tabbar/statistics.png",
 			  "selectedIconPath": "static/"+theme+"/tabbar/statistics-active.png",
-			  "visible": this.$hasPermissions('M_shelfManage_mobile')
+			  "visible": this.$hasPermissions('M_statistics_mobile')
 			})
 			uni.setTabBarItem({
 			  "index": 4,

+ 3 - 3
pages/statistics/index.vue

@@ -5,7 +5,7 @@
 			<u-icon name="arrow-right"></u-icon>
 		</div>
 		<div class="e-chart">
-			<div class="card-box">
+			<div class="card-box" v-if="$hasPermissions('M_salesStatistics_mobile')">
 				<div class="card-tits">
 					销售单
 				</div>
@@ -32,7 +32,7 @@
 					    />
 				</div>
 			</div>
-			<div class="card-box" v-if="allData&&allData.xprhFlag">
+			<div class="card-box" v-if="allData&&allData.xprhFlag&&$hasPermissions('M_shelfOrderTj_mobile')">
 				<div class="card-tits">
 					货架订单
 				</div>
@@ -59,7 +59,7 @@
 					    />
 				</div>
 			</div>
-			<div class="card-box" v-if="allData&&allData.xprhFlag">
+			<div class="card-box" v-if="allData&&allData.xprhFlag&&$hasPermissions('M_tempOrderTj_mobile')">
 				<div class="card-tits">
 					急送订单
 				</div>

+ 1 - 1
pages/stockCheck/startCheck.vue

@@ -208,7 +208,7 @@
 				stockCheckSn: null,
 				detail:null,
 				pageNo:1,
-				pageSize: 10,
+				pageSize: 20,
 				total: 0, // 列表总数
 				noDataText: '暂无产品',
 				status: 'loading',