修改

马宇豪

2024-03-05 2bc59d909462d305e9c71db0c8d54b70a26c43a4

 src/views/notCoalMine/nPeopleManage/components/peopleDialog.vue

@@ -76,13 +76,13 @@
        </el-row>
        <template v-if="title == '查看人员'">
          <el-row v-if="form.violationList && form.violationList.length>0">
            <el-col :span="20">
            <el-col :span="24">
              <el-form-item label="违章记录">
                <el-table :data="form.violationList">
                  <el-table-column label="时间" align="center">
                    <template #default="scope">
                      {{scope.row.startTime + '--' + scope.row.endTime}}
                    </template>
                <el-table :data="form.violationList" border>
                  <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>
@@ -90,9 +90,9 @@
            </el-col>
          </el-row>
          <el-row v-if="form.resumeList && form.resumeList.length>0">
            <el-col :span="20">
            <el-col :span="24">
              <el-form-item label="个人履历">
                <el-table :data="form.resumeList">
                <el-table :data="form.resumeList" border>
                  <el-table-column label="时间" align="center">
                    <template #default="scope">
                      {{scope.row.startTime + '--' + scope.row.endTime}}
@@ -104,12 +104,12 @@
            </el-col>
          </el-row>
          <el-row v-if="form.trainList && form.trainList.length>0">
            <el-col :span="20">
            <el-col :span="24">
              <el-form-item label="培训经历">
                <el-table :data="form.trainList">
                <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"/>
@@ -120,17 +120,14 @@
            </el-col>
          </el-row>
          <el-row v-if="form.examineeList && form.examineeList.length>0">
            <el-col :span="20">
            <el-col :span="24">
              <el-form-item label="考试经历">
                <el-table :data="form.examineeList">
                  <el-table-column label="考试时间" align="center">
                    <template #default="scope">
                      {{scope.row.startTime + '--' + scope.row.endTime}}
                    </template>
                <el-table :data="form.examineeList" border>
                  <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>
@@ -233,13 +230,12 @@
          this.disable = true
        }
        this.form = val
        // if(val){
        //   for(let i in val){
        //     if(this.isValidKey(i,this.form)){
        //       this.form[i] = val[i]
        //     }
        // 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
    },