Merge remote-tracking branch 'origin/master'

yz

2021-03-07 0b0f1db860f93f5203ac9c8e4402d4ebec4027c8

 src/views/user/archivesEdit.vue

@@ -26,7 +26,7 @@
            </el-upload>
            <!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
            <div class="title-da">
              {{ empBaseInfoForm.empNumb }}
              编号：{{ empBaseInfoForm.empNumb }}
            </div>
          </div>
          <ul class="jbxx-ul" style="height: 68vh;overflow: auto">
@@ -198,7 +198,7 @@
                编辑
              </el-button>
              <el-button
                v-if="readon"
                v-if="this.readon"
                style="position:absolute;right: 120px"
                class="filter-item"
                type="primary"
@@ -221,17 +221,29 @@
                <el-row style="width: 100%;">
                  <el-col :span="8">
                    <el-form-item label="档案号" prop="archivesNumb">
                      <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="姓名" prop="empName">
                      <el-input v-model="empBaseInfoForm.empName" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.empName" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>

                  <el-col :span="8">
                    <el-form-item label="身份证号码" prop="certificateNumb">
                      <el-input
                        v-model="empBaseInfoForm.certificateNumb"
                        :disabled="this.readon ? false : true"
                        @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
                      />
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="性别" prop="sex">
                      <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in sexOptions"
                          :key="dict.dicItemCode"
@@ -241,13 +253,11 @@
                      </el-select>
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="部门(护卫点)" prop="deptId">
                      <treeselect
                        v-model="empBaseInfoForm.deptId"
                        :disabled="readon ? false : true"
                        :disabled="this.readon ? false : true"
                        :multiple="false"
                        :options="depts"
                        :clear-value-text="$t('common.clear')"
@@ -260,7 +270,7 @@
                    <el-form-item label="岗位" prop="jobName">
                      <el-autocomplete
                        v-model="empBaseInfoForm.jobName"
                        :disabled="readon ? false : true"
                        :disabled="this.readon ? false : true"
                        class="inline-input"
                        :fetch-suggestions="querySearchJob"
                        placeholder="请输入岗位"
@@ -268,9 +278,12 @@
                      />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="员工类别" prop="empType">
                      <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in empTypeOptions"
                          :key="dict.dicItemCode"
@@ -280,11 +293,9 @@
                      </el-select>
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="民族" prop="nation">
                      <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in nationOptions"
                          :key="dict.dicItemCode"
@@ -296,12 +307,15 @@
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="年龄" prop="age">
                      <el-input v-model="empBaseInfoForm.age" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.age" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="婚姻状态" prop="marriage">
                      <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in marriageOptions"
                          :key="dict.dicItemCode"
@@ -311,13 +325,11 @@
                      </el-select>
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="身份证有效期" prop="certificateValidity">
                      <el-date-picker
                        v-model="empBaseInfoForm.certificateValidity"
                        :disabled="readon ? false : true"
                        :disabled="this.readon ? false : true"
                        type="date"
                        value-format="yyyy-MM-dd"
                        placeholder="选择日期"
@@ -326,12 +338,15 @@
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="身高(cm)" prop="stature">
                      <el-input v-model="empBaseInfoForm.stature" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.stature" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="政治面貌" prop="politics">
                      <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in statusOptions"
                          :key="dict.dicItemCode"
@@ -341,13 +356,11 @@
                      </el-select>
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="出生日期" prop="birthdate">
                      <el-date-picker
                        v-model="empBaseInfoForm.birthdate"
                        :disabled="readon ? false : true"
                        :disabled="this.readon ? false : true"
                        type="date"
                        value-format="yyyy-MM-dd"
                        placeholder="选择日期"
@@ -356,7 +369,7 @@
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="最高学历" prop="education">
                      <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in educationOptions"
                          :key="dict.dicItemCode"
@@ -366,9 +379,12 @@
                      </el-select>
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="籍贯" prop="nativePlaceName">
                      <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in nativePlaceOptions"
                          :key="dict.dicItemCode"
@@ -378,33 +394,32 @@
                      </el-select>
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="户籍地址" prop="censusAddress">
                      <el-input v-model="empBaseInfoForm.censusAddress" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.censusAddress" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="现住址" prop="currentAddress">
                      <el-input v-model="empBaseInfoForm.currentAddress" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.currentAddress" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="保安员回执" prop="returnReceipt">
                      <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="readon ? false : true" />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="保安员回执" prop="returnReceipt">
                      <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="保安员证号" prop="guardNumb">
                      <el-input v-model="empBaseInfoForm.guardNumb" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.guardNumb" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="档案情况" prop="archivesStatus">
                      <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in archivesStatusOptions"
                          :key="dict.dicItemCode"
@@ -414,28 +429,32 @@
                      </el-select>
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="银行名称" prop="bankName">
                      <el-input v-model="empBaseInfoForm.bankName" :disabled="readon ? false : true" />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="银行名称" prop="bankName">
                      <el-input v-model="empBaseInfoForm.bankName" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="银行账号" prop="bankNumb">
                      <el-input v-model="empBaseInfoForm.bankNumb" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.bankNumb" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="电话号码" prop="telePhone">
                      <el-input v-model="empBaseInfoForm.telePhone" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.telePhone" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="入职日期" prop="entryDate">
                      <el-date-picker
                        v-model="empBaseInfoForm.entryDate"
                        :disabled="readon ? false : true"
                        :disabled="this.readon ? false : true"
                        type="date"
                        value-format="yyyy-MM-dd"
                        placeholder="选择日期"
@@ -443,11 +462,9 @@
                      />
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="保险类型" prop="insuranceType">
                      <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in insuranceTypeOptions"
                          :key="dict.dicItemCode"
@@ -459,24 +476,25 @@
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="社保电脑号" prop="socialNumb">
                      <el-input v-model="empBaseInfoForm.socialNumb" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.socialNumb" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="招聘介绍人" prop="introducer">
                      <el-input v-model="empBaseInfoForm.introducer" :disabled="readon ? false : true" />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="招聘介绍人" prop="introducer">
                      <el-input v-model="empBaseInfoForm.introducer" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="入司工龄" prop="seniority">
                      <el-input v-model="empBaseInfoForm.seniority" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.seniority" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="工作证" prop="empCardStatus">
                      <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in empCardStatusOptions"
                          :key="dict.dicItemCode"
@@ -486,21 +504,22 @@
                      </el-select>
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="家庭成员及关系" prop="family">
                      <el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
                    </el-form-item>
                  </el-col>

                </el-row>
                <el-row>
                  <el-col :span="8">
                    <el-form-item label="家庭成员及关系" prop="family">
                      <el-input v-model="empBaseInfoForm.family" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="紧急联系电话" prop="urgencyPhone">
                      <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
                      <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="this.readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="员工手册" prop="handbookStatus">
                      <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in handbookStatusOptions"
                          :key="dict.dicItemCode"
@@ -512,7 +531,7 @@
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="相关证件" prop="certificateList">
                      <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="this.readon ? false : true">
                        <el-option
                          v-for="dict in certificateListOptions"
                          :key="dict.dicItemCode"
@@ -520,15 +539,6 @@
                          :value="dict.dicItemCode"
                        />
                      </el-select>
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="身份证号码" prop="certificateNumb">
                      <el-input
                        v-model="empBaseInfoForm.certificateNumb"
                        :disabled="readon ? false : true"
                        @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
                      />
                    </el-form-item>
                  </el-col>
                </el-row>
@@ -608,14 +618,14 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="physicalExamId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="100" :formatter="typeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="100" :formatter="ecgNameFormat" />
                <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="120" :formatter="typeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="120" :formatter="ecgNameFormat" />
                <el-table-column show-overflow-tooltip="true" prop="conclusion" label="体检结论" />
                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
              </el-table>
              <pagination
@@ -656,10 +666,10 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="contractId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="signingDate" label="合同签订日期" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="endDate" label="合同结束日期" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="contractStatus" label="合同状态" width="100" :formatter="contractStatusFormat" />
                <el-table-column show-overflow-tooltip="true" prop="signingDate" label="合同签订日期" />
                <el-table-column show-overflow-tooltip="true" prop="endDate" label="合同结束日期" />
                <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" />
                <el-table-column show-overflow-tooltip="true" prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
                <el-table-column show-overflow-tooltip="true" prop="transactor" label="合同办理人" />
              </el-table>
              <pagination
@@ -727,7 +737,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editLeaveInfo(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onleaveInfoDataselection')">删除</span>
@@ -773,7 +783,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editResign(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onresignDataselection')">删除</span>
@@ -816,7 +826,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editDimissionAttend(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'dimissionAttendDataselection')">删除</span>
@@ -896,7 +906,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editUnemployment(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'unemploymentDataselection')">删除</span>
@@ -940,7 +950,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editInsurance(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'oninsuranceDataselection')">删除</span>
@@ -986,7 +996,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editAccidentCases(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'accidentCasesDataselection')">删除</span>
@@ -1039,7 +1049,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editOccupational(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'occupationalDataselection')">删除</span>
@@ -1092,7 +1102,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editLaborTrouble(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'laborTroubleDataselection')">删除</span>
@@ -1139,7 +1149,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editBadRecord(scope.row)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onbadRecordDataselection')">删除</span>
@@ -1182,7 +1192,7 @@
                    <span v-text="getIndex(scope.$index)" />
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="100">
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <!--                  <el-button type="text" size="small" @click="editRemarkInfo(scope.row)">编辑</el-button>-->
                    <!--                  <el-button-->
@@ -1234,8 +1244,8 @@
                  </el-col>
                </el-row>
                <el-container style="background-color: #fff;">
                  <el-aside width="210px" style="background-color: #fff;text-align: center;">
                    <h4>{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
                  <el-aside width="210px" style="background-color: #fff;text-align: center;padding-top: 0">
                    <h4 style="margin-top: 0">{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
                    <el-timeline>
                      <el-timeline-item
                        v-for="(activity, index) in activities"
@@ -5697,11 +5707,10 @@
    }

    .title-da {
      margin-left: -102px;
      text-align: center;
      padding: 10px;
      padding-bottom: 7px;
      margin-bottom: 19px;
      padding-top: 8px;
      font-weight: 700;
      color: #333;
      height: 40px;
    }

  }
@@ -5717,15 +5726,27 @@
      height: 30px;
      line-height: 30px;
      padding-left: 15px;
      border-left: 4px solid #a00515;
      //border-left: 4px solid #a00515;
      margin: 40px 0 20px;
      color: #000;
      font-weight: 700;
      position: relative;
    }

    .jbxx .jbxxTitle {
      margin: 20px 0;
    }

    .jbxxTitle::before {
      content: '';
      position: absolute;
      left: -10px;
      top: 50%;
      transform: translateY(-50%);
      background-color: #a00515;
      border-radius: 50%;
      display: inline-block;
      height: 15px;
      width: 15px;
    }

    .jbxxTitle::after {
@@ -5934,7 +5955,7 @@
.table-button {
  color: #a00515;
  display: inline-block;
  width: 50%;
  width: 45%;
  cursor: pointer;
}

@@ -5945,7 +5966,7 @@
}

.jbxx-ul {
  margin: 0;
  margin-top: 10px;
  font-size: 14px;
  list-style: none;
  padding-left: 10px !important;
@@ -6011,6 +6032,32 @@
</style>
<style lang="scss">
.da-dialog {
  button.el-dialog__headerbtn {
      height: 30px;
      width: 30px;
    background-color: #333;
    opacity: 0.4;
      line-height: 30px;
      border-radius: 50%;
    i {
      color: #fff !important;
    }
    &:hover {
      opacity: 0.5;
    }
  }
  .el-pagination {
    width: 98%;
    text-align: right;
  }
  .el-aside {
    height: 750px;
    overflow: hidden;
  }
  li.el-timeline-item {
    padding-bottom: 1px;
    height: 35px;
  }
.el-dialog__title {
  font-weight: 700;
}