1

src/views/grassrootsregistration/bdglevens/index.vue

@@ -172,6 +172,58 @@ export default {
 
   created() {
     this.getSoulist();
+     //性别
+     this.getDicts("sys_user_sex").then((response) => {
+      this.sexList = response.data;
+    });
+    //血型
+    this.getDicts("bloodType").then((response) => {
+      this.bloodType = response.data;
+    });
+    //政治面貌
+    this.getDicts("Caucus").then((response) => {
+      this.partyIds = response.data;
+    });
+    //健康情况
+    this.getDicts("healthy").then((response) => {
+      this.healthy = response.data;
+    });
+    //婚姻情况
+    this.getDicts("marryList").then((response) => {
+      this.marryList = response.data;
+    });
+    //学历
+    this.getDicts("Degree_level").then((response) => {
+      this.educationId = response.data;
+    });
+    //婚姻情况
+    this.getDicts("degree").then((response) => {
+      this.degree = response.data;
+    });
+    //是否编制
+    this.getDicts("sys_yes_no").then((response) => {
+      this.authorizedStrength = response.data;
+    });
+    //子女情况
+    this.getDicts("sys_yw").then((response) => {
+      this.childrenList = response.data;
+    });
+    //人员类别
+    this.getDicts("personnel_type").then((response) => {
+      this.classId = response.data;
+    });
+    //职务层级
+    this.getDicts("post_Level").then((response) => {
+      this.postIds = response.data;
+    });
+    //军衔
+    this.getDicts("sys_user_rank").then((response) => {
+      this.rankIds = response.data;
+    });
+    //民族
+    this.getDicts("sys_familyName").then((response) => {
+      this.nationIds = response.data;
+    });
   },
   methods: {
     resetQuery() {

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -1,7 +1,7 @@
 <!-- 文连务会记录本领导 -->
 <template>
   <div class="arr_conten">
-    <el-form
+    <!-- <el-form
       :model="form"
       ref="form"
       :inline="true"
@@ -22,7 +22,7 @@
       <el-form-item>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
     <div v-if="status == 1">
       <ul v-for="(item, i) in lieList" :key="i + ' '">
         <li v-for="(item1, i1) in item" :key="i1">
@@ -70,20 +70,73 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" prop="unitName" />
-        <el-table-column label="会议议题" align="center" show-overflow-tooltip>
+        <el-table-column
+          label="单位"
+          align="center"
+          prop="deptId"
+          width="180"
+          :formatter="deptIdformatter"
+        />
+        <el-table-column label="姓名" align="center" prop="name" />
+        <el-table-column label="性别" align="center" prop="sex">
           <template slot-scope="scope">
-            <span>{{ onEditor(scope.row.title) }}</span>
+            <dict-tag
+              :options="dict.type.sys_user_sex"
+              :value="scope.row.sex"
+            />
           </template>
         </el-table-column>
-        <el-table-column label="主持人" align="center" prop="compereRen" />
+        <el-table-column label="年龄" align="center" prop="age" />
         <el-table-column
-          label="出席人"
+          label="身份证号"
           align="center"
-          prop="joinId"
-          show-overflow-tooltip
+          prop="idcard"
+          width="170"
         />
-        <el-table-column label="召开地点" align="center" prop="address" />
+        <el-table-column
+          label="部职别"
+          align="center"
+          width="300"
+          prop="duty"
+        />
+        <el-table-column label="职务" align="center" width="120" prop="postId">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.post_Level"
+              :value="scope.row.postId"
+            />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="等级" align="center" prop="gradeId" /> -->
+        <el-table-column
+          label="职务等级时间"
+          align="center"
+          prop="postDate"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.postDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="籍贯"
+          align="center"
+          prop="origin"
+          width="150"
+        />
+        <el-table-column
+          label="在位情况"
+          align="center"
+          prop="reign"
+          width="90"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.people_state"
+              :value="scope.row.reign"
+            />
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           align="center"
@@ -212,6 +265,32 @@ export default {
       menuRoleVisible: false,
       // 表单校验
       rules: {},
+      //性别数组
+      sexList: [],
+      //血型数组
+      bloodType: [],
+      //政治面貌
+      partyIds: [],
+      //健康状况
+      healthy: [],
+      //婚姻情况
+      marryList: [],
+      //学历
+      educationId: [],
+      //学位
+      degree: [],
+      //是否编制
+      authorizedStrength: [],
+      //子女情况
+      childrenList: [],
+      //人员类别
+      classId: [],
+      //职务层级
+      postIds: [],
+      //军衔
+      rankIds: [],
+      //单位
+      deptId: [],
       //民族
       nationIds: [],
       unitId: [],
@@ -251,6 +330,16 @@ export default {
     });
   },
   methods: {
+    //单位翻译
+    deptIdformatter(row, column) {
+      var deptName = "";
+      this.unitId.map((item) => {
+        if (item.deptId == row.deptId) {
+          deptName = item.deptName;
+        }
+      });
+      return deptName;
+    },
     chaKan(row) {
       this.queryParams.unitId = row;
       this.unitId = row;
@@ -280,7 +369,7 @@ export default {
           this.lieList = res.rows;
         });
       } else {
-        getMeetRecordList(this.form.year).then((res) => {
+        getPersonnelRosterList(this.form.year).then((res) => {
           res.rows.forEach((item) => {
             this.status = 0;
           });

src/views/peopleManage/people/index.vue

@@ -542,7 +542,6 @@
         >
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" align="center" type="index" />
-          <!-- <el-table-column label="备用手机号" align="center" prop="id" /> -->
           <el-table-column
             label="单位"
             align="center"
@@ -566,12 +565,6 @@
             prop="idcard"
             width="170"
           />
-          <!-- <el-table-column label="出生年月" align="center" prop="birthDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.birthDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="命令号" align="center" prop="command" />-->
           <el-table-column
             label="部职别"
             align="center"
@@ -602,64 +595,12 @@
               <span>{{ parseTime(scope.row.postDate, "{y}-{m}-{d}") }}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="工作岗位" align="center" prop="job" /> -->
-          <!-- <el-table-column label="技术职务" align="center" prop="skillId" />
-          <el-table-column label="技术职务时间" align="center" prop="skillDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.skillDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="技术等级" align="center" prop="levelId" />
-          <el-table-column label="技术等级时间" align="center" prop="levelDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.levelDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>-->
-          <!-- <el-table-column label="军人证号" align="center" prop="military" /> -->
-          <!-- <el-table-column label="入伍年月" align="center" prop="enlistDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.enlistDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="入伍地点" align="center" prop="enlistaddress" />-->
-          <!-- <el-table-column label="军衔" align="center" prop="rankId">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_user_rank" :value="scope.row.rankId" />
-            </template>
-          </el-table-column>-->
-          <!-- <el-table-column label="军衔时间" align="center" prop="rankDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.rankDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="民族" align="center" prop="nationId" />-->
           <el-table-column
             label="籍贯"
             align="center"
             prop="origin"
             width="150"
           />
-          <!-- <el-table-column label="人员类别" align="center" prop="classId">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.personnel_type" :value="scope.row.classId" />
-            </template>
-          </el-table-column>-->
-          <!-- <el-table-column label="学历" align="center" prop="educationId" width="100">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.Degree_level" :value="scope.row.educationId" />
-            </template>
-          </el-table-column>-->
-          <!-- <el-table-column label="学位" align="center" prop="degreeId">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.degree" :value="scope.row.degreeId" />
-            </template>
-          </el-table-column>-->
-          <!-- <el-table-column label="毕业时间" align="center" prop="graduationDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.graduationDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>-->
-          <!-- <el-table-column label="毕业院校" align="center" prop="school" width="120" /> -->
           <el-table-column
             label="在位情况"
             align="center"
@@ -673,93 +614,6 @@
               />
             </template>
           </el-table-column>
-          <!-- <el-table-column label="党团情况" align="center" prop="partyId">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.Caucus" :value="scope.row.partyId" />
-            </template>
-          </el-table-column>
-          <el-table-column label="党团时间" align="center" prop="partyDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.partyDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="培训经历" align="center" prop="training" />
-          <el-table-column label="简历" align="center" prop="readmeFile" />
-          <el-table-column label="简历名称" align="center" prop="readmeFileName" />
-          <el-table-column label="奖惩情况" align="center" prop="prize" />
-          <el-table-column label="婚姻情况" align="center" prop="marryList">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.marryList" :value="scope.row.marryList" />
-            </template>
-          </el-table-column>
-          <el-table-column label="子女情况" align="center" prop="childrenList">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_yw" :value="scope.row.childrenList" />
-            </template>
-          </el-table-column>
-          <el-table-column label="部别" align="center" prop="unitId" />
-          <el-table-column label="照片" align="center" prop="avatar" />
-          <el-table-column label="出生地址" align="center" prop="address" />
-          <el-table-column label="手机号码" align="center" prop="phone" />
-          <el-table-column label="0在位，1调出" align="center" prop="status" />
-          <el-table-column label="0在位，1调出" align="center" prop="createtimes" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createtimes, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-         
-          <el-table-column label="0在位，1休假，2出差,3借调，4学习，5执行任务,6外诊，7其他" align="center" prop="reign" />
-          <el-table-column label="工作时间" align="center" prop="jobTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.jobTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="健康情况" align="center" prop="healthy">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.healthy" :value="scope.row.healthy" />
-            </template>
-          </el-table-column>
-          <el-table-column label="血型" align="center" prop="bloodType">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.bloodType" :value="scope.row.bloodType" />
-            </template>
-          </el-table-column>
-          <el-table-column label="职务时间" align="center" prop="postTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.postTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="专业" align="center" prop="major" />
-          <el-table-column label="入学时间" align="center" prop="admissionTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.admissionTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="手机型号" align="center" prop="mobilePhoneModel" />
-          <el-table-column label="保障卡号" align="center" prop="guaranteeCardNo" />
-          <el-table-column label="工资卡号" align="center" prop="payrollCardNo" />
-          <el-table-column label="是否纳编" align="center" prop="authorizedStrength">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.authorizedStrength" />
-            </template>
-          </el-table-column>
-          <el-table-column label="专业是否对口" align="center" prop="aboral" />
-          <el-table-column label="家庭住址" align="center" prop="live" />
-          <el-table-column label="部门ID" align="center" prop="deptId" />
-          <el-table-column label="用户ID" align="center" prop="userId" />
-          <el-table-column label="现军衔" align="center" prop="nowMilitaryRank">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.nowMilitaryRank" />
-            </template>
-          </el-table-column>
-          <el-table-column label="待遇级别" align="center" prop="treatmentLevel" />
-          <el-table-column label="现待遇级别时间" align="center" prop="rankUpgradeTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.rankUpgradeTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="部门名称" align="center" prop="deptName" />
-          <el-table-column label="备用手机号" align="center" prop="phoneStandby" />-->
           <el-table-column
             label="操作"
             align="center"