From bdfe24349bbd61020a14257aeb44b97675a15ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
<411641505@qq.com>
Date: Thu, 26 Dec 2024 17:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E4=BA=BA=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/user.js | 10 ++++++++
src/views/mes/dv/checkrecord/index.vue | 35 ++++++++++++++++++++------
2 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ab0a6fe..a90a5ac 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,6 +6,8 @@ const user = {
token: getToken(),
name: '',
avatar: '',
+ id: '',
+ nick: '',
roles: [],
permissions: []
},
@@ -20,6 +22,12 @@ const user = {
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
},
+ SET_ID: (state, id) => {
+ state.id = id
+ },
+ SET_NICK: (state, nick) => {
+ state.nick = nick
+ },
SET_ROLES: (state, roles) => {
state.roles = roles
},
@@ -58,6 +66,8 @@ const user = {
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
+ commit('SET_ID', user.userId)
+ commit('SET_NICK', user.nickName)
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
resolve(res)
diff --git a/src/views/mes/dv/checkrecord/index.vue b/src/views/mes/dv/checkrecord/index.vue
index c9d929b..f06245a 100644
--- a/src/views/mes/dv/checkrecord/index.vue
+++ b/src/views/mes/dv/checkrecord/index.vue
@@ -99,7 +99,7 @@
-
+
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -172,17 +172,20 @@
-
-
+
+
-
-
+
+
+
+
+
@@ -222,10 +225,11 @@ import { listCheckrecord, getCheckrecord, delCheckrecord, addCheckrecord, update
import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
import CheckplanSelect from "@/components/dvplanSelect/index.vue";
import CheckRecordLine from "./line.vue";
+import UserSingleSelect from "@/components/userSelect/single.vue"
export default {
name: "Checkrecord",
dicts: ['mes_order_status'],
- components:{ MachinerySelectSingle, CheckplanSelect, CheckRecordLine },
+ components:{ MachinerySelectSingle, CheckplanSelect, CheckRecordLine, UserSingleSelect},
data() {
return {
optType: null,
@@ -287,8 +291,11 @@ export default {
// 表单重置
reset() {
this.form = {
- recordId: null, planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, machinerySpec: null, checkTime: new Date(), status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
- this.resetForm("form");
+ recordId: null, planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, userId: null, nickName: null, userName: null, machinerySpec: null, checkTime: new Date(), status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
+ this.form.userId= this.$store.state.user.id;
+ this.form.nickName= this.$store.state.user.nick;
+ this.form.userName= this.$store.state.user.name;
+ this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
@@ -404,6 +411,18 @@ export default {
this.form.planType = obj.planType;
}
},
+
+ //点击人员选择按钮
+ handleUserSelect(){
+ this.$refs.userSelect.showFlag = true;
+ },
+ //人员选择返回
+ onUserSelected(row){
+ this.form.userId = row.userId;
+ this.form.nickName = row.nickName;
+ this.form.userName = row.userName;
+ },
+
/** 导出按钮操作 */
handleExport() {
this.download('dv/checkrecord/export', {