~jhz/STUWMS.git

			@@ -88,6 +88,12 @@
			<view class="detail" v-if="item.计划结束时间点">
			<text>计划结束时间点：</text>{{item.计划结束时间点.substr(0,10)}}
			</view>
			<view class="detail" v-if="false">
			<text>保养计划单主ID：</text>{{item.HPlanHInterID}}
			</view>
			<view class="detail" v-if="false">
			<text>保养计划单子ID：</text>{{item.HPlanHEntryID}}
			</view>
			</view>
			<view class="card-detail" v-if="showDetail == item.hmainid">
			<view class="detail" v-if="item.制单人">
			@@ -142,7 +148,7 @@
			</view>

			<view class="op" v-if="operations == item.hmainid">
			<button class="op1" v-if="activeTab == 0" size="mini" plain
			<button class="op1" v-if="activeTab == 0 \|\| 3" size="mini" plain
			@tap.stop="pushBill(0,item)">下推保养单</button>
			<button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
			</view>
			@@ -193,6 +199,18 @@
			{
			label: '近日已保养',
			type: 1,
			count: 0,
			listData: [], // 添加这个
			showData: [],
			pageMeta: { // 添加这个
			curPage: 1,
			size: 20,
			total: 0,
			}
			},
			{
			label: '逾期未保养',
			type: 3,
			count: 0,
			listData: [], // 添加这个
			showData: [],
			@@ -271,7 +289,7 @@
			},
			methods: {
			pushBill(currTab, item) {
			let Query = `?operationType=4&HBarCode=${item['器具编号']}`
			let Query = `?operationType=4&HBarCode=${item['器具编号']}&HPlanHInterID=${item['HPlanHInterID']}&HPlanHEntryID=${item['HPlanHEntryID']}`
			if (currTab == 0) {
			uni.navigateTo({
			url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill' + Query
			@@ -400,13 +418,24 @@

			if (data && data.h_p_Sc_MouldMaintainTaskReport_APP2) {
			// 更新待验收页签
			this.tabs[2].listData = data.h_p_Sc_MouldMaintainTaskReport_APP2
			this.tabs[3].listData = data.h_p_Sc_MouldMaintainTaskReport_APP2
			this.tabs[3].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice(
			(this.tabs[3].pageMeta.curPage-1)*this.tabs[3].pageMeta.size,
			(this.tabs[3].pageMeta.curPage)*this.tabs[3].pageMeta.size
			)
			this.tabs[3].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
			this.tabs[3].count = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
			}

			if (data && data.h_p_Sc_MouldMaintainTaskReport_APP3) {
			// 更新待验收页签
			this.tabs[2].listData = data.h_p_Sc_MouldMaintainTaskReport_APP3
			this.tabs[2].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice(
			(this.tabs[2].pageMeta.curPage-1)*this.tabs[2].pageMeta.size,
			(this.tabs[2].pageMeta.curPage)*this.tabs[2].pageMeta.size
			)
			this.tabs[2].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
			this.tabs[2].count = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
			this.tabs[2].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP3.length
			this.tabs[2].count = data.h_p_Sc_MouldMaintainTaskReport_APP3.length
			}