维修作业

common/style/layout.css

@@ -57,7 +57,7 @@ uni-button:after {
 .icon_scan {
 	width: 42rpx;
 	height: 48rpx;
-	font-size: 40rpx;
+	font-size: 36rpx;
 	line-height: 48rpx;
 	color: #323232;
 	text-align: center;
@@ -73,7 +73,7 @@ uni-button:after {
 .icon_del {
 	width: 46rpx;
 	height: 48rpx;
-	font-size: 46rpx;
+	font-size: 36rpx;
 	line-height: 48rpx;
 	color: #323232;
 	text-align: center;

components/SearchBox.vue

@@ -5,6 +5,7 @@
 		class="filter_input search_input" 
 		:value="value"
 		:focus="focusState"
+		@focus="handleFocus($event)"
 		@blur="handleBlur($event)"
 		@input="handleChange($event)">
 		<view class="buttons_wraper">
@@ -54,6 +55,9 @@
 					this.focusState = false
 				}
 			},
+			handleFocus () {
+				this.focusState = true	
+			},
 			handleBlur () {
 				this.focusState = false	
 			},

pages/device/RepairFill.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar :inner2="true" @goIn="goIn" title="维修结果填报"></nav-bar>
+		<nav-bar :inner2="true" @goIn="goIn" title="维修填报"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -19,14 +19,6 @@
 						<input type="text" class="filter_input filter_input_disabled" disabled v-model="val2">
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">生产配合人</span>
-					</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val3">
-					</view>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -116,12 +108,12 @@
 				this.pkObj = this.pkId === e.repair_id ? e : {}
 			},
 			toCancle () {
-			  this.$store.dispatch('setPublicObj', {})
+			  this.$store.dispatch('setPublicObj', '')
 			  this.goIn()
 			},
 			goIn () {
 				uni.redirectTo({
-					url: '/pages/modules/EquipRepairExecute'
+					url: '/pages/device/RepairWork'
 				})
 			}
 		}

pages/device/RepairWork.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="设备维修执行"></nav-bar>
+		<nav-bar title="设备维修作业"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -10,6 +10,8 @@
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
+						:focused="true"
+						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -27,11 +29,11 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.repair_id === pkId}">
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.device_code === pkId}">
 								<td>{{e.repair_code}}</td>
 								<td>{{e.device_code}}</td>
 								<td>{{e.device_name}}</td>
-								<td>{{e.status_name}}</td>
+								<td>{{e.invstatus_name}}</td>
 								<td>{{e.plan_start_date}}</td>
 							</tr>
 						</tbody>
@@ -40,10 +42,8 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure1">开始维修</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure1">开始维修</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" @tap="toJump">填报</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" @tap="toJump">结束维修</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="toSure2">委外维修</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled3" @tap="toSure3">结束维修</button>
 		</view>
 	</view>
 </template>
@@ -51,7 +51,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {coolIOQuery, confirmInstor, statusList} from '@/utils/getData2.js'
+	import {deviceRepairGetAllQuery, deviceRepairBegin} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -63,32 +63,47 @@
 				dataList: [],
 				pkId: '',
 				pkObj: {},
-				disabled1: false,
+				disabled: false
-				disabled2: false,
-				disabled3: false
 			};
 		},
-		created () {
-		},
 		methods: {
-			/** 下拉框查询 */
+			handleChange (e) {
-			async _statusList () {
+				this._deviceRepairGetAllQuery(e)
-				let res = await statusList()
-				this.options = [...res.data]
 			},
-			/** 确认 */
+			/** grid查询 */
-			async _confirmInstor () {
+			async _deviceRepairGetAllQuery (e) {
+				let res = await deviceRepairGetAllQuery(e)
+				res.data.map(el => {
+					if(el.invstatus === '01') {
+						this.$set(el, 'invstatus_name', '生成')
+					}
+					if(el.invstatus === '02') {
+						this.$set(el, 'invstatus_name', '提交')
+					}
+					if(el.invstatus === '03') {
+						this.$set(el, 'invstatus_name', '维修开始')
+					}
+					if(el.invstatus === '06') {
+						this.$set(el, 'invstatus_name', '维修结束')
+					}
+					if(el.invstatus === '99') {
+						this.$set(el, 'invstatus_name', '审核完毕')
+					}
+				})
+				this.dataList = [...res.data]
+			},
+			async toSure1 () {
 				this.disabled = true
-				if (!this.val1 || !this.pkId || !this.index) {
+				if (!this.pkId) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await confirmInstor(this.pkObj, this.val1, this.index)
+					let res = await deviceRepairBegin(this.pkObj)
 					this.disabled = false
 					this.pkId = ''
 					this.pkObj = {}
-					this.searchList()
+					this._deviceRepairGetAllQuery(this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -98,14 +113,14 @@
 				}
 			},
 			toCheck (e) {
-				this.pkId = this.pkId === e.repair_id ? '' : e.repair_id
+				this.pkId = this.pkId === e.device_code ? '' : e.device_code
-				this.pkObj = this.pkId === e.repair_id ? e : {}
+				this.pkObj = this.pkId === e.device_code ? e : {}
 			},
 			toJump () {
 				if (this.pkId) {
 				this.$store.dispatch('setPublicObj', this.pkObj)
 				uni.navigateTo({
-					url: '/pages/modules/MaintainResultFill'
+					url: '/pages/device/RepairFill'
 				})
 				}
 			}

pages/home/home.vue

@@ -59,7 +59,7 @@
 			};
 		},
 		created () {
-			this.$store.dispatch('publicObj', '')
+			this.$store.dispatch('setPublicObj', '')
 		},
 		methods: {
 			toPage1 (e) {

pages/warehouse/SemifinishedInStore.vue

@@ -92,7 +92,7 @@
 			}
 		},
 		destroyed () {
-			this.$store.dispatch('publicObj', '')
+			this.$store.dispatch('setPublicObj', '')
 		},
 		created () {
 			this._getWork()
@@ -100,7 +100,7 @@
 		methods: {
 			getMater () {
 				uni.navigateTo({
-					url: '/pages/modules/SemifinishedMaterSearch'
+					url: '/pages/warehouse/SemifinishedMaterSearch'
 				})
 			},
 			/** 选择器 */
@@ -150,7 +150,7 @@
 				this.sale_id = ''
 				this.index = ''
 				this.bar_code = ''
-				this.$store.dispatch('publicObj', '')
+				this.$store.dispatch('setPublicObj', '')
 			}
 		}
 	}

pages/warehouse/SemifinishedMaterSearch.vue

@@ -128,7 +128,7 @@
 			},
 			goIn () {
 				uni.redirectTo({
-					url: '/pages/modules/SemifinishedInStore'
+					url: '/pages/warehouse/SemifinishedInStore'
 				})
 			}
 		}

utils/getData2.js

@@ -21,37 +21,6 @@ export const handLogin = (user, password) => request({
 		password: password
 	}
 })
-// export const handLogin = (user, password) => {
-// 	let res = {
-//     "user": {
-//         "user": {
-//             "user_id": "1",
-//             "username": "admin",
-//             "person_name": "管理员",
-//             "gender": "男",
-//             "phone": "18312365896",
-//             "email": "201507802@qq.com",
-//             "avatar_name": "avatar-20200806032259161.png",
-//             "avatar_path": "/Users/jie/Documents/work/me/admin/eladmin/~/avatar/avatar-20200806032259161.png",
-//             "password": "f52020dca765fd3943ed40a615dc2c5c",
-//             "is_admin": true,
-//             "is_used": true,
-//             "pwd_reset_user_id": 0,
-//             "pwd_reset_time": null,
-//             "create_id": null,
-//             "create_name": "",
-//             "create_time": "2022-12-01 00:00:00",
-//             "update_id": "1",
-//             "update_name": "admin",
-//             "update_time": "2023-05-06 14:00:14",
-//             "extperson_id": null,
-//             "extuser_id": null
-//         }
-//     },
-//     "token": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiIxIiwicm5TdHIiOiIyZENCQk1uYW03ellTb21aVVN2ZzZnMndJOHJ0V0RmciIsImxvZ2luSW5mbyI6eyJpZCI6IjEiLCJ1c2VybmFtZSI6ImFkbWluIiwicHJlc29uTmFtZSI6IueuoeeQhuWRmCIsInVzZXIiOnsidXNlcl9pZCI6IjEiLCJ1c2VybmFtZSI6ImFkbWluIiwicGVyc29uX25hbWUiOiLnrqHnkIblkZgiLCJnZW5kZXIiOiLnlLciLCJwaG9uZSI6IjE4MzEyMzY1ODk2IiwiZW1haWwiOiIyMDE1MDc4MDJAcXEuY29tIiwiYXZhdGFyX25hbWUiOiJhdmF0YXItMjAyMDA4MDYwMzIyNTkxNjEucG5nIiwiYXZhdGFyX3BhdGgiOiIvVXNlcnMvamllL0RvY3VtZW50cy93b3JrL21lL2FkbWluL2VsYWRtaW4vfi9hdmF0YXIvYXZhdGFyLTIwMjAwODA2MDMyMjU5MTYxLnBuZyIsInBhc3N3b3JkIjoiZjUyMDIwZGNhNzY1ZmQzOTQzZWQ0MGE2MTVkYzJjNWMiLCJpc19hZG1pbiI6dHJ1ZSwiaXNfdXNlZCI6dHJ1ZSwicHdkX3Jlc2V0X3VzZXJfaWQiOjAsImNyZWF0ZV9uYW1lIjoiIiwiY3JlYXRlX3RpbWUiOjE2Njk4MjQwMDAsInVwZGF0ZV9pZCI6IjEiLCJ1cGRhdGVfbmFtZSI6ImFkbWluIiwidXBkYXRlX3RpbWUiOjE2ODMzNTI4MTR9LCJwZXJtaXNzaW9ucyI6WyJhZG1pbiIsIm1vbml0b3I6bGlzdCIsInRpbWluZzpkZWwiLCJ0aW1pbmc6ZWRpdCIsInRpbWluZzphZGQiLCJkaWN0OmRlbCIsImRpY3Q6ZWRpdCIsImRpY3Q6YWRkIiwiZGVwdDpkZWwiLCJkZXB0OmVkaXQiLCJkZXB0OmFkZCIsIm1lbnU6ZGVsIiwibWVudTplZGl0IiwibWVudTphZGQiLCJyb2xlczpkZWwiLCJtZW51Omxpc3QiLCJyb2xlczplZGl0Iiwicm9sZXM6YWRkIiwidXNlcjpkZWwiLCJ1c2VyOmVkaXQiLCJ1c2VyOmFkZCIsInN0b3JhZ2U6ZGVsIiwic3RvcmFnZTplZGl0Iiwic3RvcmFnZTphZGQiLCJzdG9yYWdlOmxpc3QiLCJkaWN0Omxpc3QiLCJkZXB0Omxpc3QiLCJyb2xlczpsaXN0IiwidGltaW5nOmxpc3QiLCJ1c2VyOmxpc3QiLCI5OTkiLCJnZW5Db2RlOmVkaXQiLCJnZW5Db2RlOmRlbCIsImdlbkNvZGU6YWRkIiwiZ2VuQ29kZTpsaXN0Il19fQ.cur9GPyns_MCRCw9vwNogGiCAOxzSd_9-KKythjc9dU"
-// }
-// return res
-// }
 
 // 测试状态码报错接口
 export const handRequest = () => request({
@@ -72,7 +41,7 @@ export const getMaterial = (sp, page, size) => request({
 	}
 })
 // 1.2工序下拉框
-export const getWork = (sp) => request({
+export const getWork = () => request({
 	url:'api/pda/hrBcp/iosIn/getWork',
 	data: {}
 })
@@ -81,3 +50,74 @@ export const BcpConfirm = (from) => request({
 	url:'api/pda/hrBcp/iosIn/confirm',
 	data: from
 })
+
+/**
+ * 设备维修作业
+ */
+// 1.1设备维修作业页面 （初始查询）-- 单选
+// export const deviceRepairGetAllQuery = (code) => request({
+// 	url:'api/pda/device/repair/getAllQuery',
+// 	data: {
+// 		device_code: code
+// 	}
+// })
+export const deviceRepairGetAllQuery = (code) => {
+	let res = {
+		data: [{device_code: '01', invstatus: '99', repair_code: '11', repair_id: '111'}]
+	}
+	return res
+}
+// 1.2开始维修（按钮）
+export const deviceRepairBegin = (row) => request({
+	url:'api/pda/device/repair/begin',
+	data: {
+		row: row
+	}
+})
+// 1.4维修填报页面（二级页面）
+export const deviceRepairGetDtl = (code, rcode, id) => request({
+	url:'api/pda/device/repair/getDtl',
+	data: {
+		device_code: code,
+		repair_code: rcode,
+		repair_id: id
+	}
+})
+// 1.4.1确认（按钮）-- 是否完成全部为是【确认】按钮可点击，否则为灰色不可点击
+export const deviceRepairConfirm = (code, rcode, rows) => request({
+	url:'api/pda/device/repair/confirm',
+	data: {
+		device_code: code,
+		repair_code: rcode,
+		rows: rows
+	}
+})
+
+/**
+ * 设备作业管理
+ */
+// 1.1设备作业管理页面 （初始查询）-- 多选
+export const deviceManageGetAllQuery = (type, code) => request({
+	url:'api/pda/device/manage/getAllQuery',
+	data: {
+		job_type: type,
+		device_code: code
+	}
+})
+// 1.2审核完成（按钮）
+export const deviceManageConfirm = (rows) => request({
+	url:'api/pda/device/manage/confirm',
+	data: {
+		rows: rows
+	}
+})
+// 1.3作业明细页面（二级页面）
+export const deviceManageGetDtl = (code, type, jcode) => request({
+	url:'api/pda/device/manage/getDtl',
+	data: {
+		device_code: code,
+		job_type: type,
+		job_code: jcode
+	}
+})
+

vuex/store.js

@@ -2,11 +2,13 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 
 import user from './modules/user'
+import data from './modules/data'
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   modules: {
-    user
+    user,
+	data
   }
 })