wsx hai 10 meses
pai
achega
ad4dbd6d39

+ 3 - 3
.hbuilderx/launch.json

@@ -19,17 +19,17 @@
             "type" : "uniCloud"
         },
         {
-            "openVueDevtools" : false,
+            "openVueDevtools" : true,
             "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {
-            "openVueDevtools" : false,
+            "openVueDevtools" : true,
             "playground" : "custom",
             "type" : "uni-app:app-ios"
         },
         {
-            "openVueDevtools" : true,
+            "openVueDevtools" : false,
             "type" : "uni-app:h5"
         }
     ]

+ 1 - 1
api/wt/index.js

@@ -406,7 +406,7 @@ export async function getBpmCustomFormList(params) {
   };
 //动态表单 我发起的申请
 export async function getProcessInstancePage(params) {
-	const res = await get(Vue.prototype.apiUrl + '/bpm/process-instance/my-page', params );
+	const res = await postJ(Vue.prototype.apiUrl + '/bpm/process-instance/my-page', params );
 	if (res.code == 0) {
 	  return res.data;
 	}

+ 2 - 0
pages/home/components/navigation.vue

@@ -88,6 +88,8 @@
 				// this.workList[0].badge = res.count
 				const messageCount = await getUnreadNotifyMessageCountAPI()
 				this.workList[2].badge = Number(messageCount)
+				
+				
 			}
 		}
 	}

+ 14 - 2
pages/home/home.vue

@@ -200,6 +200,9 @@
 			ScanCode
 		},
 		onShow() {
+
+
+
 			this.init()
 			let _this = this
 			uni.$off('scancodedate') // 每次进来先 移除全局自定义事件监听器
@@ -207,12 +210,12 @@
 				console.log(data, '-----scancodedate')
 				_this.cbScancodedate(data)
 			})
-			this.getStatistics()
+			// this.getStatistics()
 			// this.Scancodedate()
 		},
 		onLoad() {
 			this.getHomeData()
-			this.getStatistics()
+			// this.getStatistics()
 		},
 		onUnload() {
 			uni.$off('scancodedate')
@@ -270,8 +273,17 @@
 				}
 			})
 		},
+		onHide() {
+			clearTimeout(this.timer);
+		},
+		onUnload() {
+			clearTimeout(this.timer);
+		},
+
+
 		methods: {
 			init() {
+				this.getStatistics()
 				this.$refs.navigationRef && this.$refs.navigationRef.getCount()
 				this.$refs.equipmentRef && this.$refs.equipmentRef.getData()
 				this.$refs.mochaRef && this.$refs.mochaRef.getData()

+ 20 - 243
pages/index/index.vue

@@ -136,63 +136,11 @@
 		},
 		data() {
 			return {
+				timer: null,
 				src1: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				workOrder: {}, // 工单统计数据
 				//生产类
-				productionList: [
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "生产工单",
-					// 	link_url: "/pages/pda/workOrder/index/index",
-					// },
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "领料",
-					// 	link_url: "/pages/pda/picking/index/index",
-					// },
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "投料",
-					// 	link_url: "/pages/pda/feeding/index/index",
-					// },
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "退料",
-					// 	link_url: "/pages/pda/material_return/index/index",
-					// },
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "不合格品处置",
-					// 	link_url: "/pages/pda/nonconforming/index/index",
-					// },
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "副产品回收",
-					// 	link_url: "/pages/pda/by_product_recovery/index/index",
-					// },
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "工单交接",
-					// 	link_url: "/pages/pda/work_order_handover/index/index",
-					// },
-					// {
-					// 	class: "iconfont icon-gongdanguanli",
-					// 	title: "工单详情",
-					// 	link_url: "/pages/pda/work_order_details/index/index",
-					// },
-					// {
-					//   class: "iconfont icon-gongdanguanli",
-					//   title: "生产报工",
-					//   link_url: "/pages/production/report/index",
-					//   "num": 1
-					// },
-					// {
-					//   class: "iconfont icon-gongdanguanli",
-					//   title: "生产工单",
-					//   link_url: "/pages/production/order/index",
-					//   // "num": 1
-					// x},
-				],
+				productionList: [],
 				// executeList: [
 				//   {
 				//     class: "iconfont icon-gongdanguanli",
@@ -228,196 +176,18 @@
 				//仓储管理
 
 				warehousingList: [
-					// {
-					// 	class: 'iconfont icon-shebeikucun',
-					// 	title: '库存管理',
-					// 	link_url: '/pages/warehouse/inventory/index'
-					// 	//"num": 1
-					// },
-					// {
-					// 	class: 'iconfont icon-wuliaoruku',
-					// 	title: '入库管理',
-					// 	link_url: '/pages/warehouse/enterHouse/index'
-					// 	//"num": 34
-					// },
-					// {
-					// 	class: 'iconfont icon-shebeichuku',
-					// 	title: '出库管理',
-					// 	link_url: '/pages/warehouse/outHouse/index'
-					// 	// num: 34
-					// },
-					// {
-					// 	class: 'iconfont icon-shebeiruku',
-					// 	title: '库存调拨',
-					// 	link_url: '/pages/warehouse/inventoryAllocation/index'
-					// 	//"num": 133
-					// },
-					// {
-					// 	class: 'iconfont icon-wuliaoruku',
-					// 	title: '物料入库',
-					// 	link_url: '/pages/warehouse/material/index'
-					// 	//"num": 34
-					// },
-					// {
-					// 	class: 'iconfont icon-shebeiruku',
-					// 	title: '设备入库',
-					// 	link_url: '/pages/warehouse/equipment/index'
-					// 	//"num": 23
-					// },
-					// {
-					// 	class: 'iconfont icon-shebeichuku',
-					// 	title: '设备出库',
-					// 	link_url: '/pages/warehouse/outbound/index'
-					// 	//"num": 23
-					// },
-					// {
-					// 	class: 'iconfont icon-pandiangongdan',
-					// 	title: '盘点工单',
-					// 	link_url: '/pages/warehouse/workOrder/index'
-					// 	// num: 133
-					// },
-					// {
-					// 	class: 'iconfont icon-shebeikucuntongji',
-					// 	title: '报损报溢',
-					// 	link_url: '/pages/warehouse/reportLoss/index'
-					// 	//"num": 133
-					// },
-					// {
-					// 	class: 'iconfont icon-gongdanguanli',
-					// 	title: '拣货管理',
-					// 	link_url: '/pages/warehouse/picking/index'
-					// 	//"num": 133
-					// }
-					// {
-					// 	class: 'iconfont icon-shebeikucuntongji',
-					// 	title: '设备库存统计',
-					// 	link_url: '/pages/warehouse/inventory/stat'
-					// 	//"num": 1
-					// }
+
 				],
 
 				//运维类
 				operationsList: [
-					// {
-					// 	name: '我的工单',
-					// 	type: '',
-					// 	workOrderType: 2,
-					// 	url: `/pages/home/myTicket/myTicket`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// },
-					// {
-					// 	name: '保养工单',
-					// 	type: 'maintenance',
-					// 	workOrderType: 2,
-					// 	url: `/pages/maintenance/order/order`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// },
-					// {
-					// 	name: '巡点检工单',
-					// 	type: 'patrol',
-					// 	workOrderType: 1,
-					// 	url: `/pages/tour_tally/order/order`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// },
-					// {
-					// 	name: '量具送检工单',
-					// 	type: 'quantity',
-					// 	workOrderType: 5,
-					// 	url: `/pages/home/myTicket/myTicket?index=2`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// },
-					// {
-					// 	name: '维修工单',
-					// 	type: 'repaire',
-					// 	workOrderType: 3,
-					// 	url: `/pages/maintenanceWorkorder/order/order`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// },
-					// {
-					// 	name: '报修',
-					// 	type: 'repairReport',
-					// 	workOrderType: 4,
-					// 	url: `/pages/repair/repair/index`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// },
-					// {
-					// 	name: '备品备件申请单',
-					// 	type: 'sparepart',
-					// 	workOrderType: 4,
-					// 	url: `/pages/maintenanceWorkorder/sparepart/index`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// }
-					/*	{
-							class: "iconfont icon-xundianjian",
-							title: "巡点检",
-							link_url: "/pages/tour_tally/order/order",
-							//"num": 34
-						},
-						{
-							class: "iconfont icon-a-baoyangputong",
-							title: "保养工单",
-							link_url: "/pages/maintenance/order/order",
-							//"num": 23
-						},
-						{
-							class: "iconfont icon-weixiugongdan",
-							title: "维修工单",
-							link_url: "/pages/maintain_service/order/order",
-							//"num": 23
-						},
-						/*        {
-						  class: 'iconfont icon-beijian',
-						  title: '备品备件',
-						  link_url: '/pages/sparepart/order/order',
-						  //"num": 1
-						},
-						{
-							class: "iconfont icon-baoxiu",
-							title: "报修单",
-							link_url: "/pages/repair/order/order",
-							//"num": 1
-						},*/
-					/* {
-		  class: 'iconfont icon-wuliaoruku',
-		  title: '入库登记',
-		  link_url: '/pages/put_storage/order/index',
-		  //"num": 34
-		},
-		{
-		  class: 'iconfont icon-shebeichuku',
-		  title: '出库登记',
-		  link_url: '/pages/outbound/order/index',
-		  //"num": 34
-		}, */
+
 				],
 				dispatchList: [
-					// {
-					// 	name: '任务工单',
-					// 	url: `/pages/dispatchManage/taskWork/index`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// },
-					// {
-					// 	name: '发货确认单',
-					// 	url: `/pages/invoiceConfirm/index`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// }
+
 				],
 				internalManagementList: [
-					// {
-					// 	name: '申请',
-					// 	url: `/pages/internalManagement/apply/index`,
-					// 	icon: 'icon-gongdanguanli',
-					// 	badge: 0
-					// }
+
 				],
 				treeList: [],
 				saleManageList: [],
@@ -428,24 +198,31 @@
 		created() {
 			this.getTree()
 		},
-		// onShow() {
-		// 	this.getStatistics()
-		// },
+		onShow() {
+			this.getStatistics()
+		},
+		onHide() {
+			clearTimeout(this.timer);
+		},
+		onUnload() {
+			clearTimeout(this.timer);
+		},
 		methods: {
 			getStatistics() {
 				// 获取工单统计数
-				statistics().then(res => {
+				statistics().then((res) => {
 					this.workOrder = res
 					console.log('this.operationsList---', this.operationsList)
 					console.log('res', res)
 					this.operationsList.forEach(item => {
 						if (item.name == '保养工单') item.badge = res.maintenanceNum
 						if (item.name == '巡点检工单') item.badge = res.patrolInspection
-						// if (item.name == '量具送检工单') item.badge = res.quantityNum
 						if (item.name == '维修工单') item.badge = res.repairsNum
-						// if(item.badge)
 					})
-					console.log(this.operationsList)
+				}).finally(() => {
+					this.timer = setTimeout(() => {
+						this.getStatistics()
+					}, 12000)
 				})
 			},
 			getTree() {

+ 1 - 1
pages/internalManagement/apply/index.vue

@@ -107,7 +107,7 @@
 	let [page, size, isEnd] = [1, 10, true]
 	let [donePage, doneSize, doneIsEnd] = [1, 10, true]
 	import {
-		getBpmCustomFormList
+		getBpmCustomFormList,
 	} from '@/api/wt/index.js'
 	import {
 		getByCode

+ 16 - 19
pages/maintenanceWorkorder/order/order.vue

@@ -81,10 +81,7 @@
 			}
 		},
 		onShow() {
-		
-			
 			this.changeChartsTab(this.pickTabIndex)
-			
 			// this.getFirstList()
 			this.getStatus()
 		},
@@ -118,22 +115,22 @@
 				}).then(res => {
 					this.tabList[1].number = res.count
 				})
-				getWorkOrderList({
-					orderStatus: [3],
-					type: 3,
-					pageNum: 1,
-					size: 1
-				}).then(res => {
-					// this.tabList[2].number = res.count
-				})
-				getWorkOrderList({
-					orderStatus: [4],
-					type: 3,
-					pageNum: 1,
-					size: 1
-				}).then(res => {
-					// this.tabList[3].number = res.count
-				})
+				// getWorkOrderList({
+				// 	orderStatus: [3],
+				// 	type: 3,
+				// 	pageNum: 1,
+				// 	size: 1
+				// }).then(res => {
+				// 	// this.tabList[2].number = res.count
+				// })
+				// getWorkOrderList({
+				// 	orderStatus: [4],
+				// 	type: 3,
+				// 	pageNum: 1,
+				// 	size: 1
+				// }).then(res => {
+				// 	// this.tabList[3].number = res.count
+				// })
 				// /eam/PdaWorkOrder/assistList
 			},
 			getCount() {

+ 3 - 2
pages/salesServiceManagement/workOrder/components/forWork/transfer.vue

@@ -63,7 +63,7 @@
 		},
 		data() {
 			return {
-				selectedData: ['1'],
+				selectedData: [''],
 				classificationList: [],
 				searchVal: '',
 				isEnd: false,
@@ -168,7 +168,8 @@
 					parentIdField: 'parentId'
 				});
 				this.classificationList = treeList;
-				this.confirm(treeList[0].id);
+				this.confirm('');
+				// this.confirm(treeList[0].id);
 			},
 			async save() {
 				if (!this.checkData.id) {