版本修改

api/system/user.js

@@ -3,39 +3,46 @@ import request from '@/utils/request'
 
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
+	const data = {
-    oldPassword,
+		oldPassword,
-    newPassword
+		newPassword
-  }
+	}
-  return request({
+	return request({
-    url: '/system/user/profile/updatePwd',
+		url: '/system/user/profile/updatePwd',
-    method: 'put',
+		method: 'put',
-    params: data
+		params: data
-  })
+	})
 }
 
 // 查询用户个人信息
 export function getUserProfile() {
-  return request({
+	return request({
-    url: '/system/user/profile',
+		url: '/system/user/profile',
-    method: 'get'
+		method: 'get'
-  })
+	})
 }
 
 // 修改用户个人信息
 export function updateUserProfile(data) {
-  return request({
+	return request({
-    url: '/system/user/profile',
+		url: '/system/user/profile',
-    method: 'put',
+		method: 'put',
-    data: data
+		data: data
-  })
+	})
 }
 
 // 用户头像上传
 export function uploadAvatar(data) {
-  return upload({
+	return upload({
-    url: '/system/user/profile/avatar',
+		url: '/system/user/profile/avatar',
-    name: data.name,
+		name: data.name,
-    filePath: data.filePath
+		filePath: data.filePath
-  })
+	})
 }
+
+export function getUserInfo(id) {
+	return request({
+		url: '/system/user/' + id,
+		method: 'get'
+	})
+}

manifest.json

@@ -2,8 +2,8 @@
 	"name": "MES",
 	"appid": "__UNI__66F7FE2",
 	"description": "",
-	"versionName": "3.4.4",
+	"versionName": "3.4.6",
-	"versionCode": 344,
+	"versionCode": 346,
 	"transformPx": false,
 	"sassImplementationName": "node-sass",
 	"app-plus": {

pages/les/callMaterial.vue

@@ -5,7 +5,7 @@
 				<uni-easyinput type="text" v-model="formData.srcLocationCode" />
 			</uni-forms-item>
 			<uni-forms-item label="目的货位：" :labelWidth='90' name="destLocationCode">
-				<uni-easyinput suffixIcon="scan" @iconClick="scanDestLocationUuid" type="text" @blur="searchSrcLocation"
+				<uni-easyinput suffixIcon="scan" @iconClick="scanDestLocationUuid" type="text" @@confirm="searchSrcLocation"
 					v-model="formData.destLocationCode" />
 			</uni-forms-item>
 		</uni-forms>

pages/mes/jobReport/commissionRecord.vue

@@ -2,7 +2,8 @@
 	<view class="form-container">
 		<uni-forms ref="form" :modelValue="formData" :rules="rules">
 			<uni-forms-item label="作业编码：" :labelWidth='90' name="pwoJobCode">
-				<uni-easyinput suffixIcon="scan" @iconClick="scanBar" type="text" v-model="formData.pwoJobCode" />
+				<uni-easyinput @confirm="searchData" suffixIcon="scan" @iconClick="scanBar" type="text"
+					v-model="formData.pwoJobCode" />
 			</uni-forms-item>
 			<uni-forms-item label="工单：" :labelWidth='90' name="pwoCode">
 				<uni-easyinput type="text" v-model="formData.pwoCode" />
@@ -19,11 +20,22 @@
 			<uni-forms-item label="制程名称：" :labelWidth='90' name="opTitle">
 				<uni-easyinput type="text" v-model="formData.opTitle" />
 			</uni-forms-item>
+			<uni-forms-item label="开始时间：" :labelWidth='90' name="startTime">
+				<view>
+					<uni-datetime-picker type="datetime" v-model="formData.startTime" />
+				</view>
+			</uni-forms-item>
 			<uni-forms-item label="结束时间：" :labelWidth='90' name="endTime">
-				<view class="example-body">
+				<view>
 					<uni-datetime-picker type="datetime" v-model="formData.endTime" />
 				</view>
 			</uni-forms-item>
+			<uni-forms-item label="人员：" :labelWidth='90' name="staff">
+				<uni-easyinput type="text" v-model="formData.staff" @confirm="searchStaff" />
+			</uni-forms-item>
+			<uni-forms-item label="调试单价：" :labelWidth='90' name="programmingDebuggingUnitPrice">
+				<uni-easyinput type="text" v-model="formData.programmingDebuggingUnitPrice" />
+			</uni-forms-item>
 			<view class="form-row">
 				<uni-forms-item label="调机时长：" :labelWidth='90' name="timeTake" class="form-col">
 					<uni-easyinput type="text" v-model="timeTake" />
@@ -38,8 +50,9 @@
 </template>
 
 <script>
-import { addRecord } from "@/api/mes/mesMachineSetUpRecord";
+import { addRecord } from "@/api/mes/mesMachineSetUpRecord.js";
 import { listPwoJob } from "@/api/mes/jobReport.js";
+import { getUserInfo } from "@/api/system/user.js"
 export default {
 	data() {
 		return {
@@ -63,17 +76,47 @@ export default {
 			],
 		}
 	},
+	created() {
+		this.$set(this.formData, "staff", this.$store.state.user.name);
+	},
 	methods: {
 		scanBar() {
 			const _this = this;
 			uni.scanCode({
 				scanType: ['barCode', 'qrCode'],
 				success: function(res) {
-					_this.formData.pwoJobCode = res.result;
+					_this.$set(_this.formData, "pwoJobCode", res.result);
 					_this.scanBarCode(_this.formData.pwoJobCode);
 				}
 			});
 		},
+		searchStaff() {
+			const _this = this;
+			getUserInfo(_this.formData.staff).then(async res => {
+				_this.$set(_this.formData, "staff", res.data.userName);
+			})
+		},
+		searchData() {
+			const _this = this;
+			if (_this.formData.pwoJobCode) {
+				let obj = {
+					code: _this.formData.pwoJobCode
+				}
+				listPwoJob(obj).then(async res => {
+					let jobs = res.rows;
+					if (jobs.length == 0) {
+						_this.$modal.msg("未检索到该作业编码相关的信息！");
+					} else {
+						let job = jobs[0];
+						_this.$set(_this.formData, "pwoCode", job.pwoCode);
+						_this.$set(_this.formData, "ptNoTar", job.ptNoTar);
+						_this.$set(_this.formData, "ptTitleTar", job.ptTitleTar);
+						_this.$set(_this.formData, "opCode", job.opCode);
+						_this.$set(_this.formData, "opTitle", job.opTitle);
+					}
+				})
+			}
+		},
 		scanBarCode() {
 			const _this = this;
 			if (_this.formData.pwoJobCode) {
@@ -86,11 +129,11 @@ export default {
 						_this.$modal.msg("未检索到该作业编码相关的信息！");
 					} else {
 						let job = jobs[0];
-						_this.formData.pwoCode = job.pwoCode;
+						this.$set(this.formData, "pwoCode", job.pwoCode);
-						_this.formData.ptNoTar = job.ptNoTar;
+						this.$set(this.formData, "ptNoTar", job.ptNoTar);
-						_this.formData.ptTitleTar = job.ptTitleTar;
+						this.$set(this.formData, "ptTitleTar", job.ptTitleTar);
-						_this.formData.opCode = job.opCode;
+						this.$set(this.formData, "opCode", job.opCode);
-						_this.formData.opTitle = job.opTitle;
+						this.$set(this.formData, "opTitle", job.opTitle);
 					}
 				})
 			}
@@ -100,7 +143,9 @@ export default {
 			this.$refs.form.validate().then(res => {
 				if (_this.timeTake && _this.timeUnit && _this.formData.endTime) {
 					_this.changeTime();
-					_this.formData.startTime = _this.getCurrentDatetime();
+					if (!_this.formData.startTime) {
+						_this.formData.startTime = _this.getCurrentDatetime();
+					}
 					const isLegal = new Date(_this.formData.startTime).getTime() < new Date(_this.formData.endTime).getTime();
 					if (!isLegal) {
 						_this.$modal.msg("结束时间不能早于开始时间");

pages/work/indexList.json

@@ -283,7 +283,7 @@
 			}
 		}, {
 			"path": "/pages/mes/jobReport/commissionRecord",
-			"permission": "mes:pwoReport:add",
+			"permission": "mes:mesMachineSetupRecord:list",
 			"icon": "icon-gongdan",
 			"color": "linear-gradient(#95D097,#7BC47D)",
 			"style": {