完成了耗材

src/views/medicalhealth/antiepidemicputout/index.vue

@@ -542,7 +542,6 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
       });
     },
     // 选择防疫品

src/views/medicalhealth/consumeputin/index.vue

@@ -192,7 +192,7 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -227,7 +227,7 @@
           v-hasPermi="['system:putin:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/medicalhealth/consumeputout/index.vue

@@ -7,15 +7,14 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="药品ID" prop="durgArchivesId">
-        <el-select
-          v-model="queryParams.durgArchivesId"
-          placeholder="请选择药品ID"
+      <el-form-item prop="durgArchivesId">
+        <el-input
+          v-model="queryParams.putOut"
+          placeholder="请输入耗材名称"
           clearable
           size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <!-- <el-form-item label="出库数量" prop="putOut">
         <el-input
@@ -52,20 +51,19 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="出库时间" prop="putTime">
         <el-date-picker
           clearable
           size="small"
           v-model="queryParams.putTime"
           type="date"
-          :editable="false"
           value-format="yyyy-MM-dd"
           placeholder="选择出库时间"
         >
         </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item label="领用人" prop="receiveId">
+      <el-form-item label="领用人" prop="receiveId">
         <el-select
           v-model="queryParams.receiveId"
           placeholder="请选择领用人"
@@ -147,7 +145,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="使用单位" prop="unitId1">
         <el-select
           v-model="queryParams.unitId1"
@@ -158,11 +156,62 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
+      <el-form-item label="使用单位名称" prop="unitName1">
+        <el-input
+          v-model="queryParams.unitName1"
+          placeholder="请输入使用单位名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发放单位名称" prop="unitName">
+        <el-input
+          v-model="queryParams.unitName"
+          placeholder="请输入发放单位名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="领用人姓名" prop="peopleNamee">
+        <el-input
+          v-model="queryParams.peopleNamee"
+          placeholder="请输入领用人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入创建人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery"
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
           >搜索</el-button
         >
-        <el-button size="btr" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -174,7 +223,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:putout:add']"
+          v-hasPermi="['medicalhealth:consumeputout:add']"
           >新增</el-button
         >
       </el-col>
@@ -186,7 +235,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:putout:edit']"
+          v-hasPermi="['medicalhealth:consumeputout:edit']"
           >修改</el-button
         >
       </el-col>
@@ -198,7 +247,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:putout:remove']"
+          v-hasPermi="['medicalhealth:consumeputout:remove']"
           >删除</el-button
         >
       </el-col>
@@ -210,29 +259,41 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['system:putout:export']"
+          v-hasPermi="['medicalhealth:consumeputout:export']"
           >导出</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
       v-loading="loading"
-      :data="putoutList"
+      :data="consumeputoutList"
       @selection-change="handleSelectionChange"
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="药品ID" align="center" prop="durgArchivesId" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="耗材名称" align="center" prop="durgName" />
+      <el-table-column label="单位" align="center" prop="unitName1" />
+      <el-table-column label="库房" align="center" prop="storeHouse">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.storage_room"
+            :value="scope.row.storeHouse"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="品牌" align="center" prop="durgBrand" />
+      <el-table-column label="生产厂商" align="center" prop="manufacturer" />
+      <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="出库数量" align="center" prop="putOut" />
       <el-table-column label="出库位置" align="center" prop="place" />
-      <el-table-column label="药品用途" align="center" prop="purpose" />
-      <el-table-column label="出库说明" align="center" prop="remarks" />
+      <el-table-column label="耗材用途" align="center" prop="purpose" />
+      <!-- <el-table-column label="出库说明" align="center" prop="remarks" /> -->
       <el-table-column
         label="出库时间"
         align="center"
@@ -243,39 +304,48 @@
           <span>{{ parseTime(scope.row.putTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="领用人" align="center" prop="receiveId" />
-      <el-table-column label="录入人(创建人)" align="center" prop="adminId" />
-      <el-table-column label="品牌" align="center" prop="durgBrand" />
-      <el-table-column label="生产厂商" align="center" prop="manufacturer" />
-      <el-table-column label="规格" align="center" prop="specifications" />
+      <!-- <el-table-column label="领用人" align="center" prop="receiveId" /> -->
       <el-table-column
+        label="录入人(创建人)"
+        align="center"
+        prop="userName"
+        width="160"
+      />
+
+      <!-- <el-table-column
         label="功能主治"
         align="center"
         prop="productIntroduction"
       />
       <el-table-column label="编号" align="center" prop="number" />
-      <el-table-column label="库房" align="center" prop="storeHouse" />
+
       <el-table-column label="库房" align="center" prop="unitId" />
-      <el-table-column label="使用单位" align="center" prop="unitId1" />
+
+      <el-table-column label="使用单位名称" align="center" prop="unitName1" />
+      <el-table-column label="发放单位名称" align="center" prop="unitName" />
+      <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
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="200"
       >
         <template slot-scope="scope">
           <el-button
-            size="btu"
+            size="mini"
             type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:putout:edit']"
+            v-hasPermi="['medicalhealth:consumeputout:edit']"
             >修改</el-button
           >
           <el-button
-            size="btd"
+            size="mini"
             type="text"
+            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:putout:remove']"
+            v-hasPermi="['medicalhealth:consumeputout:remove']"
             >删除</el-button
           >
         </template>
@@ -291,31 +361,49 @@
     />
 
     <!-- 添加或修改耗材出库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form
         ref="form"
         :model="form"
         :rules="rules"
-        label-width="120px"
-        :inline="true"
+        label-width="80px"
+        inline
       >
-        <div class="jiben">基本信息</div>
-        <el-form-item label="药品ID" prop="durgArchivesId">
-          <el-select v-model="form.durgArchivesId" placeholder="请选择药品ID">
-            <el-option label="请选择字典生成" value="" />
+        <el-form-item label="耗材名称" prop="durgName">
+          <el-select v-model="form.durgName" placeholder="请选择耗材名称">
+            <el-option
+              v-for="(item, i) in Consumables"
+              :key="i"
+              :label="item.name"
+              :value="item.durgName"
+              @click.native="haocailie(item)"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="使用单位" prop="unitId1">
-          <el-select v-model="form.unitId1" placeholder="请选择使用单位">
-            <el-option label="请选择字典生成" value="" />
+          <treeselect
+            v-model="form.unitId1"
+            :options="deptOptions"
+            placeholder="选择单位"
+            @select="selectPeo"
+          />
+        </el-form-item>
+        <el-form-item label="使用人" prop="receiveId">
+          <el-select v-model="form.peopleId" placeholder="请选择使用人">
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="compere(item.name)"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="出库数量" prop="putOut">
           <el-input v-model="form.putOut" placeholder="请输入出库数量" />
         </el-form-item>
-        <el-form-item label="出库位置" prop="place">
-          <el-input v-model="form.place" placeholder="请输入出库位置" />
-        </el-form-item>
         <el-form-item label="出库时间" prop="putTime">
           <el-date-picker
             clearable
@@ -324,24 +412,37 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择出库时间"
-            :editable="false"
           >
           </el-date-picker>
         </el-form-item>
-        <div class="jiben">药品用途</div>
+
+        <el-form-item label="出库位置" prop="place">
+          <el-input v-model="form.place" placeholder="请输入出库位置" />
+        </el-form-item>
+        <div class="jiben">耗材用途</div>
         <el-form-item label="" prop="purpose">
-          <el-input v-model="form.purpose" type="textarea" placeholder="请输入药品用途" />
+          <el-input
+            v-model="form.purpose"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <div class="jiben">出库说明</div>
         <el-form-item label="" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入出库说明" />
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
-        <!-- <el-form-item label="领用人" prop="receiveId">
-          <el-select v-model="form.receiveId" placeholder="请选择领用人">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
+        <!-- <el-form-item label="耗材用途" prop="purpose">
+          <el-input v-model="form.purpose" placeholder="请输入药品用途" />
         </el-form-item>
-        <el-form-item label="录入/创建人" prop="adminId">
+        <el-form-item label="出库说明" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入出库说明" />
+        </el-form-item> -->
+
+        <!-- <el-form-item label="录入人(创建人)" prop="adminId">
           <el-select v-model="form.adminId" placeholder="请选择录入人(创建人)">
             <el-option label="请选择字典生成" value="" />
           </el-select>
@@ -369,6 +470,22 @@
         </el-form-item>
         <el-form-item label="库房" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入库房" />
+        </el-form-item>
+
+        <el-form-item label="使用单位名称" prop="unitName1">
+          <el-input v-model="form.unitName1" placeholder="请输入使用单位名称" />
+        </el-form-item>
+        <el-form-item label="发放单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入发放单位名称" />
+        </el-form-item>
+        <el-form-item label="领用人姓名" prop="peopleNamee">
+          <el-input v-model="form.peopleNamee" placeholder="请输入领用人姓名" />
+        </el-form-item>
+        <el-form-item label="耗材名称" prop="durgName">
+          <el-input v-model="form.durgName" placeholder="请输入耗材名称" />
+        </el-form-item>
+        <el-form-item label="创建人姓名" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入创建人姓名" />
         </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -381,16 +498,27 @@
 
 <script>
 import {
-  listPutout,
-  getPutout,
-  delPutout,
-  addPutout,
-  updatePutout,
-  exportPutout,
+  listConsumeputout,
+  getConsumeputout,
+  delConsumeputout,
+  addConsumeputout,
+  updateConsumeputout,
+  exportConsumeputout,
 } from "@/api/medicalhealth/consumeputout";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+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";
 
 export default {
-  name: "Putout",
+  name: "Consumeputout",
+  dicts: ["storage_room"],
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -408,7 +536,7 @@ export default {
       // 总条数
       total: 0,
       // 耗材出库登记表格数据
-      putoutList: [],
+      consumeputoutList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -433,22 +561,73 @@ export default {
         storeHouse: null,
         unitId: null,
         unitId1: null,
+        unitName1: null,
+        unitName: null,
+        peopleNamee: null,
+        durgName: null,
+        userName: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
+      // 树形单位
+      deptOptions: [],
+      // 人员
+      renYuan: [],
+      // 耗材列表
+      Consumables: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 选中耗材
+    haocailie(data) {
+      this.form.unitId = data.unitId;
+      this.form.unitName = data.unitName;
+      this.form.durgArchivesId = data.id;
+      this.form.durgBrand = data.durgBrand;
+      this.form.manufacturer = data.manufacturer;
+      this.form.specifications = data.specifications;
+      this.form.storeHouse = data.storeHouse;
+    },
+    // 获取耗材列表
+    getHaoCai() {
+      exportHaoCai().then((res) => {
+        this.Consumables = res.data;
+      });
+    },
+    //  人员点击触发
+    compere(name) {
+      this.form.peopleNamee = name;
+    },
+    // 获取人员
+    getZhuChi(id) {
+      getZhuChiRen(id).then((res) => {
+        this.renYuan = res.data;
+      });
+    },
+    // 新增选择单位触发
+    selectPeo(val) {
+      this.form.unitId1 = val.id;
+      this.form.unitName1 = val.label;
+      // 选中单位触发获取人员
+      this.getZhuChi(this.form.unitId1);
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      getDept().then((response) => {
+        this.deptOptions = response.data;
+        console.log(this.deptOptions);
+      });
+    },
     /** 查询耗材出库登记列表 */
     getList() {
       this.loading = true;
-      listPutout(this.queryParams).then((response) => {
-        this.putoutList = response.rows;
+      listConsumeputout(this.queryParams).then((response) => {
+        this.consumeputoutList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -480,6 +659,11 @@ export default {
         storeHouse: null,
         unitId: null,
         unitId1: null,
+        unitName1: null,
+        unitName: null,
+        peopleNamee: null,
+        durgName: null,
+        userName: null,
       };
       this.resetForm("form");
     },
@@ -501,6 +685,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getHaoCai();
+      this.getTreeselect();
       this.reset();
       this.open = true;
       this.title = "添加耗材出库登记";
@@ -509,7 +695,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getPutout(id).then((response) => {
+      getConsumeputout(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改耗材出库登记";
@@ -520,13 +706,13 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updatePutout(this.form).then((response) => {
+            updateConsumeputout(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPutout(this.form).then((response) => {
+            addConsumeputout(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -541,7 +727,7 @@ export default {
       this.$modal
         .confirm('是否确认删除耗材出库登记编号为"' + ids + '"的数据项？')
         .then(function () {
-          return delPutout(ids);
+          return delConsumeputout(ids);
         })
         .then(() => {
           this.getList();
@@ -556,7 +742,7 @@ export default {
         .confirm("是否确认导出所有耗材出库登记数据项？")
         .then(() => {
           this.exportLoading = true;
-          return exportPutout(queryParams);
+          return exportConsumeputout(queryParams);
         })
         .then((response) => {
           this.$download.name(response.msg);