diff --git a/pages/projectEnd/qualityManage/details.vue b/pages/projectEnd/qualityManage/details.vue
index b292d055..a0b44896 100644
--- a/pages/projectEnd/qualityManage/details.vue
+++ b/pages/projectEnd/qualityManage/details.vue
@@ -11,7 +11,7 @@
审批流程
-
+
检查部位
@@ -172,6 +172,10 @@
+
+ 违章人员：
+ {{ personList.find(ele => ele.id == item.violatorId).workerName }}
+
-
@@ -226,7 +230,9 @@
recordType: 1, // 1为质量问题 2为排查记录
id: '',
btnEditAuth: true,
- btnDeleteAuth: true
+ btnDeleteAuth: true,
+ projectSn: "",
+ personList: [],
}
},
onLoad(option) {
@@ -241,6 +247,8 @@
this.id = option.id;
this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
this.entryType = Number(option.type)
+ this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
+ this.getPointAreaFn();
},
onShow() {
this.getBasicInfo();
@@ -251,15 +259,30 @@
uni.getSystemInfo({
success(res) {
that.mobileTopHeight = res.statusBarHeight ? res.statusBarHeight : 0;
- uni.setStorageSync('systemInfo',res)
+ uni.setStorageSync('systemInfo', res)
console.log(res)
}
})
- console.log('this.mobileTopHeight',this.mobileTopHeight)
+ console.log('this.mobileTopHeight', this.mobileTopHeight)
},
methods: {
+ // 获取违章人员列表
+ getPointAreaFn() {
+ let requestData = {
+ projectSn: this.projectSn,
+ };
+ this.sendRequest({
+ url: 'xmgl/workerInfo/getLaborManagementInfoList',
+ method: 'post',
+ data: requestData,
+ success: (res) => {
+ console.log(res);
+ this.personList = res.result;
+ },
+ })
+ },
// 重新提交
- resubmitCheckRecord(){
+ resubmitCheckRecord() {
uni.navigateTo({
url: '/pages/projectEnd/qualityManage/editIssue?id=' + this.id
})
@@ -465,17 +488,18 @@
+
\ No newline at end of file
diff --git a/pages/projectEnd/safeSame/details.vue b/pages/projectEnd/safeSame/details.vue
index 463c6fa8..71e3bd07 100644
--- a/pages/projectEnd/safeSame/details.vue
+++ b/pages/projectEnd/safeSame/details.vue
@@ -171,6 +171,10 @@
+
+ 违章人员：
+ {{ personList.find(ele => ele.id == item.violatorId).workerName }}
+
-
@@ -225,7 +229,9 @@
recordType: 1, // 1为安全问题 2为排查记录
id: '',
btnEditAuth: true,
- btnDeleteAuth: true
+ btnDeleteAuth: true,
+ projectSn: "",
+ personList:[],
}
},
onLoad(option) {
@@ -240,6 +246,8 @@
this.id = option.id;
this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
this.entryType = Number(option.type)
+ this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
+ this.getPointAreaFn();
},
onShow() {
this.getBasicInfo();
@@ -257,6 +265,21 @@
console.log('this.mobileTopHeight',this.mobileTopHeight)
},
methods: {
+ // 获取违章人员列表
+ getPointAreaFn() {
+ let requestData = {
+ projectSn: this.projectSn,
+ };
+ this.sendRequest({
+ url: 'xmgl/workerInfo/getLaborManagementInfoList',
+ method: 'post',
+ data: requestData,
+ success: (res) => {
+ console.log(res);
+ this.personList = res.result;
+ },
+ })
+ },
// 重新提交
resubmitCheckRecord() {
uni.navigateTo({
diff --git a/pages/projectEnd/safeSame/reply.vue b/pages/projectEnd/safeSame/reply.vue
index da7e82e7..de2655fb 100644
--- a/pages/projectEnd/safeSame/reply.vue
+++ b/pages/projectEnd/safeSame/reply.vue
@@ -39,6 +39,22 @@
{{type == 1 ? '已整改':'合格'}}
+
+
+ *违章人员
+
+
+
+
+ 请选择
+
+
+ {{workerName}}
+
+
+
+
*补充说明
@@ -112,19 +128,26 @@ import dateTimePiccker from '@/components/dateTimePicker/index.vue'
createUser: '',
qualityId: '',
userInfo:'',
- startTime: ""
+ startTime: "",
+
+ violatorId: "",
+ workerName: "",
+ personList: [],
+ projectSn: "",
}
},
onLoad(option) {
this.startTime = this.$formatDates(new Date().getTime(), 'yyyy-MM-dd HH:mm:ss');
this.rectifyTime = this.$formatDates(new Date().getTime(), 'yyyy-MM-dd HH:mm:ss');
this.userInfo= JSON.parse(uni.getStorageSync('userInfo'))
+ this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
this.id = option.id;
this.type = Number(option.type);
this.stateId = Number(option.stateId);
this.createId = option.createId
if (option.type == 1) {
this.title = '整改'
+ this.getPointAreaFn();
} else if (option.type == 2) {
this.title = '复查'
} else if (option.type == 3) {
@@ -133,6 +156,29 @@ import dateTimePiccker from '@/components/dateTimePicker/index.vue'
},
methods: {
+ // 获取违章人员列表
+ getPointAreaFn() {
+ let requestData = {
+ projectSn: this.projectSn,
+ };
+ this.sendRequest({
+ url: 'xmgl/workerInfo/getLaborManagementInfoList',
+ method: 'post',
+ data: requestData,
+ success: (res) => {
+ console.log(res);
+ this.personList = res.result;
+ },
+ })
+ },
+ // 切换违章人员
+ handleChangeRegion(e) {
+ let index = e.detail.value;
+ let findItem = this.personList[index];
+ this.violatorId = findItem.id;
+ this.workerName = findItem.workerName;
+ console.info(this.enterpriseList, 'enlist')
+ },
imgUrl(val) {
this.openImg = false
this.imgUpload(val)
@@ -293,7 +339,11 @@ import dateTimePiccker from '@/components/dateTimePicker/index.vue'
})
return
}
-
+
+ if (this.violatorId == "" && this.type == 1) {
+ this.$message.error("请选择违章人员");
+ return;
+ }
let time = this.getNewDate()
let data = {
@@ -302,6 +352,7 @@ import dateTimePiccker from '@/components/dateTimePicker/index.vue'
status: this.status,
qualityId: this.id,
rectifyTime: this.rectifyTime,
+ violatorId: this.violatorId,
type: this.type,
fileUrl: JSON.stringify(this.fileList),
createUser: this.userInfo.userId