同步

src/api/grassrootsregistration/bdgldiary.js

@@ -28,7 +28,6 @@ export function addBdgldiary(data) {
 
 // 修改要事日记
 export function updateBdgldiary(data) {
-  console.log(data);
   return request({
     url: '/grassrootsregistration/bdgldiary',
     method: 'put',
@@ -36,6 +35,15 @@ export function updateBdgldiary(data) {
   })
 }
 
+// 审批
+export function updateBdglShenPi(data) {
+  return request({
+    url: '/grassrootsregistration/bdgldiary/update',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除要事日记
 export function delBdgldiary(id) {
   return request({

src/assets/styles/global.css

@@ -132,7 +132,7 @@ table td {
   /* background: #004D86; */
   background-color: transparent;
   border: 1px solid #D2D6DE;
-  color: #fff !important;
+  /* color: #fff ; */
 }
 
 /* 时间日历设置 */

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -914,6 +914,8 @@ export default {
       DataTime: "",
       //  右边登记数据
       registrationData: {},
+
+      timeDate:""
     };
   },
 
@@ -949,6 +951,8 @@ export default {
           console.log(response);
           this.menuRoleVisible = false;
           this.getList();
+          this.getShuJu(this.timeDate)
+          this.$forceUpdate()
         });
       }
     },
@@ -962,6 +966,7 @@ export default {
     // 搜索时间触发
     shiJian(data) {
       this.queryParams.diaryTime = data;
+      this.timeDate = data
       this.getList();
       this.getShuJu(data);
     },

src/views/grassrootsregistration/bdglequip/index.vue

@@ -746,10 +746,9 @@ export default {
   padding: 30px 50px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 50px;
+  margin: 10px 35px 20px 44px;
   padding-top: 20px !important;
   box-sizing: border-box;
-  /* padding: 30px 12px 30px 28px; */
 }
 .contents {
   padding: 0px 40px !important;

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -673,7 +673,7 @@ export default {
   line-height: 32px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 30px;
+  margin: 10px 30px 20px 44px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -680,8 +680,10 @@ export default {
         this.form.endTime != null
       ) {
         exportBdglgetWeekWork(this.form).then((res) => {
-          this.$modal.msgWarning(res.msg);
-          this.msg = null;
+          if (res.msg) {
+            this.$modal.msgWarning(res.msg);
+            this.msg = null;
+          }
         });
       }
     },
@@ -693,8 +695,10 @@ export default {
         this.form.endTime != null
       ) {
         exportBdglgetWeekWork(this.form).then((res) => {
-          this.$modal.msgWarning(res.msg);
-          this.msg = null;
+          if (res.msg) {
+            this.$modal.msgWarning(res.msg);
+            this.msg = null;
+          }
         });
       }
     },
@@ -707,8 +711,10 @@ export default {
       ) {
         this.form.unitName = null;
         exportBdglgetWeekWork(this.form).then((res) => {
-          this.$modal.msgWarning(res.msg);
-          this.msg = null;
+          if (res.msg) {
+            this.$modal.msgWarning(res.msg);
+            this.msg = null;
+          }
         });
       }
     },

src/views/peopleChuRu/bdglLeave/index.vue

@@ -85,7 +85,12 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="请假类型" align="center" prop="leaveType" />
+      <el-table-column
+        label="请假类型"
+        align="center"
+        prop="leaveType"
+        :formatter="qingJia"
+      />
       <el-table-column label="请假原因" align="center" prop="leaveReason" />
       <el-table-column
         label="离队时间"
@@ -99,7 +104,12 @@
         prop="returnTime"
         width="100"
       />
-      <el-table-column label="是否归队" align="center" prop="isReturn" />
+      <el-table-column label="是否归队" align="center" prop="isReturn">
+        <template slot-scope="scope">
+          <el-col v-if="scope.row.isReturn == 0">归队</el-col>
+          <el-col v-if="scope.row.isReturn == 1">未归队</el-col>
+        </template>
+      </el-table-column>
       <el-table-column
         label="一级审批人"
         align="center"
@@ -359,9 +369,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>
@@ -377,9 +387,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>
@@ -395,9 +405,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>
@@ -413,9 +423,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>
@@ -567,9 +577,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 +594,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 +611,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 +628,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>
@@ -777,7 +787,7 @@ export default {
       dictType: {
         dictType: "Leave_type",
       },
-      // 字典的列表
+      // 请假的列表
       ziDian: [],
       // 审批状态
       ziDians: [],
@@ -793,8 +803,22 @@ export default {
     this.getDicts("approve").then((response) => {
       this.ziDians = response.data;
     });
+    // 查询请假类型
+    getDicts(this.dictType.dictType).then((res) => {
+      this.ziDian = res.data;
+    });
   },
   methods: {
+    // 请假类型翻译
+    qingJia(row, column) {
+      var qing = "";
+      this.ziDian.map((item) => {
+        if (item.dictValue == row.leaveType) {
+          qing = item.dictLabel;
+        }
+      });
+      return qing;
+    },
     // 归队按钮
     handleGuiDui(row) {
       const id = row.id || this.ids;

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -167,7 +167,7 @@
             @open="blurSelect"
           />
         </el-form-item>
-        <el-form-item/>
+        <el-form-item />
         <el-form-item label="借调人姓名" prop="transferPeople">
           <el-select
             v-model="form.transferPeopleId"
@@ -239,7 +239,7 @@ import {
   exportPeopleBorrow,
 } from "@/api/peopleChuRu/peopleBorrow";
 
-import { getZaiRen, getDept } from "@/api/grassrootsregistration/bdglmeeting";
+import { getQuanBu, getDept } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -336,15 +336,9 @@ 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) => {
+      getQuanBu(id, num).then((response) => {
         this.renYuan = response.rows;
       });
     },
@@ -495,7 +489,7 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width:700px;
+  width: 700px;
   height: 104px;
   margin: auto;
 }