licp
2024-12-24 97bd43c4d9f4df55365e4634de347f2ac13145af
修改人员bug
已修改8个文件
45 ■■■■■ 文件已修改
src/assets/api/controller.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/caorui/Department/components/Records/dispose/Step/Measure.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/caorui/Department/components/Records/dispose/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/caorui/Department/components/Records/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-personnel-training/Edit.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-personnel/personnel-capacity.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-personnel/personnel-information.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-personnel/track-record.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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',//导出
}
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>
</script>
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
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
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()
src/components/do/a6-personnel/personnel-capacity.vue
@@ -297,7 +297,7 @@
          }
        }, {
          label: '确认人',
          prop: 'confirmOperatingPersonnelId',
          prop: 'confirmOperatingPersonnelName',
          minWidth: '100'
        }, {
          label: '确认日期',
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;">
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>