Merge remote-tracking branch 'origin/master'

yz_08

2021-03-05 361a3366bc740f94ebea8f81de33bf2a68defaa5

 src/views/user/inemployees.vue

@@ -193,7 +193,7 @@
          style="width: 100%;color: #000;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column label="操作" width="120">
          <el-table-column label="操作" width="130">
            <template slot-scope="scope">
              <!--              <el-button-->
              <!--                type="text"-->
@@ -204,11 +204,11 @@
              <!--              <el-button type="text" size="small" @click="editEmpBase(scope.row)">编辑</el-button>-->

              <span
                style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
                style="color: #a00515;display: inline-block;width: 40%;cursor: pointer"
                @click="editArchives(scope.row)"
              >档案</span>
              <span
                style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
                style="color: #a00515;display: inline-block;width: 40%;cursor: pointer"
                @click="editEmpBase(scope.row)"
              >编辑</span>
            </template>