Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app

api/myTicket/index.js

@@ -137,11 +137,11 @@ export async function qualityTodoByPda(params) {
 
 //流程待办统计
 export async function todoNuber(params) {
-		const data = await postJ(Vue.prototype.apiUrl + `/bpm/task/todo-page`, params)
-		if (data.code == 0) {
-			return data.data
-		}
-		return Promise.reject(new Error(data.message))
+	const data = await postJ(Vue.prototype.apiUrl + `/bpm/task/todo-page`, params)
+	if (data.code == 0) {
+		return data.data
+	}
+	return Promise.reject(new Error(data.message))
 }
 // 我的工单设备状态统计
 export async function devicestatistics(params) {
@@ -171,4 +171,20 @@ export async function getRuleList(params) {
 		return data.data.list
 	}
 	return Promise.reject(new Error(data.message))
+}
+
+export async function workPage(params) {
+	const data = await get(Vue.prototype.apiUrl + `/eam/workordermaintenance/page`, params)
+	if (data.code == 0) {
+		return data.data
+	}
+	return Promise.reject(new Error(data.message))
+}
+// 分页
+export async function getRepairWorkOrderList(params) {
+	const data = await get(Vue.prototype.apiUrl + `/eam/workorder/getWorkOrderList`, params)
+	if (data.code == 0) {
+		return data.data
+	}
+	return Promise.reject(new Error(data.message))
 }

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.98",
+    "versionName" : "V1.0.3.99",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {

pages/maintenance/order/order.vue

@@ -21,13 +21,12 @@
 						<view @click="changeChartsTab(index)" class="badge-c">
 							{{item.label}}
 							<u-badge max="99" :value="item.number" absolute></u-badge>
-							<!-- <text v-if="item.number > 0" class="title-red">{{ item.number }}</text> -->
+
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-
 		<OrderTask v-for="(item, index) in tabList" :key="index" v-show="index === pickTabIndex" :list="item.list"
 			:type="tabList.value"></OrderTask>
 
@@ -43,7 +42,8 @@
 	} from '@/utils/utils.js'
 	import {
 		getWorkOrderList,
-		getRuleList
+		getRuleList,
+		workPage
 	} from '@/api/myTicket'
 	import OrderTask from './OrderTask.vue'
 	import {
@@ -54,6 +54,9 @@
 	export default {
 		components: {
 			OrderTask
+		},
+		computed: {
+
 		},
 		data() {
 			return {
@@ -78,8 +81,16 @@
 						label: '已完成',
 						list: [],
 						number: 0
+					},
+					{
+						value: 4,
+						label: '全部',
+						list: [],
+						isNone: !this.$isAuthorities('eam:maintenance:listAll'),
+						number: 0
 					}
-				],
+				].filter(item => !item.isNone),
+
 				pickTabIndex: 0,
 				qrContent: null,
 				barType: 0,
@@ -197,16 +208,20 @@
 					size: this.size,
 					...this.searchForm
 				}
-				if (!this.showTab) {
+				if (!this.showTab || this.pickTabIndex == 3) {
 					delete params.orderStatus
 				}
-				getWorkOrderList(params)
+				let api = this.pickTabIndex == 3 ? workPage : getWorkOrderList
+				api(params)
 					.then(res => {
+
 						if (this.page == 1) {
-							this.tabList[this.pickTabIndex].list = res.list
+							this.$set(this.tabList[this.pickTabIndex], 'list', res.list)
+							// this.tabList[this.pickTabIndex].list = res.list
 						} else {
 							this.tabList[this.pickTabIndex].list.push(...res.list);
 						}
+						console.log(this.tabList[this.pickTabIndex])
 						this.page += 1
 						this.isEnd = this.tabList[this.pickTabIndex].list.length >= res.count
 						uni.hideLoading()

pages/maintenanceWorkorder/order/order.vue

@@ -44,7 +44,8 @@
 	import {
 		getWorkOrderList,
 		getAssistList,
-		getRuleList
+		getRuleList,
+		getRepairWorkOrderList
 	} from '@/api/myTicket'
 	import OrderTask from './OrderTask.vue'
 	import {
@@ -91,6 +92,13 @@
 						label: '协助工单',
 						list: [],
 						number: 0
+					},
+					{
+						value: 6,
+						label: '全部',
+						list: [],
+						isNone: !this.$isAuthorities('eam:maintenanceWorkorder:listAll'),
+						number: 0
 					}
 				],
 				pickTabIndex: 0,
@@ -220,10 +228,11 @@
 					...this.searchForm
 				}
 
-				if (!this.showTab) {
+				if (!this.showTab || this.pickTabIndex == 5) {
 					delete params.orderStatus
 				}
-				getWorkOrderList(params)
+				let api = this.pickTabIndex == 5 ? getRepairWorkOrderList : getWorkOrderList
+				getRepairWorkOrderList(params)
 					.then(res => {
 						if (this.page === 1) {
 							this.tabList[this.pickTabIndex].list = res.list
@@ -333,8 +342,8 @@
 			.tab_item {
 				height: 68rpx;
 				line-height: 68rpx;
-				padding: 0 20rpx;
-				font-size: 32rpx;
+				padding: 0 10rpx;
+				font-size: 30rpx;
 				// color: #979C9E;
 
 			}

pages/tour_tally/order/order.vue

@@ -44,7 +44,8 @@
 	} from '@/utils/utils.js'
 	import {
 		getWorkOrderList,
-		getRuleList
+		getRuleList,
+		workPage
 	} from '@/api/myTicket'
 	import OrderTask from './OrderTask.vue'
 	import {
@@ -79,6 +80,13 @@
 						label: '已完成',
 						list: [],
 						number: 0
+					},
+					{
+						value: 4,
+						label: '全部',
+						list: [],
+						isNone: !this.$isAuthorities('eam:tour_tally:listAll'),
+						number: 0
 					}
 				],
 				pickTabIndex: 0,
@@ -200,13 +208,13 @@
 
 				console.log(this.showTab);
 
-				if (!this.showTab) {
+				if (!this.showTab || this.pickTabIndex == 3) {
 					delete params.orderStatus
 				}
-
+				let api = this.pickTabIndex == 3 ? workPage : getWorkOrderList
 
 				// return
-				getWorkOrderList(params)
+				api(params)
 					.then(res => {
 						// this.tabList[this.pickTabIndex].list = res.list
 						// isEnd = this.tabList[this.pickTabIndex].list >= res.count