1

src/api/combatduty/grassdutyinfo.js

@@ -55,7 +55,15 @@ export function exportGrassdutyinfo(query) {
 // 查询人员管理列表
 export function listPeople(query) {
   return request({
-    url: '/peopleManage/people/list',
+    url: '/grassrootsregistration/common/list',
+    method: 'get',
+    params: query
+  })
+}
+// 翻译查询人员管理列表
+export function listPeoples(query) {
+  return request({
+    url: '/peopleManage/people/getlist',
     method: 'get',
     params: query
   })

src/api/combatduty/militarydutyinfo.js

@@ -60,6 +60,14 @@ export function listPeople(query) {
     params: query
   })
 }
+// 查询人员管理列表
+export function listPeoples(query) {
+  return request({
+    url: '/grassrootsregistration/common/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询部门下拉树结构
 export function treeselect() {

src/api/grassrootsregistration/bdgldiary.js

@@ -69,3 +69,11 @@ export function exportBdgShuju(query) {
     params: { date: query }
   })
 }
+// 查询所在单位首长(用户，包含自己)
+export function getUserzs(params) {
+  return request({
+    url: 'system/user/list',
+    method: 'get',
+    params
+  })
+}

src/components/look_word/bdgldiary.vue

@@ -846,7 +846,9 @@
           <td colspan="3" style="border: none"></td>
           <td colspan="6" style="border: none"></td>
           <td colspan="2" height="40" style="border: none">
-            <p style="border: none; font-family: 'songti'">连队首长签字:</p>
+            <p style="border: none; font-family: 'songti'">
+              连队首长签字: {{ message.sz }}
+            </p>
           </td>
 
           <td colspan="3" style="border: none; font-family: 'songti'">
@@ -910,6 +912,7 @@ export default {
     this.xunlian();
     this.qingjias();
   },
+  mounted() {},
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style);

src/components/look_word/bdglpublicproperty.vue

@@ -7,7 +7,7 @@
           font-size: 16pt;
           font-weight: 600;
           color: black;
-          font-family: 'heiti'
+          font-family: 'heiti';
         "
       >
         《营产、公物管理登记簿》
@@ -16,7 +16,7 @@
       <!-- <div class="fTitle">大队连务会记录本</div> -->
       <!-- <div class="fTitle">营产、公物管理登记簿</div> -->
       <table
-      class="b1"
+        class="b1"
         border="1"
         style="
           border-collapse: collapse;
@@ -33,46 +33,73 @@
         bordercolor="black"
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">营产，公物管理登记簿</p>-->
-        <tbody style="font-size: 15px;font-weight: 500;">
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'heiti'">
+        <tbody style="font-size: 15px; font-weight: 500">
+          <tr
+            class="JR_tr"
+            style="font-size: 16px; font-weight: 600; font-family: 'heiti'"
+          >
             <th width="47" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">序号</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                序号
+              </p>
             </th>
             <th width="66" valign="center" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">名称</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                名称
+              </p>
             </th>
             <th width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">规格型号</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                规格型号
+              </p>
             </th>
             <th width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">数量</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                数量
+              </p>
             </th>
             <th width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">单 价</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                单 价
+              </p>
             </th>
             <th width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">总价值</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                总价值
+              </p>
             </th>
             <th width="122" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">装备时间</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                装备时间
+              </p>
             </th>
             <th width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">保管人</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                保管人
+              </p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">取得方式</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                取得方式
+              </p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">质量状况</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                质量状况
+              </p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">固定资产负责人</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                固定资产负责人
+              </p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0;font-family: 'heiti'">放置地点</p>
+              <p align="center" style="margin: 10px 0; font-family: 'heiti'">
+                放置地点
+              </p>
             </th>
             <th width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center" style=";font-family: 'heiti'">备注</p>
+              <p align="center" style="font-family: 'heiti'">备注</p>
             </th>
           </tr>
 
@@ -109,7 +136,7 @@
               <p align="center">{{ message.quality }}</p>
             </td>
             <td width="75" valign="center" nowrap="" class="JR_right">
-              <p align="center">是否</p>
+              <p align="center">是</p>
             </td>
             <td width="75" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ message.address }}</p>

src/main.js

@@ -66,7 +66,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.handleTree = handleTree
 Vue.prototype.getNowWeek = getNowWeek
-Vue.prototype.$bus=  new Vue();
+Vue.prototype.$bus = new Vue();
 // originVal 后台返回的中国标准时间
 Vue.filter('dataFormat', originVal => {
   const dt = new Date(originVal)

src/views/combatduty/grassdutyinfo/index.vue

@@ -65,7 +65,7 @@
           >删除</el-button
         >
       </el-col>
-         <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -105,11 +105,16 @@
           />
           <!-- <el-table-column label="单位" align="center" prop="unitId" :formatter="unitIdFormat" /> -->
           <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
-          <el-table-column
+          <!-- <el-table-column
             label="值班首长"
             align="center"
             prop="chiefDutyId"
             :formatter="chiefDutyIdFormat"
+          /> -->
+          <el-table-column
+            label="值班首长"
+            align="center"
+            prop="chiefDutyName"
           />
           <el-table-column
             label="值班首长职务"
@@ -143,11 +148,16 @@
             width="120"
           />
           <!-- <el-table-column label="值班员" align="center" prop="dutyOffierName" /> -->
-          <el-table-column
+          <!-- <el-table-column
             label="值班员"
             align="center"
             prop="dutyOffierId"
             :formatter="dutyOffierIdFormat"
+          /> -->
+          <el-table-column
+            label="值班员"
+            align="center"
+            prop="dutyOffierName"
           />
           <el-table-column
             label="值班员职务"
@@ -636,9 +646,9 @@ import {
   addGrassdutyinfo,
   updateGrassdutyinfo,
   exportGrassdutyinfo,
-  rllist,
   listPeople,
   getDept,
+  listPeoples,
 } from "@/api/combatduty/grassdutyinfo";
 import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 import { getUserProfile } from "@/api/system/user";
@@ -707,19 +717,27 @@ export default {
       },
       danWie: "",
       deptId: null,
+      // 获取全部人员列表
+      QuanRenList: [],
     };
   },
   created() {
     this.getUser();
     this.getList();
     this.gettreeselect();
-    this.getrylist();
     this.treeselect();
+    this.getQuanRen();
   },
   methods: {
+    // 获取全部人员列表
+    getQuanRen() {
+      listPeoples().then((res) => {
+        console.log(res);
+      });
+    },
     // 点击外面时间触发
     tiemes() {
-      this.queryParams.type=null
+      this.queryParams.type = null;
       this.getList();
     },
     // 获取登录信息
@@ -742,10 +760,10 @@ export default {
       });
     },
     //获取人员
-    getrylist() {
-      listPeople().then((res) => {
+    getrylist(id) {
+      listPeople({ deptId: id }).then((res) => {
         if (res.code == 200) {
-          this.rylist = res.rows;
+          this.rylist = res.data;
         }
       });
     },
@@ -856,6 +874,7 @@ export default {
       this.qdflg = 1;
       this.form.unitName = this.danWie;
       this.form.unitId = this.deptId;
+      this.getrylist(this.form.unitId);
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -867,6 +886,7 @@ export default {
         this.open = true;
         this.title = "修改基层值班";
         this.qdflg = 2;
+        this.getrylist(this.form.unitId);
       });
     },
     /** 提交按钮 */
@@ -923,7 +943,7 @@ export default {
     //值班分类
     caoZuoTypefun() {
       this.queryParams.unitId = null;
-      this.queryParams.attendedTime=null
+      this.queryParams.attendedTime = null;
       this.getList();
     },
     //首长电话

src/views/combatduty/militarydutyinfo/index.vue

@@ -389,6 +389,7 @@ import {
   listPeople,
   getDept,
   getthebus,
+  listPeoples,
 } from "@/api/combatduty/militarydutyinfo";
 
 export default {
@@ -462,6 +463,12 @@ export default {
     this.getthebusfun();
   },
   methods: {
+    // 获取每个单位下的司机
+    getRen(id) {
+      listPeoples({ deptId: id }).then((res) => {
+        this.rylist = res.data;
+      });
+    },
     //岗位
     // carUnitIdFormat(row, column) {
     //   var deptName = "";
@@ -561,6 +568,7 @@ export default {
         this.open = true;
         this.title = "修改军车值班";
         this.qdflg = 2;
+        this.getRen(this.form.carUnitId);
       });
     },
     // 保存并继续编辑按钮
@@ -636,6 +644,7 @@ export default {
     carUnitNamechange(val) {
       this.form.carUnitId = val.deptId;
       this.form.carUnitName = val.deptName;
+      this.getRen(this.form.carUnitId);
     },
     numberPlateNamechange(val) {
       this.form.numberPlateId = val.id;

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -861,6 +861,7 @@ import { getDicts } from "@/api/system/dict/data";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
+import { getUserzs } from "@/api/grassrootsregistration/bdgldiary";
 export default {
   components: { Treeselect, bdgldiary },
   name: "Bdgldiary",
@@ -1060,6 +1061,9 @@ export default {
       // 数据时间的保存
       tiems: "",
       centertext: null,
+      // 获取全部首长
+      quanShou: [],
+      sz: null,
     };
   },
   created() {
@@ -1076,8 +1080,24 @@ export default {
     this.treeselect();
     // 获取数据
     this.getShuJu();
+    // 获取全部首长
+    this.getQuanShou();
   },
   methods: {
+    getShoufan(id) {
+      this.quanShou.map((item) => {
+        if (item.userId == id) {
+          this.sz = item.nickName;
+        }
+        return this.sz;
+      });
+    },
+    getQuanShou() {
+      getUserzs().then((respones) => {
+        console.log(respones);
+        this.quanShou = respones.rows;
+      });
+    },
     // 点击数据盒子
     dengJI() {
       this.dialogVisible = true;
@@ -1552,8 +1572,9 @@ export default {
         } else if (new Date(response.data.blogDate).getDay() == 6) {
           response.data.week = "星期六";
         }
-
+        this.getShoufan(response.data.lead);
         this.wordInfo = response.data;
+        this.wordInfo.sz = this.sz;
         //  response.data.blogDate
         this.title = "查看要事日记";
         this.menuRoleVisible = true;

src/views/login.vue

@@ -129,6 +129,7 @@ export default {
     this.getCookie();
   },
   methods: {
+    geta() {},
     getCode() {
       getCodeImg().then((res) => {
         this.captchaOnOff =

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -342,7 +342,11 @@
         </el-form-item>
         <el-form-item label="使用人" prop="receiveId">
           <!-- <el-input v-model="form.receiveId" placeholder="请输入使用人" /> -->
-          <el-select v-model="form.receiveId" placeholder="请选择使用人">
+          <el-select
+            v-model="form.receiveId"
+            placeholder="请选择使用人"
+            filterable
+          >
             <el-option
               class="input_xiala"
               v-for="(item, i) in renYuan"

src/views/thought/teacherFile/index.vue

@@ -20,7 +20,10 @@
         >
           <template slot-scope="scope">
             <div style="display: flex; flex-warp: warp; margin-top: 10px">
-              <div style="padding-right: 12vh; width: 40px; height: 52px" class="uploadPeople">
+              <div
+                style="padding-right: 12vh; width: 40px; height: 52px"
+                class="uploadPeople"
+              >
                 <!-- 根据后缀名控制图片显示doc还是pdf形式 -->
                 <img
                   v-if="scope.row.parentDirId == '.pdf'"
@@ -38,7 +41,7 @@
               </div>
               <!-- 文件名称 fileName -->
               <div>
-                <div style="text-align: start; width: 100%; ">
+                <div style="text-align: start; width: 100%">
                   {{ scope.row.fileName }}
                 </div>
                 <!-- 上传人 createUser -->
@@ -632,6 +635,7 @@ export default {
     // 获取执行单位列表
     listmulu({ parentId: 0 }).then((res) => {
       this.users = res.rows;
+      console.log(this.users);
     });
 
     this.getList();
@@ -804,12 +808,14 @@ export default {
           pageSize: this.queryParams1.pageSize,
         }).then((response) => {
           this.teacherList = response.rows;
+          console.log(this.teacherList);
           this.total1 = response.total;
           this.loading = false;
         });
       } else {
         listTeacher(this.queryParams1).then((response) => {
           this.teacherList = response.rows;
+          console.log(this.teacherList);
           this.total1 = response.total;
           this.loading = false;
         });
@@ -828,6 +834,7 @@ export default {
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
         this.fileinfoList = res.rows;
+        console.log(this.fileinfoList);
         this.total = res.total;
       });
       if (row.subclassification == 0) {
@@ -1653,7 +1660,7 @@ body,
 ::v-deep .el-pagination .el-pagination__sizes .el-select .el-input__inner {
   display: none !important;
 }
-::v-deep .el-input__suffix  {
+::v-deep .el-input__suffix {
   display: none !important;
 }
 </style>