lilei 3 gadi atpakaļ
vecāks
revīzija
e640d617fb

+ 3 - 3
pages/digitalShelf/settlementManage/settlementAyDetail.vue

@@ -49,7 +49,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-	import { waitSettleForMonth } from '@/api/shelf.js'
+	import { waitSettleForMonth, findStoreShelfSettleRule } from '@/api/shelf.js'
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
@@ -88,14 +88,12 @@
 			this.getDetail()
 			this.getDetail()
 			this.month = opts.month
 			this.month = opts.month
 			this.mothTitle = (opts.month!=-1?(opts.month+'月'):'全部') + '待结算'
 			this.mothTitle = (opts.month!=-1?(opts.month+'月'):'全部') + '待结算'
-			this.waitSettleAmount = this.info.waitSettleAmount
 			this.monthList = [
 			this.monthList = [
 				{
 				{
 					label: '全部',
 					label: '全部',
 					value: -1
 					value: -1
 				}
 				}
 			]
 			]
-			this.getAyDjsList()
 		},
 		},
 		methods: {
 		methods: {
 			// 查询详情
 			// 查询详情
@@ -104,6 +102,8 @@
 					console.log(res)
 					console.log(res)
 					if(res.status == 200){
 					if(res.status == 200){
 						this.info = res.data
 						this.info = res.data
+						this.waitSettleAmount = this.info.waitSettleAmount
+						this.getAyDjsList()
 					}
 					}
 				})
 				})
 			},
 			},

+ 2 - 2
pages/digitalShelf/settlementManage/settlementManage.vue

@@ -38,14 +38,14 @@
 					<view>{{item.month}}月</view>
 					<view>{{item.month}}月</view>
 					<view>
 					<view>
 						<text>¥{{item.settleAmount}}</text>
 						<text>¥{{item.settleAmount}}</text>
-						<uni-font-icons color="#999" size="12" type="icon-xiangyoujiantou"></uni-font-icons>
+						<uniIcons color="#999" size="20" type="arrowright"></uniIcons>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view style="padding-top: 10%;border:0" v-if="ayJsList.length==0 && status!='loading'">
 				<view style="padding-top: 10%;border:0" v-if="ayJsList.length==0 && status!='loading'">
 					<u-empty :src="`/static/nodata.png`" icon-size="120" text="暂无数据" img-width="120" mode="list"></u-empty>
 					<u-empty :src="`/static/nodata.png`" icon-size="120" text="暂无数据" img-width="120" mode="list"></u-empty>
 				</view>
 				</view>
 				<view style="padding: 20upx;border:0" v-if="(total>=ayJsList.length&&ayJsList.length)||status=='loading'">
 				<view style="padding: 20upx;border:0" v-if="(total>=ayJsList.length&&ayJsList.length)||status=='loading'">
-					<u-loadmore load-text="正在加载..." :status="status" />
+					<u-loadmore :status="status" />
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>