Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-15 5253c8bd5ecd2fecd8fefe6b7c7728e3058db5d3

 src/views/yunpan/fujian.vue

@@ -13,18 +13,18 @@
          </el-col>
        </el-row>
        <el-form v-show="advancedQueryShow" ref="queryform" :model="queryform">
          <el-row>
            <el-col :span="3">员工编号：
              <el-input v-model="queryform.empNumb" size="small" maxlength="20" style="width:85px" />
          <el-row style="margin: 10px 0px;">
            <el-col :span="4">员工编号：
              <el-input v-model="queryform.empNumb" size="small" maxlength="20" style="width:140px" />
            </el-col>
            <el-col :span="3">姓名：
              <el-input v-model="queryform.empName" size="small" maxlength="10" style="width:110px" />
            <el-col :span="4">姓名：
              <el-input v-model="queryform.empName" size="small" maxlength="10" style="width:140px" />
            </el-col>
            <el-col :span="4">身份证号：
              <el-input v-model="queryform.certificateNumb" size="small" maxlength="18" style="width:140px" />
            </el-col>
            <el-col :span="3">护卫点：
              <el-input v-model="queryform.deptName" size="small" maxlength="20" style="width:100px" />
            <el-col :span="4">护卫点：
              <el-input v-model="queryform.deptName" size="small" maxlength="20" style="width:140px" />
            </el-col>
            <el-col :span="8">入职日期：
              <el-date-picker
@@ -40,7 +40,13 @@
                :picker-options="pickerOptions"
              />
            </el-col>
            <el-col :span="3">
          </el-row>
          <el-row>
            <el-col :span="20">
              文件名:
              <el-input v-model="queryform.fileName" size="small" maxlength="20" style="width:140px" />
            </el-col>
            <el-col :span="4">
              <el-button size="mini" class="hr-but-all" type="primary" @click="findEmpAccessoryAll()">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetQueryform()">重置</el-button>
            </el-col>
@@ -634,6 +640,7 @@
        certificateNumb: '',
        deptName: '',
        entryDate: '',
        fileName: '',
        sex: [],
        education: [],
        politics: [],