修复医疗管理中的耗材领用，耗材入库，耗材出库

src/api/medicalhealth/consumeputin.js

@@ -67,4 +67,13 @@ export function exportYaoPingXiaoHui(query) {
     method: 'get',
     params: { id: query }
   })
+}
+
+// 查询耗材入库列表
+export function exportHaoCai(query) {
+  return request({
+    url: '/medicalhealth/consumeputin/getHaoCaiList',
+    method: 'get',
+    params: { id: query }
+  })
 }

src/views/medicalhealth/antiepidemicputout/index.vue

@@ -159,15 +159,10 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
-          type="primary"
-          size="btn"
-          @click="handleQuery"
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
         >
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -508,6 +503,7 @@ export default {
       deptOptions: [],
       // 人员
       renYuan: [],
+      // 药品数
       yaoPingShu: "",
     };
   },
@@ -534,6 +530,7 @@ export default {
     // 新增选择单位触发
     selectPeo(val) {
       this.form.unitId = val.id;
+      this.form.unitName = val.label;
       // 选中单位触发获取人员
       this.getZhuChi(this.form.unitId);
     },
@@ -549,7 +546,7 @@ export default {
       this.form.durgBrand = data.durgBrand;
       this.form.specifications = data.specifications;
       this.form.storeHouse = data.storeHouse;
-      this.form.unitName = data.unitName;
+      this.form.unitName1 = data.unitName1;
       this.yaoPingShu = data.amount;
     },
     // 查询防疫品名称列表
@@ -774,10 +771,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/archives/index.vue

@@ -7,34 +7,15 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="durgBrand">
+      <el-form-item prop="durgName">
         <el-input
-          v-model="queryParams.durgBrand"
+          v-model="queryParams.durgName"
           placeholder="请输入耗材名称"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="单位" prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="药品名称" prop="durgName">
-        <el-input
-          v-model="queryParams.durgName"
-          placeholder="请输入药品名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <!-- <el-form-item label="品牌" prop="durgBrand">
         <el-input
           v-model="queryParams.durgBrand"
@@ -63,22 +44,24 @@
         />
       </el-form-item>
       <el-form-item label="库房" prop="storeHouse">
-        <el-select
+        <el-input
           v-model="queryParams.storeHouse"
-          placeholder="请选择库房"
+          placeholder="请输入库房"
           clearable
           size="small"
-        >
-          <el-option
-            v-for="dict in dict.type.storage_room"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item> -->
-
-      <!-- <el-form-item label="库存数量" prop="amount">
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="库存数量" prop="amount">
         <el-input
           v-model="queryParams.amount"
           placeholder="请输入库存数量"
@@ -124,9 +107,9 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery"
+        <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -139,7 +122,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:archives:add']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:add']"
           >新增</el-button
         >
       </el-col>
@@ -151,7 +134,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:archives:edit']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:edit']"
           >修改</el-button
         >
       </el-col>
@@ -163,7 +146,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:archives:remove']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:remove']"
           >删除</el-button
         >
       </el-col>
@@ -175,7 +158,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['system:archives:export']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
           >导出</el-button
         >
       </el-col>
@@ -228,14 +211,14 @@
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:archives:edit']"
+            v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
             >修改</el-button
           >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:archives:remove']"
+            v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
             >删除</el-button
           >
         </template>
@@ -422,7 +405,7 @@ export default {
         durgName: [
           {
             required: true,
-            message: "药品名称不能为空",
+            message: "耗品名称不能为空",
             trigger: "blur",
           },
         ],
@@ -639,10 +622,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/consumeputin/index.vue

@@ -188,7 +188,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:putin:add']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:add']"
           >新增</el-button
         >
       </el-col>
@@ -200,7 +200,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:putin:edit']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:edit']"
           >修改</el-button
         >
       </el-col>
@@ -212,7 +212,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:putin:remove']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:remove']"
           >删除</el-button
         >
       </el-col>
@@ -224,7 +224,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['system:putin:export']"
+          v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
           >导出</el-button
         >
       </el-col>

src/views/medicalhealth/consumeruin/index.vue

@@ -150,8 +150,8 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="" align="center" prop="durgArchivesId" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="耗材" align="center" prop="durgBrand" />
       <el-table-column label="销毁数量" align="center" prop="putIn" />
       <el-table-column label="厂家" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />
@@ -166,9 +166,9 @@
           <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="" align="center" prop="putinId" />
-      <el-table-column label="" align="center" prop="status" />
-      <el-table-column
+      <!-- <el-table-column label="" align="center" prop="putinId" />
+      <el-table-column label="" align="center" prop="status" /> -->
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -190,7 +190,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

src/views/medicalhealth/recuperate/index.vue

@@ -239,15 +239,10 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
-          type="primary"
-          size="btn"
-          @click="handleQuery"
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
         >
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -339,12 +334,42 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
-      <el-table-column label="一级审批人" align="center" prop="createtime" />
-      <el-table-column label="一级审批状态" align="center" prop="updatetime" />
-      <el-table-column label="二级审批人" align="center" prop="unitId1" />
-      <el-table-column label="二级审批状态" align="center" prop="unitId2" />
-      <el-table-column label="三级审批人" align="center" prop="unitId3" />
-      <el-table-column label="三级审批状态" align="center" prop="peopleId1" />
+      <el-table-column
+        label="一级审批人"
+        align="center"
+        prop="createtime"
+        width="130"
+      />
+      <el-table-column
+        label="一级审批状态"
+        align="center"
+        prop="updatetime"
+        width="150"
+      />
+      <el-table-column
+        label="二级审批人"
+        align="center"
+        prop="unitId1"
+        width="130"
+      />
+      <el-table-column
+        label="二级审批状态"
+        align="center"
+        prop="unitId2"
+        width="150"
+      />
+      <el-table-column
+        label="三级审批人"
+        align="center"
+        prop="unitId3"
+        width="130"
+      />
+      <el-table-column
+        label="三级审批状态"
+        align="center"
+        prop="peopleId1"
+        width="150"
+      />
       <!-- <el-table-column label="申请时间" align="center" prop="peopleId2" /> -->
       <!-- <el-table-column label="更新时间" align="center" prop="peopleId3" /> -->
       <!-- <el-table-column label="整体审批状态" align="center" prop="status" /> -->
@@ -352,7 +377,8 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="120"
+        width="150"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button