Browse Source

bug 修复

lilei 2 years ago
parent
commit
ce09a9726b

+ 39 - 0
manifest.json

@@ -167,6 +167,45 @@
                     "pid" : "2683",
                     "pid" : "2683",
                     "parameters" : {}
                     "parameters" : {}
                 }
                 }
+            },
+            "JG-JCore" : {
+                "JPUSH_APPKEY_IOS" : "a8ad1620a88ff2493a2f8fda",
+                "JPUSH_CHANNEL_IOS" : "developer-default",
+                "JPUSH_APPKEY_ANDROID" : "a8ad1620a88ff2493a2f8fda",
+                "JPUSH_CHANNEL_ANDROID" : "developer-default",
+                "__plugin_info__" : {
+                    "name" : "JG-JCore",
+                    "description" : "极光推送JCore插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_APPKEY_IOS" : {
+                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JCore:APP_KEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道,不需要可填默认值developer-default",
+                            "key" : "JCore:CHANNEL",
+                            "value" : ""
+                        },
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_ANDROID" : {
+                            "des" : "[Android]用于统计分发渠道,不需要可填默认值developer-default",
+                            "key" : "JPUSH_CHANNEL",
+                            "value" : ""
+                        }
+                    }
+                }
             }
             }
         }
         }
     },
     },

+ 4 - 3
pages/common/partList.vue

@@ -12,7 +12,7 @@
 					</view>
 					</view>
 					<view class="flex align_center flex_1">
 					<view class="flex align_center flex_1">
 						<view class="pimgs" @click="checkChange({name:item.id})">
 						<view class="pimgs" @click="checkChange({name:item.id})">
-							<u-image :src="item.product&&item.product.productMsg?item.product.productMsg:`../../static/${theme}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
+							<u-image :src="item.product&&item.product.productMsg?item.product.productMsg:`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
 						</view>
 						</view>
 						<view class="pinfo">
 						<view class="pinfo">
 							<view class="pname" @click="checkChange({name:item.id})">
 							<view class="pname" @click="checkChange({name:item.id})">
@@ -26,7 +26,8 @@
 									<text class="pcode">{{item.product&&item.product.code?item.product.code:'--'}}</text>
 									<text class="pcode">{{item.product&&item.product.code?item.product.code:'--'}}</text>
 								</view>
 								</view>
 								<view v-if="pageType=='replenishmentSign'||pageType=='manualPrint'||pageType=='scanCodePrint'">
 								<view v-if="pageType=='replenishmentSign'||pageType=='manualPrint'||pageType=='scanCodePrint'">
-									实发数量:<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}{{item.product&&item.product.unit?item.product.unit:'--'}}</text>
+									{{item.billState == 'FINISH'?'签收数量':'实发数量'}}:
+									<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}{{item.product&&item.product.unit?item.product.unit:'--'}}</text>
 								</view>
 								</view>
 								<view v-if="pageType=='replenishmentOut'">
 								<view v-if="pageType=='replenishmentOut'">
 									x<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}</text>
 									x<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}</text>
@@ -126,6 +127,7 @@
 			list(newValue, oldValue) {
 			list(newValue, oldValue) {
 				const _this = this
 				const _this = this
 				this.totalNums = 0
 				this.totalNums = 0
+				this.pageType = this.fromPage
 				newValue.map(item => {
 				newValue.map(item => {
 					if(_this.pageType=='replenishmentSign'){  // 补货签收
 					if(_this.pageType=='replenishmentSign'){  // 补货签收
 						this.totalNums = this.totalNums + item.confirmQty
 						this.totalNums = this.totalNums + item.confirmQty
@@ -149,7 +151,6 @@
 					item.checked = false
 					item.checked = false
 				})
 				})
 				this.partList = JSON.parse(JSON.stringify(newValue))
 				this.partList = JSON.parse(JSON.stringify(newValue))
-				this.pageType = this.fromPage
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {

+ 7 - 2
pages/replenishmentManage/manualPrint.vue

@@ -88,8 +88,13 @@
 				shelfReplenishDetailList({ replenishBillSn: this.replenishBillSn }).then(res => {
 				shelfReplenishDetailList({ replenishBillSn: this.replenishBillSn }).then(res => {
 					if(res.status == 200 && res.data){
 					if(res.status == 200 && res.data){
 						res.data.map(item =>{
 						res.data.map(item =>{
-							item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
-							item.printQty = item.confirmQty ? Number(item.confirmQty) : 0
+							if(item.billState == 'FINISH'){
+								item.confirmQty = item.putQty ? Number(item.putQty) : 0
+								item.printQty = item.confirmQty ? Number(item.confirmQty) : 0
+							}else{
+								item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
+								item.printQty = item.confirmQty ? Number(item.confirmQty) : 0
+							}
 						})
 						})
 						this.partList = res.data || []
 						this.partList = res.data || []
 						this.$nextTick(()=>{
 						this.$nextTick(()=>{

+ 5 - 1
pages/replenishmentManage/scanCodePrint.vue

@@ -97,7 +97,11 @@
 				shelfReplenishDetailList({ replenishBillSn: this.replenishBillSn }).then(res => {
 				shelfReplenishDetailList({ replenishBillSn: this.replenishBillSn }).then(res => {
 					if(res.status == 200 && res.data){
 					if(res.status == 200 && res.data){
 						res.data.map(item =>{
 						res.data.map(item =>{
-							item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
+							if(item.billState == 'FINISH'){
+								item.confirmQty = item.putQty ? Number(item.putQty) : 0
+							}else{
+								item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
+							}
 						})
 						})
 						this.partList = res.data || []
 						this.partList = res.data || []
 					}else{
 					}else{

+ 1 - 1
pages/sales/chooseProduct.vue

@@ -45,7 +45,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 				<view v-if="listData && listData.length == 0">
 				<view v-if="listData && listData.length == 0">
-					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
+					<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
 				</view>
 				</view>
 				<view style="padding-bottom: 20upx;">
 				<view style="padding-bottom: 20upx;">
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />

+ 2 - 2
pages/sales/edit.vue

@@ -54,7 +54,7 @@
 					<view class="sales-list-item border-b flex align_center justify_between" v-for="(item, index) in listData" :key="item.id">
 					<view class="sales-list-item border-b flex align_center justify_between" v-for="(item, index) in listData" :key="item.id">
 						<view class="font_13 flex_1 flex justify_between">
 						<view class="font_13 flex_1 flex justify_between">
 							<view class="pimgs">
 							<view class="pimgs">
-								<u-image :src="item.productMainImage?item.productMainImage:`../../static/${theme}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
+								<u-image :src="item.productMainImage?item.productMainImage:`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
 								<view v-if="item.oosFlag == 1" class="sign" :style="{backgroundColor: $config('errorColor')}">急</view>
 								<view v-if="item.oosFlag == 1" class="sign" :style="{backgroundColor: $config('errorColor')}">急</view>
 								<view v-if="item.price < item.cost" class="sign" :style="{backgroundColor: $config('errorColor')}">亏</view>
 								<view v-if="item.price < item.cost" class="sign" :style="{backgroundColor: $config('errorColor')}">亏</view>
 								<view v-if="item.price == 0" class="sign" :style="{backgroundColor: $config('errorColor')}">赠</view>
 								<view v-if="item.price == 0" class="sign" :style="{backgroundColor: $config('errorColor')}">赠</view>
@@ -80,7 +80,7 @@
 						</view> -->
 						</view> -->
 					</view>
 					</view>
 					<view v-if="listData && listData.length == 0">
 					<view v-if="listData && listData.length == 0">
-						<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
+						<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
 					</view>
 					</view>
 					<view style="padding: 20upx;">
 					<view style="padding: 20upx;">
 						<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
 						<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />

+ 1 - 1
pages/sales/listComponent.vue

@@ -38,7 +38,7 @@
 					</view> -->
 					</view> -->
 				</view>
 				</view>
 				<view v-if="listData && listData.length == 0 && status!='loading'">
 				<view v-if="listData && listData.length == 0 && status!='loading'">
-					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
+					<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
 				</view>
 				</view>
 				<view style="padding-bottom: 20upx;">
 				<view style="padding-bottom: 20upx;">
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />

+ 1 - 1
pages/sales/selectedProductsModal.vue

@@ -23,7 +23,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 				<view v-if="listData && listData.length == 0">
 				<view v-if="listData && listData.length == 0">
-					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
+					<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
 				</view>
 				</view>
 				<view style="padding: 20upx;">
 				<view style="padding: 20upx;">
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />

+ 3 - 4
pages/shelfOrder/chooseShelf.vue

@@ -42,8 +42,8 @@
 		},
 		},
 		methods: {
 		methods: {
 			// 查询
 			// 查询
-			submit(data) {
-				this.$emit('refresh', data)
+			submit(data, shelfName) {
+				this.$emit('refresh', data, shelfName)
 				this.isShow = false
 				this.isShow = false
 			},
 			},
 		},
 		},
@@ -67,13 +67,12 @@
 		.search-popup {
 		.search-popup {
 			.form-title{
 			.form-title{
 				text-align: center;
 				text-align: center;
-				padding: 20upx;
+				padding: 30upx 20upx 0;
 			}
 			}
 			.form-content {
 			.form-content {
 				display: block;
 				display: block;
 				padding: 20upx;
 				padding: 20upx;
 				box-sizing: content-box;
 				box-sizing: content-box;
-				 
 			}
 			}
 			.uni-list-btns {
 			.uni-list-btns {
 				display: flex;
 				display: flex;

+ 17 - 7
pages/shelfOrder/listComponent.vue

@@ -6,7 +6,9 @@
 					<view class="list-item-tit flex align_center justify_between">
 					<view class="list-item-tit flex align_center justify_between">
 						<view class="u-line" :style="{background: $config('primaryColor')}"></view>
 						<view class="u-line" :style="{background: $config('primaryColor')}"></view>
 						<view class="buyer">{{item.shelfName||'--'}}</view>
 						<view class="buyer">{{item.shelfName||'--'}}</view>
-						<view>{{item.billStateDictValue}} <u-icon name="arrow-right" color="#969da3" size="28"></u-icon></view>
+						<view><text :style="{color:item.billState=='CLOSE'?'#ff5500':'#999'}">{{item.billStateDictValue}}</text> 
+						<!-- <u-icon name="arrow-right" color="#969da3" size="28"></u-icon> -->
+					</view>
 					</view>
 					</view>
 					<view class="detail-list">
 					<view class="detail-list">
 						<view class="flex align_center justify_between" v-for="de in item.orderBillDetailApiEntityList">
 						<view class="flex align_center justify_between" v-for="de in item.orderBillDetailApiEntityList">
@@ -27,16 +29,16 @@
 						<view class="list-item-line flex align_center justify_between">
 						<view class="list-item-line flex align_center justify_between">
 							<view class="color_6 font_13">{{item.createDate || '--'}}</view>
 							<view class="color_6 font_13">{{item.createDate || '--'}}</view>
 							<view>
 							<view>
-								合计:¥{{item.settleAmount}}
+								合计:<text class="amount">¥{{item.settleAmount}}</text>
 							</view>
 							</view>
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view v-if="listData && listData.length == 0 && status!='loading'">
 				<view v-if="listData && listData.length == 0 && status!='loading'">
-					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
+					<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
 				</view>
 				</view>
-				<view style="padding-bottom: 20upx;">
-					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
+				<view style="padding-bottom: 20upx;" v-if="listData.length">
+					<u-loadmore :status="status" />
 				</view>
 				</view>
 			</view>
 			</view>
 		</scroll-view>
 		</scroll-view>
@@ -67,7 +69,7 @@
 				pageSize: 10,
 				pageSize: 10,
 				totalNum: 0,
 				totalNum: 0,
 				status: 'loadmore',
 				status: 'loadmore',
-				noDataText: '暂无数据',
+				noDataText: '暂无货架订单',
 				toThousands,
 				toThousands,
 				dataInfo: null,
 				dataInfo: null,
 				scrollH: 300,
 				scrollH: 300,
@@ -118,12 +120,17 @@
 							this.listData = res.data.list || []
 							this.listData = res.data.list || []
 						}
 						}
 						this.totalNum = res.data.count || 0
 						this.totalNum = res.data.count || 0
+						if (this.listData.length == this.totalNum ) {
+							this.status = 'nomore'
+						} else {
+							this.status = 'loadmore'
+						}
 					} else {
 					} else {
 						this.listData = []
 						this.listData = []
 						this.totalNum = 0
 						this.totalNum = 0
 						this.noDataText = res.message
 						this.noDataText = res.message
+						this.status = 'nomore'
 					}
 					}
-					this.status = "loadmore"
 				})
 				})
 			},
 			},
 			// scroll-view到底部加载更多
 			// scroll-view到底部加载更多
@@ -149,6 +156,9 @@
 		.font_13{
 		.font_13{
 			font-size: 26upx;
 			font-size: 26upx;
 		}
 		}
+		.amount{
+			font-weight: bold;
+		}
 		.sales-list-con{
 		.sales-list-con{
 			.sales-list-main{
 			.sales-list-main{
 				.sales-list-item{
 				.sales-list-item{

+ 1 - 1
pages/shelfOrder/orderDetail.vue

@@ -48,7 +48,7 @@
 			class="panel-box flex justify_between" 
 			class="panel-box flex justify_between" 
 			v-for="item in detailList" :key="item.id">
 			v-for="item in detailList" :key="item.id">
 				<view class="pimgs">
 				<view class="pimgs">
-					<u-image :src="item.images||`../../static/${theme}/def_img@2x.png`" width="120" height="120" border-radius="10"></u-image>
+					<u-image :src="item.images||`../../static/${$config('themePath')}/def_img@2x.png`" width="120" height="120" border-radius="10"></u-image>
 				</view>
 				</view>
 				<view class="info-con flex_1">
 				<view class="info-con flex_1">
 					<view><text class="pcode">{{item.shelfPlaceCode}}</text>{{item.productCode || '--'}}</view>
 					<view><text class="pcode">{{item.shelfPlaceCode}}</text>{{item.productCode || '--'}}</view>

+ 10 - 5
pages/shelfOrder/search.vue

@@ -96,13 +96,18 @@
 			},
 			},
 			// 重置
 			// 重置
 			resetForm() {
 			resetForm() {
-				this.settleStyleName = ''
-				this.form.orderStartDate = ''
-				this.form.orderEndDate = ''
+				this.clearSettleStyle()
+				this.form = {
+					date: '',
+					orderStartDate: '',
+					orderEndDate: '',
+					productCode: '', //  产品编码
+					productName: '', //  产品名称
+					billState: undefined //  订单状态
+				}
 				this.$refs.uForm.resetFields()
 				this.$refs.uForm.resetFields()
-				this.$emit('refresh', null)
-				this.isShow = false
 				this.clearTime()
 				this.clearTime()
+				this.handleSearch()
 			},
 			},
 			//  清空订单状态
 			//  清空订单状态
 			clearSettleStyle(){
 			clearSettleStyle(){

+ 6 - 1
pages/shelfOrder/shelfList.vue

@@ -107,7 +107,12 @@
 				return list
 				return list
 			},
 			},
 			submit(){
 			submit(){
-				this.$emit("ok", this.getChecked())
+				const ret = this.getChecked()
+				let shelfName = ''
+				if(ret.length == 1){
+					shelfName = this.shelfList.find(item => item.shelfSn == ret[0]).shelfName
+				}
+				this.$emit("ok", ret, shelfName)
 			},
 			},
 			setChecked(){
 			setChecked(){
 				this.shelfList.map(item => {
 				this.shelfList.map(item => {

+ 9 - 3
pages/shelfOrder/shelfOrder.vue

@@ -2,7 +2,9 @@
 	<view class="sales-list-wrap">
 	<view class="sales-list-wrap">
 		<view class="head-info" id="tjCons">
 		<view class="head-info" id="tjCons">
 			<view class="search-top-box" @click="openShlefModal=true">
 			<view class="search-top-box" @click="openShlefModal=true">
-				<text>{{searchForm.shelfSnList.length?('已选'+searchForm.shelfSnList.length+'个货架'):'全部货架'}}</text>
+				<text v-if="searchForm.shelfSnList.length==1">{{curShelfName}}</text>
+				<text v-if="searchForm.shelfSnList.length>1">{{'已选'+searchForm.shelfSnList.length+'个货架'}}</text>
+				<text v-if="searchForm.shelfSnList.length==0">全部货架</text>
 				<u-icon name="arrow-right"></u-icon>
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 			</view>
 			<view class="countData">
 			<view class="countData">
@@ -46,10 +48,12 @@
 				openModal: false,
 				openModal: false,
 				openShlefModal: false,
 				openShlefModal: false,
 				countData: null,
 				countData: null,
+				curShelfName: ''
 			}
 			}
 		},
 		},
 		onNavigationBarButtonTap(e){  // 标题栏 按钮操作
 		onNavigationBarButtonTap(e){  // 标题栏 按钮操作
 			this.openModal = true
 			this.openModal = true
+			this.openShlefModal = false
 		},
 		},
 		onReady() {
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			const query = uni.createSelectorQuery().in(this);
@@ -81,16 +85,18 @@
 			// 获取查询参数 刷新列表
 			// 获取查询参数 刷新列表
 			refresh(params){
 			refresh(params){
 				const _this = this
 				const _this = this
-				this.searchParams = Object.assign(this.searchForm,params)
+				this.searchParams = {shelfSnList:this.searchParams.shelfSnList,...params}
 				this.searchParams.orderStartDate = params&&params.orderStartDate ? (params.orderStartDate + ' 00:00:00') : ''
 				this.searchParams.orderStartDate = params&&params.orderStartDate ? (params.orderStartDate + ' 00:00:00') : ''
 				this.searchParams.orderEndDate = params&&params.orderEndDate ? (params.orderEndDate + ' 23:59:59') : ''
 				this.searchParams.orderEndDate = params&&params.orderEndDate ? (params.orderEndDate + ' 23:59:59') : ''
+				console.log(this.searchParams)
 				this.$nextTick(function(){
 				this.$nextTick(function(){
 					_this.$refs.salesList.refash()
 					_this.$refs.salesList.refash()
 					_this.getCount()
 					_this.getCount()
 				})
 				})
 			},
 			},
-			refreshList(data){
+			refreshList(data, shelfName){
 				this.searchForm.shelfSnList = data
 				this.searchForm.shelfSnList = data
+				this.curShelfName = shelfName
 				this.refresh(this.searchForm)
 				this.refresh(this.searchForm)
 			},
 			},
 			// 状态  change
 			// 状态  change

+ 1 - 1
pages/stock/detaiList.vue

@@ -78,7 +78,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 				<view v-if="listData && listData.length == 0">
 				<view v-if="listData && listData.length == 0">
-					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
+					<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
 				</view>
 				</view>
 			</view>
 			</view>
 		</scroll-view>
 		</scroll-view>

+ 1 - 1
pages/stockCheck/shelfList.vue

@@ -111,7 +111,7 @@
 				_this.status = 'loading'
 				_this.status = 'loading'
 				selectShelfStockCheck().then(res => {
 				selectShelfStockCheck().then(res => {
 					uni.hideLoading()
 					uni.hideLoading()
-					if(res.data&&res.data.length){
+					if(res.status==200){
 						let list = res.data.filter(item => item.shelfName.indexOf(this.shelfName)>=0)
 						let list = res.data.filter(item => item.shelfName.indexOf(this.shelfName)>=0)
 						if (list && list.length){
 						if (list && list.length){
 							_this.status = 'nomore'
 							_this.status = 'nomore'