Merge remote-tracking branch 'origin/master'

Alan

2021-02-20 d6f69af30f85add247d5e7e2ee8a9c1b7368d6cf

 src/views/user/Informationinput.vue

@@ -59,7 +59,7 @@
          v-show="showArr[0].show"
          ref="empBaseInfoTable"
          :data="basicInformationData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -95,7 +95,7 @@
          v-show="showArr[1].show"
          ref="workExperienceTable"
          :data="workExperienceData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -108,19 +108,19 @@
              </el-button>
            </template>
          </el-table-column>
          <el-table-column prop="empNumb" label="员工编号" width="180" />
          <el-table-column prop="empName" label="员工姓名" width="180" />
          <el-table-column prop="empNumb" label="员工编号" width="100" />
          <el-table-column prop="empName" label="员工姓名" width="100" />
          <el-table-column prop="certificateNumb" label="证件号码" width="180" />
          <el-table-column prop="workUnit" label="工作单位" width="180" />
          <el-table-column prop="beginDate" label="开始日期" width="180" />
          <el-table-column prop="endDate" label="结束日期" width="180" />
          <el-table-column prop="jobContent" label="主要工作内容" width="180" />
          <el-table-column prop="workUnit" label="工作单位" width="240" />
          <el-table-column prop="beginDate" label="开始日期" width="100" />
          <el-table-column prop="endDate" label="结束日期" width="100" />
          <el-table-column prop="jobContent" label="主要工作内容" width="300" />
        </el-table>
        <el-table
          v-show="showArr[2].show"
          ref="physicalExamTable"
          :data="physicalExamData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -152,7 +152,7 @@
          v-show="showArr[3].show"
          ref="contractInfoTable"
          :data="contractInfoData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -180,7 +180,7 @@
          v-show="showArr[4].show"
          ref="dimissionAttendTable"
          :data="dimissionAttendData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -202,7 +202,7 @@
          <el-table-column prop="absenteeism" label="旷工（天）" width="180" />
          <el-table-column prop="remark" label="备注" width="180" />
        </el-table>
        <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;height: 70%;">
        <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;">
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
            <template slot-scope="scope">
@@ -222,7 +222,7 @@
          <el-table-column prop="reporter" label="报备人" width="180" />
          <el-table-column prop="remark" label="备注" width="180" />
        </el-table>
        <el-table v-show="showArr[6].show" ref="resignTable" :data="resignData" style="width: 100%;height: 70%;">
        <el-table v-show="showArr[6].show" ref="resignTable" :data="resignData" style="width: 100%;">
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
            <template slot-scope="scope">
@@ -243,7 +243,7 @@
          v-show="showArr[7].show"
          ref="unemploymentTable"
          :data="unemploymentData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -262,7 +262,7 @@
          <el-table-column prop="auditor" label="审核人" width="180" />
          <el-table-column prop="remark" label="备注" width="180" />
        </el-table>
        <el-table v-show="showArr[8].show" ref="insuranceTable" :data="insuranceData" style="width: 100%;height: 70%;">
        <el-table v-show="showArr[8].show" ref="insuranceTable" :data="insuranceData" style="width: 100%;">
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
            <template slot-scope="scope">
@@ -286,7 +286,7 @@
          v-show="showArr[9].show"
          ref="accidentCasesTable"
          :data="accidentCasesData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -318,7 +318,7 @@
          v-show="showArr[10].show"
          ref="occupationalTable"
          :data="occupationalData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -350,7 +350,7 @@
          v-show="showArr[11].show"
          ref="laborTroubleTable"
          :data="laborTroubleData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -377,7 +377,7 @@
          v-show="showArr[12].show"
          ref="badRecordTable"
          :data="badRecordData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -404,7 +404,7 @@
          v-show="showArr[13].show"
          ref="remarkInfoTable"
          :data="remarkInfoData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">