app 采购单

ghsApp/src/admin/clear/info.vue

@@ -81,7 +81,7 @@
 
 				</div>
 			</view>
-			<view class="content-box price-detail" v-if="detailInfo.remark.length > 0">
+			<view class="content-box price-detail" v-if="!$util.isEmpty(detailInfo.remark)">
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">备注</div>

ghsApp/src/admin/home/me.vue

@@ -97,10 +97,10 @@
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true">
               <div class="tui-title">快递设置</div>
             </tui-list-cell>
-            <!-- #ifdef APP-PLUS -->
             <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true">
               <div class="tui-title">退出</div>
             </tui-list-cell>
+            <!-- #ifdef APP-PLUS -->
             <!-- #endif -->
           </view>
         </view>
@@ -175,7 +175,8 @@ export default {
             if (res.confirm) {
               uni.clearStorage()
               that.$store.commit("setLoginInfo", {})
-              that.$util.pageTo({url: "/admin/home/workbench",type: 3})              
+              plus.runtime.restart()
+              //that.$util.pageTo({url: "/admin/home/workbench",type: 3})
             }
           }
         })

ghsApp/src/pagesPurchase/details.vue

@@ -330,7 +330,7 @@ export default {
 				const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.getLoginInfo.cgModel});
 				uni.setStorageSync('flowersItemInfo', itemInfo);
 				
-				this.removeMemoryDirect()
+				this.removeMemoryDirect(this.form.ghsId)
 
 				uni.reLaunch({url:'/pagesPurchase/components/pageSuccess?orderSn='+res.data.orderSn})
 			} catch (error) {}

ghsApp/src/pagesPurchase/order.vue

@@ -69,6 +69,15 @@ export default {
 			uni.stopPullDownRefresh();
 		});
 	},
+	onReachBottom() {
+		if (!this.list.finished) {
+		this._list().then((res) => {
+			uni.stopPullDownRefresh();
+		});
+		} else {
+		uni.stopPullDownRefresh();
+		}
+	},
 	methods: {
 		async init() {
 			this._list();
@@ -77,23 +86,17 @@ export default {
 			let options = {
 				page: this.list.page,
 				pageSize: this.list.pageSize,
-				status: this.tabs[this.tabIndex].key
+				status: this.tabs[this.tabIndex].key,
+				ghsId:this.option.ghsId
 			};
 			return getPurchaseListApi(options)
 				.then(res => {
-					const {
-						data: { allNum, unPayNum, unSendNum, sendingNum, finishNum }
-					} = res;
-
+					const { data: { allNum, unPayNum, unSendNum, sendingNum, finishNum } } = res
 					this.completes(res);
 					for (let index = 0; index < this.tabs.length; index++) {
 						const element = this.tabs[index];
 						if (element.key == "") {
-							// this.tabs[index].value = allNum;
-							this.$set(this.tabs, index, {
-								...this.tabs[index],
-								value: allNum
-							});
+							this.$set(this.tabs, index, { ...this.tabs[index], value: allNum })
 						} else if (element.key == PURCHASE_ORDER_STATUS.CONFIRM) {
 							this.tabs[index].value = unPayNum;
 						} else if (element.key == PURCHASE_ORDER_STATUS.UNDIS) {

ghsApp/src/pagesPurchase/supplier.vue

@@ -27,7 +27,7 @@
               <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list',query: {ghsId: item.id}})">
                 结账记录
               </view>
-              <view class="btn_entrance" @click.stop="pageTo({url:'/pagesPurchase/order'})">采购记录</view>
+              <view class="btn_entrance" @click.stop="pageTo({url:'/pagesPurchase/order',query:{ghsId:item.id}})">采购记录</view>
               <view class="cg-button">采购</view>
             </view>
           </view>