yaoshi日记的样式

src/api/grassrootsregistration/bdglmeeting.js

@@ -172,4 +172,22 @@ export function getAll(query) {
     url: '/peopleManage/people/list',
     method: 'get',
   })
+}
+
+// 获取人员名册列表
+export function getXiangQis(query) {
+  return request({
+    url: '/grassrootsregistration/personnelRoster/getPeopleList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查看人员名册列表
+export function getRenYuanXiangQing(query) {
+  return request({
+    url: '/grassrootsregistration/personnelRoster/getDeptXiangQi',
+    method: 'get',
+    params: { deptId: query }
+  })
 }

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -661,6 +661,7 @@
                     v-model="item1.examineDate"
                     type="datetime"
                     placeholder="选择日期时间"
+                    class="sun"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -691,70 +692,72 @@
           </div>
           <div class="jiben">临时来队亲属</div>
           <div class="box3">
-            <el-form v-for="(item1, i) in relatives" :key="i">
-              <el-form-item label="" prop="">
-                <el-select v-model="item1.peopleId" placeholder="军人姓名">
-                  <el-option
-                    v-for="item in renYuan"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    class="input_xiala"
+            <div class="box4">
+              <el-form v-for="(item1, i) in relatives" :key="i">
+                <el-form-item label="" prop="">
+                  <el-select v-model="item1.peopleId" placeholder="军人姓名">
+                    <el-option
+                      v-for="item in renYuan"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                      class="input_xiala"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="" prop="">
+                  <el-input
+                    v-model="item1.name"
+                    placeholder="家属姓名"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="" prop="">
+                  <el-input
+                    v-model="item1.relation"
+                    placeholder="关系"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="" prop="">
+                  <el-date-picker
+                    v-model="item1.comeDate"
+                    type="date"
+                    :editable="false"
+                    size="mini"
+                    placeholder="来队时间"
+                    value-format="yyyy-MM-dd"
                   >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.name"
-                  placeholder="家属姓名"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.relation"
-                  placeholder="关系"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-date-picker
-                  v-model="item1.comeDate"
-                  type="date"
-                  :editable="false"
-                  size="mini"
-                  placeholder="来队时间"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-date-picker
-                  v-model="item1.leaveDate"
-                  type="date"
-                  :editable="false"
-                  size="mini"
-                  placeholder="离队时间"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="addFormss"
-                  v-if="i == relatives.length - 1"
-                ></el-button>
-                <el-button
-                  type="primary"
-                  icon="el-icon-delete"
-                  size="mini"
-                  v-if="i > 0"
-                  @click="delFormss(i)"
-                ></el-button>
-              </el-form-item>
-            </el-form>
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="" prop="">
+                  <el-date-picker
+                    v-model="item1.leaveDate"
+                    type="date"
+                    :editable="false"
+                    size="mini"
+                    placeholder="离队时间"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="addFormss"
+                    v-if="i == relatives.length - 1"
+                  ></el-button>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-delete"
+                    size="mini"
+                    v-if="i > 0"
+                    @click="delFormss(i)"
+                  ></el-button>
+                </el-form-item>
+              </el-form>
+            </div>
           </div>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -1796,15 +1799,16 @@ export default {
 }
 /* 表单长度 */
 ::v-deep .box3 .el-form-item__content {
-  width: 167px;
+  width: 140px;
   display: flex;
 }
 ::v-deep .box3 .el-input__inner {
-  width: 164px;
+  width: 142px;
   height: 37px;
+  margin-bottom: 18px;
 }
-.box3 .el-button:nth-child(1) {
-  margin-left: 795px;
+::v-deep .el-select__caret .el-input__icon .el-icon-arrow-up {
+  margin-top: -10px;
 }
 /* 添加删除按钮 */
 ::v-deep .box3 .el-button {
@@ -1812,7 +1816,7 @@ export default {
   height: 32px;
   text-align: center;
   margin-right: 3px;
-  margin-top: 10px;
+  margin-top: 2px;
   margin-bottom: 10px;
 }
 ::v-deep .box3 .el-button .el-icon-plus {
@@ -1835,6 +1839,9 @@ export default {
 .box3 .el-form-item {
   margin-bottom: 0px;
 }
+::v-deep .el-select__caret {
+  margin-top: -10px !important;
+}
 
 .el-dialog__body {
   color: #fff;
@@ -1926,18 +1933,21 @@ export default {
 ::v-deep .el-tree-node__content:hover {
   color: #fff;
   background-color: #003156;
-  background-image: url('../../../assets/images/选中.png');
+  background-image: url("../../../assets/images/选中.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
-::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
+::v-deep
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
   color: #fff !important;
   background-color: #003156;
-  background-image: url('../../../assets/images/选中.png');
+  background-image: url("../../../assets/images/选中.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
-::v-deep .el-tree-node__label{
+::v-deep .el-tree-node__label {
   color: #fff !important;
 }
 </style>

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -656,7 +656,10 @@ import {
   getDept,
   treeselect,
 } from "@/api/peopleManage/people";
-import { getXiangQi } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getXiangQis,
+  getRenYuanXiangQing,
+} from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "People",
@@ -903,9 +906,9 @@ export default {
       value: null,
     };
   },
-  updated() {
-    // this.changeColor();
-  },
+  // updated() {
+  //   this.changeColor();
+  // },
   created() {
     this.getList();
     //性别
@@ -975,18 +978,18 @@ export default {
   },
   methods: {
     // 查询人员名册
-    // xiangQi(id) {
-    //   // console.log(id);
-    //   // getXiangQi(id).then((res) => {
-    //   //   // console.log(res.data[0]);
-    //   //  this.renshu=res.data[0]
-    //   // });
-    // },
+    xiangQi(id) {
+      // console.log(id);
+      // getXiangQi(id).then((res) => {
+      //   // console.log(res.data[0]);
+      //  this.renshu=res.data[0]
+      // });
+    },
     /** 查询人员管理列表 */
     getList() {
       this.loading = true;
-      getXiangQi(this.queryParams).then((response) => {
-        console.log(response);
+      console.log(this.queryParams);
+      getXiangQis(this.queryParams).then((response) => {
         this.peopleList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1131,11 +1134,12 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      this.xiangQi(row.deptId);
       // 是否隐藏按钮
+      console.log(row);
       this.opens = false;
-      const id = row.id || this.ids;
-      getPeople(id).then((response) => {
+      // const id = row.id || this.ids;
+      const deptId = row.deptId;
+      getRenYuanXiangQing(deptId).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看人员名册";
         this.menuRoleVisible = true;
@@ -1145,7 +1149,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除人员管理编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除人员管理的数据项？")
         .then(function () {
           return delPeople(ids);
         })

src/views/peopleChuRu/bdglLeave/index.vue

@@ -1384,4 +1384,7 @@ export default {
 ::v-deep .el-table .el-table__body .el-table__row.hover-row td {
   background-color: #004d86;
 }
+::v-deep .el-table__fixed-right {
+  height: 100% !important;
+}
 </style>