马宇豪
2024-01-08 4ef6c36c631c3aa3916e0861fd211dec9b03231b
src/views/notCoalMine/nPeopleManage/components/peopleDialog.vue
@@ -79,10 +79,10 @@
            <el-col :span="24">
              <el-form-item label="违章记录">
                <el-table :data="form.violationList" border>
                  <el-table-column label="时间" align="center">
                    <template #default="scope">
                      {{scope.row.startTime + '--' + scope.row.endTime}}
                    </template>
                  <el-table-column label="时间" align="center" prop="violationTime">
<!--                    <template #default="scope">-->
<!--                      {{scope.row.startTime + '&#45;&#45;' + scope.row.endTime}}-->
<!--                    </template>-->
                  </el-table-column>
                  <el-table-column label="单位" align="center" prop="unit"/>
                </el-table>
@@ -109,7 +109,7 @@
                <el-table :data="form.trainList" border>
                  <el-table-column label="培训时间" align="center">
                    <template #default="scope">
                      {{scope.row.startTime + '--' + scope.row.endTime}}
                      {{scope.row.startTime | formatDate }}--{{scope.row.endTime | formatDate}}
                    </template>
                  </el-table-column>
                  <el-table-column label="培训单位" align="center" prop="trainInstitutionName"/>
@@ -123,14 +123,11 @@
            <el-col :span="24">
              <el-form-item label="考试经历">
                <el-table :data="form.examineeList" border>
                  <el-table-column label="考试时间" align="center">
                    <template #default="scope">
                      {{scope.row.startTime + '--' + scope.row.endTime}}
                    </template>
                  <el-table-column label="考试时间" align="center" prop="examTime">
                  </el-table-column>
                  <el-table-column label="考试中心" align="center" prop="trainInstitutionName"/>
                  <el-table-column label="考试中心" align="center" prop="examCenter"/>
                  <el-table-column label="科目" align="center" prop="subject"/>
                  <el-table-column label="考试结果" align="center" prop="trainInstitutionName"/>
                  <el-table-column label="考试结果" align="center" prop="result"/>
                </el-table>
              </el-form-item>
            </el-col>
@@ -232,12 +229,12 @@
          this.title = '查看人员'
          this.disable = true
        }
        // this.form = val
        for(let i in val){
          if(this.isValidKey(i,this.form)){
            this.form[i] = val[i]
          }
        }
        this.form = val
        // for(let i in val){
        //   if(this.isValidKey(i,this.form)){
        //     this.form[i] = val[i]
        //   }
        // }
        this.form.sex = Number(this.form.sex)
      }
      this.open = true