更改公共样式左侧侧边栏，更改营具获取名称APi，更改要事日记word表格临时来对亲属渲染，更改医疗过期字段的颜色

src/api/materialManagement/materialRegistration.js

@@ -55,7 +55,7 @@ export function exportMaterialRegistration(query) {
 // 获取物品名称列表
 export function exportMaterialRegWuPingList(query) {
   return request({
-    url: '/materialManagement/materialRegistration/export',
+    url: '/materialManagement/materialRegistration/getlist',
     method: 'get',
     params: query
   })

src/assets/styles/global.css

@@ -707,6 +707,9 @@ color: #fff;
   padding-left: 0px !important;
 }
 
+ul.el-menu li div.nest-menu ul div.nest-menu li {
+  padding-left: 20px !important;
+}
 
 #app .has-logo .sidebar-logo-container {
   background: rgba(0, 0, 0, 0) !important;

src/components/look_word/bdgldiary.vue

@@ -24,7 +24,7 @@
       </div> -->
 
       <table
-      class="b1"
+        class="b1"
         border="none"
         style="
           border-collapse: collapse;
@@ -71,7 +71,7 @@
         </tr>
       </table>
       <table
-      class="b1"
+        class="b1"
         border="1"
         style="
           border-collapse: collapse;
@@ -131,7 +131,7 @@
           </td>
           <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
-             {{ message.orgcadre + message.orgsoldier}}
+            {{ message.orgcadre + message.orgsoldier }}
           </td>
           <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
@@ -143,7 +143,7 @@
           </td>
           <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
-            {{ message.nowcadre + message.nowsoldier}}
+            {{ message.nowcadre + message.nowsoldier }}
           </td>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
@@ -206,7 +206,19 @@
           "
         >
           <td class="JR_right" height="70">{{ items.dateline }}</td>
-          <td style="text-align: left" colspan="9" v-html="items.startTime + '-' + items.endTime + items.contents+'(组织人：' + items.organizer + ')'"></td>
+          <td
+            style="text-align: left"
+            colspan="9"
+            v-html="
+              items.startTime +
+              '-' +
+              items.endTime +
+              items.contents +
+              '(组织人：' +
+              items.organizer +
+              ')'
+            "
+          ></td>
           <td class="JR_right" height="70">{{ items.shouldArrive }}</td>
           <td class="JR_right" height="70">{{ items.realTo }}</td>
           <td class="JR_right" height="70">{{ items.percentage }}</td>
@@ -217,12 +229,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 4 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 4 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -234,12 +245,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 3 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 3 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -251,12 +261,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 2 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 2 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -268,12 +277,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            (message.weekworkRegisters.length < 1 || message.weekworkRegisters.length == 0)
+            message.weekworkRegisters.length < 1 ||
+            message.weekworkRegisters.length == 0
           "
         >
-          <td class="JR_left" height="70" style="font-family: 'songti'">
-            
-          </td>
+          <td class="JR_left" height="70" style="font-family: 'songti'"></td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -557,7 +565,7 @@
             <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.comeDate}}</p>
+            <p align="center">{{ item1.comeDate }}</p>
           </td>
           <td class="JR_right" height="30">
             <p align="center">{{ item1.leaveDate }}</p>
@@ -623,7 +631,7 @@
           height="30"
           style="font-family: 'songti'"
         >
-          <td rowspan="6" class="JR_left">
+          <td :rowspan="qingjia" class="JR_left">
             <p align="center" style="margin: 0 15px; font-family: 'songti'">
               请 <br />
               假 <br />
@@ -662,7 +670,49 @@
             时(天)数
           </td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-for="(item, i) in message.bdglLeaves"
+          :key="i"
+        >
+          <td class="JR_right">
+            <p align="center">{{ item.peopleName }}</p>
+          </td>
+          <td class="JR_right">
+            <p align="center">
+              <dict-tag :options="dict.type.post_Level" :value="item.postId" />
+            </p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.leaveReason }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ time[i] }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.peopleName1 }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.departureTime }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.returnTime }}</p>
+          </td>
+          <td class="JR_right" colspan="3">
+            <p align="center">{{ guiTime[i] }}</p>
+          </td>
+        </tr>
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 5
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -672,7 +722,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 4
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -682,7 +740,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 3
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -692,7 +758,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 2
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -702,7 +776,15 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
+        <tr
+          class="JR_tr"
+          height="30"
+          style="font-family: 'fangsong'"
+          v-if="
+            this.message.bdglLeaves == null ||
+            this.message.bdglLeaves.length < 1
+          "
+        >
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -742,7 +824,7 @@
       </table>
 
       <table
-      class="b1"
+        class="b1"
         border="none"
         style="
           border-collapse: collapse;
@@ -804,6 +886,7 @@ import "@/utils/lodJs.js";
 export default {
   name: "bdgleven",
   props: ["message"],
+  dicts: ["post_Level"],
   data() {
     return {
       title: "连队要事日记",
@@ -814,6 +897,9 @@ export default {
       week: "",
       qinshu2: 3,
       number: 6,
+      time: [],
+      guiTime: [],
+      qingjia: 1,
     };
   },
   created() {
@@ -822,6 +908,7 @@ export default {
     this.week = this.getWeek(this.message.blogDate);
     this.qinshu2 = this.qinshus2();
     this.xunlian();
+    this.qingjias();
   },
   methods: {
     daochu() {
@@ -843,15 +930,26 @@ export default {
       }
       return 3;
     },
-    xunlian(){
-      
-        console.log(this.message)
-        if(this.message.weekworkRegisters!= null){
-           if (this.message.weekworkRegisters.length > 4){
-        this.number += (this.message.weekworkRegisters.length - 4)
+    xunlian() {
+      this.getTian();
+      this.getCao();
+      if (this.message.weekworkRegisters != null) {
+        if (this.message.weekworkRegisters.length > 4) {
+          this.number += this.message.weekworkRegisters.length - 4;
+        }
       }
+    },
+    qingjias() {
+      if (this.message.bdglLeaves != null) {
+        if (this.message.bdglLeaves.length > 5) {
+          this.qingjia += this.message.bdglLeaves.length;
+        } else {
+          this.qingjia +=
+            5 - this.message.bdglLeaves.length + this.message.bdglLeaves.length;
         }
-     
+      } else {
+        this.qingjia += 5;
+      }
     },
     /*
       获取当前星期几
@@ -865,7 +963,33 @@ export default {
       );
       return "星期" + "日一二三四五六".charAt(date.getDay());
     },
-
+    // 计算请假天数
+    getTian() {
+      if (this.message.bdglLeaves != null) {
+        this.message.bdglLeaves.forEach((element) => {
+          var dateBegin = new Date(element.startTime).getTime();
+          var dateBegins = new Date(element.endTime).getTime();
+          var num = dateBegins - dateBegin;
+          num = num / (1000 * 3600 * 24);
+          this.time.push(num);
+        });
+      }
+    },
+    // 计算超时天数
+    getCao() {
+      if (this.message.bdglLeaves != null) {
+        this.message.bdglLeaves.forEach((element) => {
+          var dateBegin = new Date(element.actualreturntime).getTime();
+          var dateBegins = new Date(element.returnTime).getTime();
+          var num = dateBegin - dateBegins;
+          num = num / (1000 * 3600 * 24);
+          if (num < 0) {
+            num = 0;
+          }
+          this.guiTime.push(num);
+        });
+      }
+    },
     /*
       标准时间转换格式
      */

src/views/materialManagement/materialRegistration/index.vue

@@ -602,7 +602,7 @@ export default {
     },
     // 获取物品名称
     getMingCheng() {
-      listArchives().then((response) => {
+      exportMaterialRegWuPingList().then((response) => {
         this.itemlist = response.rows;
       });
     },

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -93,11 +93,11 @@
         <template slot-scope="scope">
           <span
             v-if="scope.row.expiredstatus == '1'"
-            style="color: "
+            style="color: #ffba00"
             :title="scope.row.beizhu"
             >手动添加</span
           >
-          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+          <span v-if="scope.row.expiredstatus == '0'" style="color: #13ce66"
             >自动转入</span
           >
         </template>
@@ -314,7 +314,9 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        beizhu: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
       // 防疫品名称
       fangYi: [],
     };

src/views/medicalhealth/antiepidemicruin/index.vue

@@ -162,6 +162,12 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="防疫品名称"
+        align="center"
+        prop="durgArchivesId"
+        :formatter="fang"
+      />
       <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="库房" align="center" prop="manufacturer">
@@ -270,6 +276,7 @@ import {
   updateRuin,
   exportRuin,
 } from "@/api/medicalhealth/antiepidemicruin";
+import { listAntiepidemicarchives } from "@/api/medicalhealth/antiepidemicarchives";
 
 export default {
   name: "Ruin",
@@ -313,12 +320,32 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 防疫品列表
+      fangList: [],
     };
   },
   created() {
     this.getList();
+    this.getFang();
   },
   methods: {
+    // 防疫品翻译
+    fang(row) {
+      var fang = "";
+      this.fangList.map((item) => {
+        if (item.id == row.durgArchivesId) {
+          fang = item.durgName;
+        }
+      });
+      return fang;
+    },
+    // 获取防疫品列表
+    getFang() {
+      listAntiepidemicarchives().then((response) => {
+        console.log(response);
+        this.fangList = response.rows;
+      });
+    },
     /** 查询防疫用品销毁记录列表 */
     getList() {
       this.loading = true;

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -108,11 +108,11 @@
         <template slot-scope="scope">
           <span
             v-if="scope.row.expiredstatus == '1'"
-            style="color: "
+            style="color: #ffba00"
             :title="scope.row.beizhu"
             >手动添加</span
           >
-          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+          <span v-if="scope.row.expiredstatus == '0'" style="color: #13ce66"
             >自动转入</span
           >
         </template>
@@ -333,7 +333,9 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        beizhu: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
       // 药品列表
       yaoList: [],
     };

src/views/medicalhealth/bdgldurgruin/index.vue

@@ -157,6 +157,12 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="药品名称"
+        align="center"
+        prop="durgArchivesId"
+        :formatter="yao"
+      />
       <el-table-column label="厂家" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
@@ -261,6 +267,7 @@ import {
   updateBdgldurgruin,
   exportBdgldurgruin,
 } from "@/api/medicalhealth/bdgldurgruin";
+import { listBdgldurgarchives } from "@/api/medicalhealth/bdgldurgarchives";
 
 export default {
   name: "Bdgldurgruin",
@@ -318,12 +325,32 @@ export default {
           },
         ],
       },
+      // 获取药品名称
+      yaoList: [],
     };
   },
   created() {
     this.getList();
+    this.getYaoPingMingCheng();
   },
   methods: {
+    // 翻译药品名称
+    yao(row) {
+      var yao = "";
+      this.yaoList.map((item) => {
+        if (item.id == row.durgArchivesId) {
+          yao = item.durgName;
+        }
+      });
+      return yao;
+    },
+    // 获取药品名称
+    getYaoPingMingCheng() {
+      listBdgldurgarchives().then((response) => {
+        console.log(response);
+        this.yaoList = response.rows;
+      });
+    },
     /** 查询药品销毁记录列表 */
     getList() {
       this.loading = true;

src/views/medicalhealth/consumeguoqi/index.vue

@@ -114,11 +114,11 @@
         <template slot-scope="scope">
           <span
             v-if="scope.row.expiredstatus == '1'"
-            style="color: "
+            style="color: #ffba00"
             :title="scope.row.beizhu"
             >手动添加</span
           >
-          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+          <span v-if="scope.row.expiredstatus == '0'" style="color: #13ce66"
             >自动转入</span
           >
         </template>
@@ -292,7 +292,9 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        beizhu: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
       // 耗材列表
       Consumables: [],
     };

src/views/medicalhealth/consumeruin/index.vue

@@ -155,7 +155,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="耗材" align="center" prop="durgBrand" />
+      <el-table-column
+        label="耗材名称"
+        align="center"
+        prop="durgArchivesId"
+        :formatter="hao"
+      />
       <el-table-column label="销毁数量" align="center" prop="putIn" />
       <el-table-column label="厂家" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />
@@ -272,6 +277,7 @@ import {
   updateRuin,
   exportRuin,
 } from "@/api/medicalhealth/consumeruin";
+import { listArchives } from "@/api/medicalhealth/archives";
 
 export default {
   name: "Ruin",
@@ -318,12 +324,32 @@ export default {
           { required: true, message: "不能为空", trigger: "blur" },
         ],
       },
+      // 耗材名称列表
+      haoList: [],
     };
   },
   created() {
     this.getList();
+    this.getHaoList();
   },
   methods: {
+    // 防疫品翻译
+    hao(row) {
+      var hao = "";
+      this.haoList.map((item) => {
+        if (item.id == row.durgArchivesId) {
+          hao = item.durgName;
+        }
+      });
+      return hao;
+    },
+    // 获取耗材名称列表
+    getHaoList() {
+      listArchives().then((response) => {
+        console.log(response);
+        this.haoList = response.rows;
+      });
+    },
     /** 查询耗材销毁记录列表 */
     getList() {
       this.loading = true;