完成人员

src/api/grassrootsregistration/bdglmeeting.js

@@ -124,7 +124,7 @@ export function getWeiShu(query) {
 // 获取在线人员
 export function getZaiRen(data, reign) {
   return request({
-    url: '/peopleManage/people/list',
+    url: '/grassrootsregistration/common/list',
     method: 'get',
     params: { deptId: data, reign }
   })

src/views/peopleChuRu/bdglLeave/index.vue

@@ -113,14 +113,22 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status1 == 0">未审批</el-col>
-          <el-col v-if="scope.row.status1 == 1">已通过</el-col>
-          <el-col v-if="scope.row.status1 == 2" :title="scope.row.reasons"
+          <el-col v-if="scope.row.status1 == 0" style="color: #ffba00"
+            >未审批</el-col
+          >
+          <el-col v-if="scope.row.status1 == 1" style="color: #13ce66"
+            >已通过</el-col
+          >
+          <el-col
+            v-if="scope.row.status1 == 2"
+            :title="scope.row.reasons"
+            style="color: #ff4949"
             >已驳回</el-col
           >
           <el-col
             v-if="scope.row.status1 == 3"
             :title="scope.row.bdglLeaveFus[0].specialApproval"
+            style="color: #1f73d7"
             >特殊审批</el-col
           >
         </template></el-table-column
@@ -138,14 +146,22 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status2 == 0">未审批</el-col>
-          <el-col v-if="scope.row.status2 == 1">已通过</el-col>
-          <el-col v-if="scope.row.status2 == 2" :title="scope.row.reasons"
+          <el-col v-if="scope.row.status2 == 0" style="color: #ffba00"
+            >未审批</el-col
+          >
+          <el-col v-if="scope.row.status2 == 1" style="color: #13ce66"
+            >已通过</el-col
+          >
+          <el-col
+            v-if="scope.row.status2 == 2"
+            :title="scope.row.reasons"
+            style="color: #ff4949"
             >已驳回</el-col
           >
           <el-col
             v-if="scope.row.status2 == 3"
             :title="scope.row.bdglLeaveFus[1].specialApproval"
+            style="color: #1f73d7"
             >特殊审批</el-col
           >
         </template>
@@ -163,17 +179,23 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status3 == 0">未审批</el-col>
-          <el-col v-if="scope.row.status3 == 1">已通过</el-col>
-          <el-col v-if="scope.row.status3 == 2" :title="scope.row.reasons"
-            >已驳回</el-col
+          <el-col v-if="scope.row.status3 == 0" style="color: #ffba00"
+            >未审批</el-col
+          >
+          <el-col v-if="scope.row.status3 == 1" style="color: #13ce66"
+            >已通过</el-col
           >
           <el-col
-            v-if="scope.row.status3 == 3"
-            :title="scope.row.bdglLeaveFus[2].specialApproval"
+            v-if="scope.row.status3 == 2"
+            :title="scope.row.reasons"
+            style="color: #ff4949"
+            >已驳回</el-col
+          >
+          <el-col v-if="scope.row.status3 == 3" style="color: #1f73d7"
             >特殊审批</el-col
           >
         </template>
+        <!-- :title="scope.row.bdglLeaveFus[2].specialApproval" -->
       </el-table-column>
       <el-table-column
         label="四级审批人"
@@ -188,16 +210,22 @@
         width="100"
       >
         <template slot-scope="scope">
-          <el-col v-if="scope.row.status4 == 0">未审批</el-col>
-          <el-col v-if="scope.row.status4 == 1">已通过</el-col>
-          <el-col v-if="scope.row.status4 == 2" :title="scope.row.reasons"
-            >已驳回</el-col
+          <el-col v-if="scope.row.status4 == 0" style="color: #ffba00"
+            >未审批</el-col
+          >
+          <el-col v-if="scope.row.status4 == 1" style="color: #13ce66"
+            >已通过</el-col
           >
           <el-col
-            v-if="scope.row.status4 == 3"
-            :title="scope.row.bdglLeaveFus[3].specialApproval"
+            v-if="scope.row.status4 == 2"
+            :title="scope.row.reasons"
+            style="color: #ff4949"
+            >已驳回</el-col
+          >
+          <el-col v-if="scope.row.status4 == 3" style="color: #1f73d7"
             >特殊审批</el-col
           >
+          <!-- :title="scope.row.bdglLeaveFus[3].specialApproval" -->
         </template>
       </el-table-column>
       <el-table-column
@@ -567,9 +595,9 @@
             <el-option
               v-for="(item, i) in yongHu"
               :key="i"
-              :label="item.userName"
+              :label="item.nickName"
               :value="item.userId"
-              @click.native="oneRen(item.userName)"
+              @click.native="oneRen(item.nickName)"
             >
             </el-option>
           </el-select>
@@ -584,9 +612,9 @@
             <el-option
               v-for="(item, i) in yongHu"
               :key="i"
-              :label="item.userName"
+              :label="item.nickName"
               :value="item.userId"
-              @click.native="twoRen(item.userName)"
+              @click.native="twoRen(item.nickName)"
             >
             </el-option>
           </el-select>
@@ -601,9 +629,9 @@
             <el-option
               v-for="(item, i) in yongHu"
               :key="i"
-              :label="item.userName"
+              :label="item.nickName"
               :value="item.userId"
-              @click.native="thereRen(item.userName)"
+              @click.native="thereRen(item.nickName)"
             >
             </el-option>
           </el-select>
@@ -618,9 +646,9 @@
             <el-option
               v-for="(item, i) in yongHu"
               :key="i"
-              :label="item.userName"
+              :label="item.nickName"
               :value="item.userId"
-              @click.native="fourRen(item.userName)"
+              @click.native="fourRen(item.nickName)"
             >
             </el-option>
           </el-select>
@@ -917,6 +945,7 @@ export default {
     getList() {
       this.loading = true;
       listBdglLeave(this.queryParams).then((response) => {
+        console.log(response);
         this.bdglLeaveList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -106,13 +106,31 @@
         </template>
       </el-table-column>
       <el-table-column label="借调事由" align="center" prop="transferReason" />
-      <el-table-column label="职位" align="center" prop="jobTitle" />
-      <el-table-column label="军衔" align="center" prop="rankId" />
+      <el-table-column label="职位" align="center" prop="jobTitle">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.post_Level"
+            :value="scope.row.jobTitle"
+          />
+        </template>
+      </el-table-column>
+      <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="creatName" /> -->
       <el-table-column label="人员状态" align="center" prop="state">
         <template slot-scope="scope">
-          <span v-if="scope.row.state == '0'">未归队</span>
-          <span v-if="scope.row.state == '1'">已归队</span>
+          <span v-if="scope.row.state == '0'" style="color: #ff4949"
+            >未归队</span
+          >
+          <span v-if="scope.row.state == '1'" style="color: #13ce66"
+            >已归队</span
+          >
         </template>
       </el-table-column>
       <el-table-column
@@ -167,7 +185,7 @@
             @open="blurSelect"
           />
         </el-form-item>
-        <el-form-item/>
+        <el-form-item />
         <el-form-item label="借调人姓名" prop="transferPeople">
           <el-select
             v-model="form.transferPeopleId"
@@ -179,7 +197,9 @@
               :key="i"
               :label="item.name"
               :value="item.id"
-              @click.native="jieRen(item.name, item.rankId, item.jobTitle)"
+              @click.native="
+                jieRen(item.name, item.rankId, item.jobTitle, item)
+              "
             >
             </el-option>
           </el-select>
@@ -246,6 +266,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "PeopleBorrow",
+  dicts: ["post_Level", "sys_user_rank"],
   components: {
     Treeselect,
   },
@@ -319,7 +340,9 @@ export default {
       this.form.transferPeopleId = null;
     },
     // 请假人选中
-    jieRen(name, rankId, jobTitle) {
+    jieRen(name, rankId, jobTitle, data) {
+      console.log(data);
+      // console.log(name, rankId, jobTitle);
       this.form.transferPeople = name;
       this.form.rankId = rankId;
       this.form.jobTitle = jobTitle;
@@ -336,16 +359,10 @@ export default {
       this.getRen(this.form.unitId, 0);
       this.ChongZhiRen();
     },
-    // // 获取人员列表
-    // getRen(id) {
-    //   getZhuChiRen(id).then((res) => {
-    //     this.renYuan = res.data;
-    //   });
-    // },
     // 获取人员
     getRen(id, num) {
       getZaiRen(id, num).then((response) => {
-        this.renYuan = response.rows;
+        this.renYuan = response.data;
       });
     },
     /** 查询人员借调列表 */
@@ -495,7 +512,7 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width:700px;
+  width: 700px;
   height: 104px;
   margin: auto;
 }