Wance/rd_mes_uniapp
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 25 Wiki Activity

调机记录功能修改

Browse Source
This commit is contained in:
wuwei
2026-01-13 18:43:59 +08:00
parent 3befba7767
commit 256bbeb705
7 changed files with 188 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/basic/employee.js
View File

@@ -85,3 +85,10 @@ export function delEmployeeLineRel(id) {
method: 'delete'
})
}
export function getEmployeeByCode(code) {
return request({
url: '/basic/employee/getEmpByCode/' + code,
method: 'get'
})
}

4
manifest.json
View File

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

9
pages/les/bindMaterial.vue
View File

@@ -73,7 +73,6 @@ export default {
bind(_this.formData).then(res => {
_this.$modal.closeLoading();
_this.$modal.msgSuccess("绑定成功！");
_this.reset();
setTimeout(() => {
this.$tab.switchTab("/pages/work/index");
}, 500);
@@ -102,7 +101,6 @@ export default {
unBind(_this.formData.locationCode).then(res => {
_this.$modal.closeLoading();
_this.$modal.msgSuccess("解绑成功！");
_this.reset();
setTimeout(() => {
this.$tab.switchTab("/pages/work/index");
}, 500);
@@ -117,13 +115,6 @@ export default {
});
})
},
reset() {
this.formData = {
locationCode: null,
batchNo: null,
};
}
}
}
</script>

6
pages/les/callMaterial.vue
View File

@@ -75,7 +75,6 @@ export default {
addDeliveryTask(_this.formData).then(res => {
_this.$modal.closeLoading();
_this.$modal.msgSuccess("提交成功！");
_this.reset();
setTimeout(() => {
_this.$tab.switchTab("/pages/work/index");
}, 500);
@@ -85,11 +84,6 @@ export default {
}
})
},
reset() {
this.formData.srcLocationCode = null;
this.formData.destLocationCode = null;
}
}
}
</script>

12
pages/les/deliveryMaterial.vue
View File

@@ -72,7 +72,6 @@ export default {
delivery(_this.formData).then(res => {
_this.$modal.closeLoading();
_this.$modal.msgSuccess("提交成功！");
_this.reset();
setTimeout(() => {
this.$tab.switchTab("/pages/work/index");
}, 500);
@@ -96,7 +95,6 @@ export default {
cancel(arr).then(res => {
_this.$modal.closeLoading();
_this.$modal.msgSuccess("取消成功！");
_this.reset();
setTimeout(() => {
this.$tab.switchTab("/pages/work/index");
}, 500);
@@ -108,16 +106,6 @@ export default {
});
})
},
reset() {
this.formData = {
id: null,
srcLocationCode: null,
taskTyp: null,
robotType: null,
ctnrTyp: null,
};
this.destLocationCode = null;
}
}
}
</script>

5
pages/les/returnPallet.vue
View File

@@ -66,7 +66,6 @@ export default {
addDeliveryTask(_this.formData).then(res => {
_this.$modal.closeLoading();
_this.$modal.msgSuccess("提交成功！");
_this.reset();
setTimeout(() => {
this.$tab.switchTab("/pages/work/index");
}, 500);
@@ -76,10 +75,6 @@ export default {
}
})
},
reset() {
this.formData.srcLocationCode = null;
this.formData.destLocationCode = null;
}
}
}
</script>

82
pages/mes/jobReport/commissionRecord.vue
View File

@@ -1,5 +1,5 @@
<template>
<view class="form-container">
<view>
<uni-forms ref="form" :modelValue="formData" :rules="rules">
<uni-forms-item label="作业编码：" :labelWidth='90' name="pwoJobCode">
<uni-easyinput @confirm="searchData" suffixIcon="scan" @iconClick="scanBar" type="text"
@@ -33,17 +33,18 @@
<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-row>
<uni-col :span="12">
<uni-forms-item label="调机时长：" :labelWidth='90' name="timeTake" class="form-col">
<uni-easyinput type="text" v-model="timeTake" />
</uni-forms-item>
</uni-col>
<uni-col :span="12">
<uni-forms-item label="时间单位：" :labelWidth='90' name="timeUnit" class="form-col">
<uni-data-select v-model="timeUnit" :localdata="unitOptions" placeholder="选择时间单位" />
</uni-forms-item>
</view>
</uni-col>
</uni-row>
</uni-forms>
<u-button type="primary" @click="submit">提交</u-button>
</view>
@@ -52,7 +53,7 @@
<script>
import { addRecord } from "@/api/mes/mesMachineSetUpRecord.js";
import { listPwoJob } from "@/api/mes/jobReport.js";
import { getUserInfo } from "@/api/system/user.js"
import { getEmployeeByCode } from "@/api/basic/employee.js"
export default {
data() {
return {
@@ -77,7 +78,7 @@ export default {
}
},
created() {
this.$set(this.formData, "staff", this.$store.state.user.name);
this.$set(this.formData, "staff", this.$store.state.employee.empName);
},
methods: {
scanBar() {
@@ -92,8 +93,12 @@ export default {
},
searchStaff() {
const _this = this;
getUserInfo(_this.formData.staff).then(async res => {
_this.$set(_this.formData, "staff", res.data.userName);
getEmployeeByCode(_this.formData.staff).then(async res => {
if(res.data != null){
_this.$set(_this.formData, "staff", res.data.name);
}else{
_this.$modal.msg("未查询到该员工！");
}
})
},
searchData() {
@@ -155,7 +160,7 @@ export default {
addRecord(_this.formData).then(res => {
_this.$modal.closeLoading();
_this.$modal.msgSuccess("提交成功！");
_this.reset();
// _this.reset();
setTimeout(() => {
this.$tab.switchTab("/pages/work/index");
}, 500);
@@ -193,62 +198,9 @@ export default {
// 拼接为 "YYYY-MM-DD HH:mm" 格式
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
},
reset() {
this.timeTake = null;
this.timeUnit = 'h';
this.formData = {
startTime: null,
endTime: null,
pwoJobCode: null,
pwoCode: null,
ptNoTar: null,
ptTitleTar: null,
opCode: null,
opTitle: null,
machineAdjustmentDuration: null
};
}
}
}
</script>
<style scoped>
.form-container {
padding: 15px;
}
.form-row {
display: flex;
align-items: center;
gap: 15px;
/* 两个项之间的间距 */
width: 100%;
margin: 10px 0;
/* 与上下表单项保持默认间距 */
}
/* 并列项平分宽度 */
.form-col {
flex: 1;
min-width: 0;
}
/* 可选：统一并列项的label样式（避免对齐错乱） */
:deep(.form-col .uni-forms-item__label) {
width: 80px !important;
/* 固定label宽度 */
text-align: left;
}
/* 其他表单项保持默认样式，无需额外修改 */
:deep(.uni-forms-item) {
margin-bottom: 80px;
/* 统一所有表单项的底部间距 */
}
.u-button {
height: 10% !important;
position: absolute;
bottom: 0;
}
<style>
</style>