完成了医疗所有模块

src/api/medicalhealth/antiepidemicamount.js

@@ -8,7 +8,6 @@ export function listAntiepidemicamount(query) {
     params: query
   })
 }
-
 // 查询防疫用品库存数据详细
 export function getAntiepidemicamount(id) {
   return request({

src/api/medicalhealth/antiepidemicputin.js

@@ -69,3 +69,12 @@ export function exportAntiepidemiGuoQi(query) {
     params: query
   })
 }
+
+// 查询防疫品名称出库
+export function exportAntiepidemiFangYiChuKu(query) {
+  return request({
+    url: '/medicalhealth/antiepidemicputout/getlist',
+    method: 'get',
+    params: query
+  })
+}

src/api/medicalhealth/bdgldurgputin.js

@@ -59,3 +59,11 @@ export function exportYao(query) {
     params: query
   })
 }
+//  获取出库药品列表
+export function exportChuYao(query) {
+  return request({
+    url: '/medicalhealth/bdgldurgputout/getList',
+    method: 'get',
+    params: query
+  })
+}

src/api/medicalhealth/consumeputin.js

@@ -77,11 +77,11 @@ export function exportHaoCai(query) {
     params: query
   })
 }
-// //  获取药品列表
-// export function exportYao(query) {
-//   return request({
-//     url: '/medicalhealth/bdgldurgputin/getYaoPingList',
-//     method: 'get',
-//     params: query
-//   })
-// }
+//  获取耗材出库名称列表
+export function exportHaoCaiChu(query) {
+  return request({
+    url: '/medicalhealth/consumeputout/getlist',
+    method: 'get',
+    params: query
+  })
+}

src/views/medicalhealth/antiepidemicputin/index.vue

@@ -215,7 +215,7 @@
           <span>{{ parseTime(scope.row.expirationTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="录入人(创建人)" align="center" prop="adminId" /> -->
+      <el-table-column label="剩余库存" align="center" prop="surplus" />
       <!-- <el-table-column label="录入时间" align="center" prop="createtime" />
       <el-table-column label="更新时间" align="center" prop="updatetime" />
 
@@ -431,12 +431,12 @@ export default {
     // 选择防疫品
     fangYiPingXuan(data) {
       this.planName();
-      // this.form.unitId = data.unitId;
-      // this.form.durgArchivesId = data.id;
-      // this.form.durgBrand = data.durgBrand;
-      // this.form.specifications = data.specifications;
-      // this.form.storeHouse = data.storeHouse;
-      // this.form.unitName = data.unitName;
+      this.form.unitId = data.unitId;
+      this.form.durgArchivesId = data.id;
+      this.form.durgBrand = data.durgBrand;
+      this.form.specifications = data.specifications;
+      this.form.storeHouse = data.storeHouse;
+      this.form.unitName = data.unitName;
     },
     // 查询防疫品名称列表
     fangYiPing() {
@@ -525,6 +525,8 @@ export default {
               this.getList();
             });
           } else {
+            this.form.surplus = this.form.putIn;
+            // console.log(this.form);
             addAntiepidemicputin(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/medicalhealth/antiepidemicputout/index.vue

@@ -450,7 +450,7 @@ import {
   updateAntiepidemicputout,
   exportAntiepidemicputout,
 } from "@/api/medicalhealth/antiepidemicputout";
-import { exportAntiepidemiFangYi } from "@/api/medicalhealth/antiepidemicputin";
+import { exportAntiepidemiFangYiChuKu } from "@/api/medicalhealth/antiepidemicputin";
 import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
 import { getDept } from "@/api/medicalhealth/bdgldurgarchives";
 // 导入树形结构
@@ -555,16 +555,17 @@ export default {
     },
     // 选择防疫品
     fangYiPingXuan(data) {
-      this.form.durgArchivesId = data.id;
+      this.form.durgArchivesId = data.durgArchivesId;
       this.form.durgBrand = data.durgBrand;
       this.form.specifications = data.specifications;
       this.form.storeHouse = data.storeHouse;
       this.form.unitName1 = data.unitName1;
-      this.yaoPingShu = data.amount;
+      this.form.inId = data.id;
+      this.yaoPingShu = data.surplus;
     },
     // 查询防疫品名称列表
     fangYiPing() {
-      exportAntiepidemiFangYi().then((response) => {
+      exportAntiepidemiFangYiChuKu().then((response) => {
         this.fangYi = response.data;
       });
     },

src/views/medicalhealth/bdgldurgputin/index.vue

@@ -118,7 +118,7 @@
         </template>
       </el-table-column>
       <el-table-column label="编号" align="center" prop="number" />
-      <!-- <el-table-column label="剩余库存" align="center" prop="surplus" /> -->
+      <el-table-column label="剩余库存" align="center" prop="surplus" />
       <!-- <el-table-column label="是否销毁" align="center" prop="status" /> -->
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="生产厂商" align="center" prop="manufacturer" />
@@ -435,6 +435,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.surplus = this.form.putIn;
             addBdgldurgputin(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -431,7 +431,7 @@ import {
   updateBdgldurgputout,
   exportBdgldurgputout,
 } from "@/api/medicalhealth/bdgldurgputout";
-import { exportYao } from "@/api/medicalhealth/bdgldurgputin";
+import { exportChuYao } from "@/api/medicalhealth/bdgldurgputin";
 import { getDept2 } from "@/api/medicalhealth/bdgldurgarchives";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -558,14 +558,15 @@ export default {
       this.form.manufacturer = data.manufacturer;
       this.form.specifications = data.specifications;
       this.form.storeHouse = data.storeHouse;
-      this.form.durgArchivesId = data.id;
+      this.form.durgArchivesId = data.durgArchivesId;
       this.form.durgBrand = data.durgBrand;
-      this.yaoPingShu = data.amount;
+      this.yaoPingShu = data.surplus;
+      this.form.inId = data.id;
       this.planName();
     },
     // 查询药品名称列表
     getYaoPing() {
-      exportYao().then((response) => {
+      exportChuYao().then((response) => {
         this.yaoList = response.data;
       });
     },

src/views/medicalhealth/consumeguoqi/index.vue

@@ -236,13 +236,9 @@
 
 <script>
 import {
-  listPutin,
-  getPutin,
-  delPutin,
   addPutin,
   updatePutin,
-  exportPutin,
-  exportHaoCai,
+  exportHaoCaiChu,
 } from "@/api/medicalhealth/consumeputin";
 import { consumeGuoQi, consumeXiaoHui } from "@/api/medicalhealth/consumeguoqi";
 export default {
@@ -309,15 +305,17 @@ export default {
     haocailie(data) {
       this.form.unitId = data.unitId;
       this.form.unitName = data.unitName;
-      this.form.durgArchivesId = data.id;
+      this.form.durgArchivesId = data.durgArchivesId;
       this.form.durgBrand = data.durgBrand;
       this.form.manufacturer = data.manufacturer;
       this.form.specifications = data.specifications;
       this.form.storeHouse = data.storeHouse;
+      this.haoCaiShu = data.surplus;
+      this.form.inId = data.id;
     },
     // 获取耗材列表
     getHaoCai() {
-      exportHaoCai().then((res) => {
+      exportHaoCaiChu().then((res) => {
         this.Consumables = res.data;
       });
     },

src/views/medicalhealth/consumeputin/index.vue

@@ -264,6 +264,7 @@
       <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="入库数量" align="center" prop="putIn" />
       <el-table-column label="入库位置" align="center" prop="place" />
+      <el-table-column label="剩余库存" align="center" prop="surplus" />
       <el-table-column label="耗材来源" align="center" prop="source" />
       <!-- <el-table-column label="入库说明" align="center" prop="remarks" /> -->
       <el-table-column label="录入人" align="center" prop="userName" />
@@ -366,8 +367,8 @@
         <el-form-item label="入库位置" prop="place">
           <el-input v-model="form.place" placeholder="请输入入库位置" />
         </el-form-item>
-        <el-form-item label="药品来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入药品来源" />
+        <el-form-item label="耗材来源" prop="source">
+          <el-input v-model="form.source" placeholder="请输入耗材来源" />
         </el-form-item>
         <el-form-item label="入库时间" prop="putTime">
           <el-date-picker
@@ -602,6 +603,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.surplus = this.form.putIn;
             addPutin(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/medicalhealth/consumeputout/index.vue

@@ -390,7 +390,7 @@
           <treeselect
             v-model="form.unitId1"
             :options="deptOptions"
-            placeholder="选择单位"
+            placeholder="选择使用单位"
             @select="selectPeo"
           />
         </el-form-item>
@@ -520,7 +520,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 import { getDept } from "@/api/medicalhealth/bdgldurgarchives";
 import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
-import { exportHaoCai } from "@/api/medicalhealth/consumeputin";
+import { exportHaoCaiChu } from "@/api/medicalhealth/consumeputin";
 
 export default {
   name: "Consumeputout",
@@ -604,16 +604,17 @@ export default {
     haocailie(data) {
       this.form.unitId = data.unitId;
       this.form.unitName = data.unitName;
-      this.form.durgArchivesId = data.id;
+      this.form.durgArchivesId = data.durgArchivesId;
       this.form.durgBrand = data.durgBrand;
       this.form.manufacturer = data.manufacturer;
       this.form.specifications = data.specifications;
       this.form.storeHouse = data.storeHouse;
-      this.haoCaiShu = data.amount;
+      this.haoCaiShu = data.surplus;
+      this.form.inId = data.id;
     },
     // 获取耗材列表
     getHaoCai() {
-      exportHaoCai().then((res) => {
+      exportHaoCaiChu().then((res) => {
         this.Consumables = res.data;
       });
     },

src/views/medicalhealth/examine/index.vue

@@ -227,7 +227,7 @@
           style="margin-left: 30px"
         >
           <el-form-item label="年份" prop="yeardate">
-            <el-input v-model="form.yeardate" />
+            <el-input v-model="form.yeardate" placeholder="请输入年份" />
           </el-form-item>
           <div class="xiangMu">
             <el-form-item label="项目" prop="type">