修改耗材过期API，修改耗材入库Api ，修改人员体检，修改耗材领用，修改医疗出库，修改耗材出库，修改耗材过期，修改耗材入库

src/api/medicalhealth/consumeguoqi.js

@@ -19,15 +19,3 @@ export function consumeXiaoHui(data) {
     })
 }
 
-
-
-
-
-
-// export function consumeXiaoHuiaa(data) {
-//     return request({
-//         url: '/medicalhealth/consumeputins',
-//         method: 'put',
-//         data: data
-//     })
-// }

src/api/medicalhealth/consumeputin.js

@@ -72,7 +72,7 @@ export function exportYaoPingXiaoHui(query) {
 // 获取耗材名称列表
 export function exportHaoCai(query) {
   return request({
-    url: '/medicalhealth/consumeputin',
+    url: '/medicalhealth/consumeputin/getlist',
     method: 'get',
     params: query
   })

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -508,7 +508,6 @@ export default {
   methods: {
     // 使用人选择触发
     shiyongren(name) {
-      console.log(name);
       this.form.peopleName = name;
     },
     // 数量的判断
@@ -554,7 +553,6 @@ export default {
     getYaoPing() {
       exportYao().then((response) => {
         this.yaoList = response.data;
-        console.log(response.data);
       });
     },
     /** 查询药品出库登记列表 */

src/views/medicalhealth/consumeguoqi/index.vue

@@ -96,18 +96,16 @@
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.status != '1'"
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['medicalhealth:bdgldurgputin:edit']"
             >销毁</el-button
           >
           <el-button
             v-if="scope.row.status == '1'"
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
             v-hasPermi="['medicalhealth:bdgldurgputin:remove']"
             >已销毁</el-button
           >
@@ -395,7 +393,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.$modal
-        .confirm("是否确认销毁药品的数据项？", {
+        .confirm("是否确认销毁过期耗材的数据项？", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
         })
@@ -403,6 +401,8 @@ export default {
           this.form = row;
           if (this.form.id != null) {
             this.form.status = "1";
+            this.form.createTime = null;
+            this.form.updateTime = null;
             consumeXiaoHui(this.form).then((response) => {
               this.$modal.msgSuccess("销毁成功");
               this.getList();

src/views/medicalhealth/consumelingyong/index.vue

@@ -331,7 +331,7 @@
       <el-table-column label="领用人姓名" align="center" prop="peopleNamee" />
       <el-table-column label="耗材名称" align="center" prop="durgName" />
       <el-table-column label="创建人姓名" align="center" prop="userName" /> -->
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -353,7 +353,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

src/views/medicalhealth/consumeputin/index.vue

@@ -758,10 +758,10 @@ export default {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #004d86;
-  color: #fff;
+  color: #111;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #111;
 }
 /* 时间选择 */
 ::v-deep .el-input--small .el-input__inner {

src/views/medicalhealth/consumeputout/index.vue

@@ -389,7 +389,7 @@
           />
         </el-form-item>
         <el-form-item label="使用人" prop="receiveId">
-          <el-select v-model="form.peopleId" placeholder="请选择使用人">
+          <el-select v-model="form.receiveId" placeholder="请选择使用人">
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -401,7 +401,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="出库数量" prop="putOut">
-          <el-input v-model="form.putOut" placeholder="请输入出库数量" />
+          <el-input
+            v-model="form.putOut"
+            placeholder="请输入出库数量"
+            @blur="shuLiang"
+          />
         </el-form-item>
         <el-form-item label="出库时间" prop="putTime">
           <el-date-picker
@@ -576,12 +580,20 @@ export default {
       renYuan: [],
       // 耗材列表
       Consumables: [],
+      // 数量
+      haoCaiShu: "",
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 数量的判断
+    shuLiang() {
+      if (this.form.putOut > this.haoCaiShu) {
+        return this.$modal.msgWarning(`库存数量为${this.haoCaiShu}`);
+      }
+    },
     // 选中耗材
     haocailie(data) {
       this.form.unitId = data.unitId;
@@ -591,6 +603,7 @@ export default {
       this.form.manufacturer = data.manufacturer;
       this.form.specifications = data.specifications;
       this.form.storeHouse = data.storeHouse;
+      this.haoCaiShu = data.amount;
     },
     // 获取耗材列表
     getHaoCai() {
@@ -705,12 +718,18 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+            if (this.form.putOut > this.haoCaiShu) {
+              return;
+            }
             updateConsumeputout(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
+            if (this.form.putOut > this.haoCaiShu) {
+              return;
+            }
             addConsumeputout(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -824,10 +843,10 @@ export default {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #004d86;
-  color: #fff;
+  color: #111;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #111;
 }
 /* 时间选择 */
 ::v-deep .el-input--small .el-input__inner {

src/views/medicalhealth/examine/index.vue

@@ -119,7 +119,6 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="人员类别" align="center" prop="id" />
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="姓名" align="center" prop="peopleName" />
       <el-table-column label="工作岗位" align="center" prop="job" />
@@ -129,8 +128,11 @@
         align="center"
         class-name="small-padding fixed-width"
       >
-        <template slot-scope="scope">
-          <el-button
+        <template>
+          <!-- <template slot-scope="scope">-->
+          <el-button @click="tianJia"> 添加体检信息 </el-button>
+          <el-button @click="chaKan"> 查看 </el-button>
+          <!-- <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
@@ -143,7 +145,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['medicalhealth:examine:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -198,6 +200,44 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 添加体检信息 -->
+    <el-dialog
+      title="添加体检信息"
+      :visible.sync="opene"
+      width="700px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      年份
+      <input type="text" />
+      <div class="jiben">体检信息</div>
+      <quill-editor
+        class="quill-editor"
+        ref="myTextEditor"
+        v-model="form.contents"
+        style="height: 150px; width: 920px; margin-left: 0px"
+      ></quill-editor>
+    </el-dialog>
+
+    <!-- 查看体检信息 -->
+    <el-dialog
+      title="查看体检信息"
+      :visible.sync="openes"
+      width="700px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      年份
+      <input type="text" />
+      <div class="jiben">体检信息</div>
+      <quill-editor
+        class="quill-editor"
+        ref="myTextEditor"
+        v-model="form.contents"
+        style="height: 150px; width: 920px; margin-left: 0px"
+      ></quill-editor>
+    </el-dialog>
   </div>
 </template>
 
@@ -215,10 +255,18 @@ import {
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+// 富文本
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
+import { quillEditor } from "vue-quill-editor";
+
 export default {
   name: "Examine",
   components: {
     Treeselect,
+    quillEditor,
   },
   data() {
     return {
@@ -242,6 +290,10 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示添加体检弹出层
+      opene: false,
+      // 是否显示查看体检弹出层
+      openes: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -265,6 +317,14 @@ export default {
     this.getList();
   },
   methods: {
+    // 点击添加人员体检信息
+    tianJia() {
+      this.opene = true;
+    },
+    // 点击查看人员体检信息
+    chaKan() {
+      this.openes = true;
+    },
     // 点击人员触发
     xingMing(name) {
       this.form.peopleName = name;
@@ -445,7 +505,7 @@ export default {
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;
 }
-::v-deep .el-input__inner{
+::v-deep .el-input__inner {
   height: 36px !important;
 }
 </style>