From 97bd43c4d9f4df55365e4634de347f2ac13145af Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:10 +0800
Subject: [PATCH] 修改人员bug
---
src/components/caorui/Department/components/Records/dispose/index.vue | 2 +-
src/components/do/a6-personnel-training/Edit.vue | 1 +
src/components/do/a6-personnel/personnel-capacity.vue | 2 +-
src/components/caorui/Department/components/Records/dispose/Step/Measure.vue | 9 +++++----
src/components/caorui/Department/components/Records/index.vue | 7 ++++---
src/components/do/a6-personnel/track-record.vue | 13 ++++++++-----
src/components/do/a6-personnel/personnel-information.vue | 5 +++++
src/assets/api/controller.js | 6 ++++++
8 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 8fa13dc..16b02be 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -72,6 +72,7 @@
feStandardSubstanceRecord,
personPostAuthorizationRecord,
deviceCheck,
+ personCommunicationAbility,
}
}
@@ -1027,3 +1028,8 @@
approvalOfHomeworkInstructionManual: "/instruction/approvalOfHomeworkInstructionManual", // 浣滀笟鎸囧涔� 瀹℃壒
deviceMetricRecordExport: '/deviceMetricRecord/deviceMetricRecordExport', // 璁惧鏍″噯 瀵煎嚭
};
+
+// 娌熼�氳褰�
+const personCommunicationAbility = {
+ exportPersonCommunicationAbility:'/personCommunicationAbility/exportPersonCommunicationAbility',//瀵煎嚭
+}
diff --git a/src/components/caorui/Department/components/Records/dispose/Step/Measure.vue b/src/components/caorui/Department/components/Records/dispose/Step/Measure.vue
index 4177555..40c46f3 100644
--- a/src/components/caorui/Department/components/Records/dispose/Step/Measure.vue
+++ b/src/components/caorui/Department/components/Records/dispose/Step/Measure.vue
@@ -1,8 +1,8 @@
<template>
- <el-form
+ <el-form
:model="form"
:disabled="disabled"
- label-width="130px"
+ label-width="130px"
size="small"
style="position: relative"
>
@@ -74,6 +74,7 @@
computed: {
form: {
get() {
+ console.log(3333,this.measureForm)
return this.measureForm
},
set(val) {
@@ -83,7 +84,7 @@
},
data() {
return {
-
+
}
},
methods: {
@@ -98,4 +99,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/caorui/Department/components/Records/dispose/index.vue b/src/components/caorui/Department/components/Records/dispose/index.vue
index 4ed06b9..fc5c74a 100644
--- a/src/components/caorui/Department/components/Records/dispose/index.vue
+++ b/src/components/caorui/Department/components/Records/dispose/index.vue
@@ -176,7 +176,7 @@
// 绗�3姝ユ暟鎹�
this.mainForm.measureForm.correctiveActionId = data.correctiveActionId
this.mainForm.measureForm.correctiveMeasure = data.correctiveMeasure
- this.mainForm.measureForm.requestDepartmentConfirmation = data.requestDepartmentConfirmation == '1' ? true:false
+ this.mainForm.measureForm.requestDepartmentConfirmation = data.requestDepartmentConfirmation
// 绗�4姝ユ暟鎹�
this.mainForm.resultForm.verificationDepartmentPersonId = data.verificationDepartmentPersonId
this.mainForm.resultForm.implementationVerificationResults = data.implementationVerificationResults
diff --git a/src/components/caorui/Department/components/Records/index.vue b/src/components/caorui/Department/components/Records/index.vue
index ac322e3..84b89f1 100644
--- a/src/components/caorui/Department/components/Records/index.vue
+++ b/src/components/caorui/Department/components/Records/index.vue
@@ -114,10 +114,11 @@
searchVal: undefined
},
superviseColumnData: [
+ // {
+ // label: 'id',
+ // prop: 'id'
+ // },
{
- label: 'id',
- prop: 'id'
- }, {
label: '妫�娴嬩汉鍛�',
prop: 'testerName',
width: 120
diff --git a/src/components/do/a6-personnel-training/Edit.vue b/src/components/do/a6-personnel-training/Edit.vue
index bf3b969..c2a5e4d 100644
--- a/src/components/do/a6-personnel-training/Edit.vue
+++ b/src/components/do/a6-personnel-training/Edit.vue
@@ -211,6 +211,7 @@
};
},
mounted() {
+ console.log(this.currentRow, '褰撳墠鏁版嵁')
this.trainingForm = this.currentRow
this.getInfo()
this.getUserList()
diff --git a/src/components/do/a6-personnel/personnel-capacity.vue b/src/components/do/a6-personnel/personnel-capacity.vue
index 25a8800..58c9435 100644
--- a/src/components/do/a6-personnel/personnel-capacity.vue
+++ b/src/components/do/a6-personnel/personnel-capacity.vue
@@ -297,7 +297,7 @@
}
}, {
label: '纭浜�',
- prop: 'confirmOperatingPersonnelId',
+ prop: 'confirmOperatingPersonnelName',
minWidth: '100'
}, {
label: '纭鏃ユ湡',
diff --git a/src/components/do/a6-personnel/personnel-information.vue b/src/components/do/a6-personnel/personnel-information.vue
index b10df08..ff20b03 100644
--- a/src/components/do/a6-personnel/personnel-information.vue
+++ b/src/components/do/a6-personnel/personnel-information.vue
@@ -155,6 +155,11 @@
</el-date-picker>
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="鑱岀О">
+ <el-input v-model="form.professionalTitle" clearable size="small"></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="24" style="text-align: left;">
diff --git a/src/components/do/a6-personnel/track-record.vue b/src/components/do/a6-personnel/track-record.vue
index 1d58b68..74ba234 100644
--- a/src/components/do/a6-personnel/track-record.vue
+++ b/src/components/do/a6-personnel/track-record.vue
@@ -12,6 +12,8 @@
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
</template>
</el-table-column>
+ <el-table-column prop="name" label="濮撳悕" min-width="100">
+ </el-table-column>
<el-table-column prop="startTime" label="璧峰鏃ユ湡" min-width="180">
</el-table-column>
<el-table-column prop="endTime" label="缁撴潫鏃ユ湡" min-width="180">
@@ -41,10 +43,15 @@
:total="search.total">
</el-pagination>
</div>
- <el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="45%">
+ <el-dialog title="鏌ョ湅" :visible.sync="dialogVisible" width="45%">
<div style="height: 30vh;">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-row>
+ <el-col :span="12">
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input v-model="ruleForm.name" size="small" disabled></el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="璧峰鏃ユ湡" prop="startTime">
<el-date-picker v-model="ruleForm.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small"
@@ -59,8 +66,6 @@
</el-date-picker>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="宸ヤ綔鍗曚綅" prop="placeWork">
<el-input v-model="ruleForm.placeWork" size="small" clearable required></el-input>
@@ -71,8 +76,6 @@
<el-input v-model="ruleForm.department" size="small" clearable required></el-input>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="鏈�楂樿亴鍔�" prop="post">
<el-input v-model="ruleForm.post" size="small" clearable required></el-input>
--
Gitblit v1.9.3