完成了医疗卫生管理

src/api/medicalhealth/consumeputin.js

@@ -50,4 +50,35 @@ export function exportPutin(query) {
     method: 'get',
     params: query
   })
+}
+
+// 过期药品情况列表
+export function exportYaoPing(query) {
+  return request({
+    url: '/medicalhealth/yaopinguoqi/getGuoQi',
+    method: 'get',
+    params: query
+  })
+}
+// // 过期药品销毁
+// export function exportYaoPingXiaoHui(id) {
+//   return request({
+//     url: '/medicalhealth/yaopinguoqi' + id,
+//     method: 'get',
+//   })
+// }
+// export function exportYaoPingXiaoHui(query) {
+//   return request({
+//     url: '/medicalhealth/yaopinguoqi',
+//     method: 'get',
+//     params: query
+//   })
+// }
+// 过期药品销毁
+export function exportYaoPingXiaoHui(query) {
+  return request({
+    url: '/medicalhealth/yaopinguoqi',
+    method: 'get',
+    params: { 'id': query }
+  })
 }

src/views/medicalhealth/antiepidemicamount/index.vue

@@ -1,376 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="防疫品ID" prop="durgArchivesId">
-        <el-input
-          v-model="queryParams.durgArchivesId"
-          placeholder="请输入防疫品ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位ID" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库房" prop="storeHouse">
-        <el-input
-          v-model="queryParams.storeHouse"
-          placeholder="请输入库房"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存数量" prop="amount">
-        <el-input
-          v-model="queryParams.amount"
-          placeholder="请输入库存数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库数量" prop="putIn">
-        <el-input
-          v-model="queryParams.putIn"
-          placeholder="请输入入库数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出库数量" prop="putOut">
-        <el-input
-          v-model="queryParams.putOut"
-          placeholder="请输入出库数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="录入人" prop="adminId">
-        <el-input
-          v-model="queryParams.adminId"
-          placeholder="请输入录入人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="录入时间" prop="createtime">
-        <el-input
-          v-model="queryParams.createtime"
-          placeholder="请输入录入时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatetime">
-        <el-input
-          v-model="queryParams.updatetime"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['medicalhealth:antiepidemicamount:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['medicalhealth:antiepidemicamount:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['medicalhealth:antiepidemicamount:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['medicalhealth:antiepidemicamount:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="antiepidemicamountList" @selection-change="handleSelectionChange">
-      <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="单位ID" align="center" prop="unitId" />
-      <el-table-column label="库房" align="center" prop="storeHouse" />
-      <el-table-column label="库存数量" align="center" prop="amount" />
-      <el-table-column label="入库数量" align="center" prop="putIn" />
-      <el-table-column label="出库数量" align="center" prop="putOut" />
-      <el-table-column label="录入人" align="center" prop="adminId" />
-      <el-table-column label="录入时间" align="center" prop="createtime" />
-      <el-table-column label="更新时间" align="center" prop="updatetime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['medicalhealth:antiepidemicamount:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['medicalhealth:antiepidemicamount:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改防疫用品库存数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="防疫品ID" prop="durgArchivesId">
-          <el-input v-model="form.durgArchivesId" placeholder="请输入防疫品ID" />
-        </el-form-item>
-        <el-form-item label="单位ID" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位ID" />
-        </el-form-item>
-        <el-form-item label="库房" prop="storeHouse">
-          <el-input v-model="form.storeHouse" placeholder="请输入库房" />
-        </el-form-item>
-        <el-form-item label="库存数量" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入库存数量" />
-        </el-form-item>
-        <el-form-item label="入库数量" prop="putIn">
-          <el-input v-model="form.putIn" placeholder="请输入入库数量" />
-        </el-form-item>
-        <el-form-item label="出库数量" prop="putOut">
-          <el-input v-model="form.putOut" placeholder="请输入出库数量" />
-        </el-form-item>
-        <el-form-item label="录入人" prop="adminId">
-          <el-input v-model="form.adminId" placeholder="请输入录入人" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listAntiepidemicamount, getAntiepidemicamount, delAntiepidemicamount, addAntiepidemicamount, updateAntiepidemicamount, exportAntiepidemicamount } from "@/api/medicalhealth/antiepidemicamount";
-
-export default {
-  name: "Antiepidemicamount",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 防疫用品库存数据表格数据
-      antiepidemicamountList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        durgArchivesId: null,
-        unitId: null,
-        storeHouse: null,
-        amount: null,
-        putIn: null,
-        putOut: null,
-        adminId: null,
-        createtime: null,
-        updatetime: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询防疫用品库存数据列表 */
-    getList() {
-      this.loading = true;
-      listAntiepidemicamount(this.queryParams).then(response => {
-        this.antiepidemicamountList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        durgArchivesId: null,
-        unitId: null,
-        storeHouse: null,
-        amount: null,
-        putIn: null,
-        putOut: null,
-        adminId: null,
-        createtime: null,
-        updatetime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加防疫用品库存数据";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getAntiepidemicamount(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改防疫用品库存数据";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateAntiepidemicamount(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addAntiepidemicamount(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除防疫用品库存数据编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delAntiepidemicamount(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有防疫用品库存数据数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportAntiepidemicamount(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/medicalhealth/antiepidemicarchives/index.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="防疫品名称" prop="durgName">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item prop="durgName">
         <el-input
           v-model="queryParams.durgName"
           placeholder="请输入防疫品名称"
@@ -10,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品牌" prop="durgBrand">
+      <!-- <el-form-item label="品牌" prop="durgBrand">
         <el-input
           v-model="queryParams.durgBrand"
           placeholder="请输入品牌"
@@ -99,10 +105,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -115,7 +129,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['medicalhealth:antiepidemicarchives:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -126,7 +141,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['medicalhealth:antiepidemicarchives:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -137,7 +153,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['medicalhealth:antiepidemicarchives:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -148,14 +165,23 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['medicalhealth:antiepidemicarchives:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="antiepidemicarchivesList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="antiepidemicarchivesList"
+      @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="序号" align="center" prop="id" />
       <el-table-column label="防疫品名称" align="center" prop="durgName" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="规格" align="center" prop="specifications" />
@@ -164,11 +190,19 @@
       <el-table-column label="库存数量" align="center" prop="amount" />
       <el-table-column label="入库数量" align="center" prop="putIn" />
       <el-table-column label="出库数量" align="center" prop="putOut" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <!-- <el-table-column label="备注" align="center" prop="remarks" /> -->
       <el-table-column label="录入人(创建人)" align="center" prop="adminId" />
-      <el-table-column label="录入时间(创建时间)" align="center" prop="createtime" />
-      <el-table-column label="修改时间" align="center" prop="updatetime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="录入时间(创建时间)"
+        align="center"
+        prop="createtime"
+      />
+      <!-- <el-table-column label="修改时间" align="center" prop="updatetime" /> -->
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -176,20 +210,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['medicalhealth:antiepidemicarchives:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['medicalhealth:antiepidemicarchives:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -224,7 +260,11 @@
           <el-input v-model="form.putOut" placeholder="请输入出库数量" />
         </el-form-item>
         <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="adminId">
           <el-input v-model="form.adminId" placeholder="请输入录入人(创建人)" />
@@ -239,7 +279,14 @@
 </template>
 
 <script>
-import { listAntiepidemicarchives, getAntiepidemicarchives, delAntiepidemicarchives, addAntiepidemicarchives, updateAntiepidemicarchives, exportAntiepidemicarchives } from "@/api/medicalhealth/antiepidemicarchives";
+import {
+  listAntiepidemicarchives,
+  getAntiepidemicarchives,
+  delAntiepidemicarchives,
+  addAntiepidemicarchives,
+  updateAntiepidemicarchives,
+  exportAntiepidemicarchives,
+} from "@/api/medicalhealth/antiepidemicarchives";
 
 export default {
   name: "Antiepidemicarchives",
@@ -280,16 +327,20 @@ export default {
         remarks: null,
         adminId: null,
         createtime: null,
-        updatetime: null
+        updatetime: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         adminId: [
-          { required: true, message: "录入人(创建人)不能为空", trigger: "blur" }
+          {
+            required: true,
+            message: "录入人(创建人)不能为空",
+            trigger: "blur",
+          },
         ],
-      }
+      },
     };
   },
   created() {
@@ -299,7 +350,7 @@ export default {
     /** 查询防疫用品库存档案列表 */
     getList() {
       this.loading = true;
-      listAntiepidemicarchives(this.queryParams).then(response => {
+      listAntiepidemicarchives(this.queryParams).then((response) => {
         this.antiepidemicarchivesList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -325,7 +376,7 @@ export default {
         remarks: null,
         adminId: null,
         createtime: null,
-        updatetime: null
+        updatetime: null,
       };
       this.resetForm("form");
     },
@@ -341,9 +392,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -354,8 +405,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getAntiepidemicarchives(id).then(response => {
+      const id = row.id || this.ids;
+      getAntiepidemicarchives(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改防疫用品库存档案";
@@ -363,16 +414,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateAntiepidemicarchives(this.form).then(response => {
+            updateAntiepidemicarchives(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addAntiepidemicarchives(this.form).then(response => {
+            addAntiepidemicarchives(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -384,32 +435,42 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除防疫用品库存档案编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除防疫用品库存档案编号为"' + ids + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+          type: "warning",
+        }
+      )
+        .then(function () {
           return delAntiepidemicarchives(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有防疫用品库存档案数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
+      this.$confirm("是否确认导出所有防疫用品库存档案数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
           this.exportLoading = true;
           return exportAntiepidemicarchives(queryParams);
-        }).then(response => {
+        })
+        .then((response) => {
           this.download(response.msg);
           this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>

src/views/medicalhealth/bdgldurgputin/index.vue

@@ -248,8 +248,8 @@
       :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="putIn" />
       <el-table-column label="入库位置" align="center" prop="place" />
       <el-table-column label="药品来源" align="center" prop="source" />
@@ -346,7 +346,7 @@
             <el-option
               v-for="(item, i) in yaoList"
               :key="i"
-              :value="item.id"
+              :value="item.durgName"
               :label="item.yaoPinName"
               @click.native="yapPing(item)"
             >

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -254,7 +254,7 @@
       <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"
@@ -330,6 +330,7 @@
               :key="i"
               :label="item.name"
               :value="item.id"
+              @click.native="shiyongren(item.name)"
             >
             </el-option>
           </el-select>
@@ -488,6 +489,11 @@ export default {
     this.getList();
   },
   methods: {
+    // 使用人选择触发
+    shiyongren(name) {
+      console.log(name);
+      this.form.peopleName = name;
+    },
     // 数量的判断
     shuLiang() {
       if (this.form.putOut > this.yaoPingShu) {
@@ -496,10 +502,12 @@ export default {
     },
     // 新增选择单位触发
     selectPeo(val) {
-      this.form.unitId = val.id;
+      console.log(val);
+      this.form.unitId1 = val.id;
+      this.form.unitName1 = val.label;
       // 选中单位触发获取人员
-      this.getZhuChi(this.form.unitId);
-      this.form.unitId = null;
+      this.getZhuChi(this.form.unitId1);
+      // this.form.unitId = null;
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -515,6 +523,9 @@ export default {
     },
     // 药品名称触发赋值
     yapPing(data) {
+      console.log(data);
+      this.form.unitId = data.unitId;
+      this.form.unitName = data.unitName;
       this.form.manufacturer = data.manufacturer;
       this.form.specifications = data.specifications;
       this.form.storeHouse = data.storeHouse;
@@ -617,6 +628,7 @@ export default {
               this.getList();
             });
           } else {
+            console.log(this.form);
             if (this.form.putOut > this.yaoPingShu) {
               return;
             }

src/views/medicalhealth/bdgldurgruin/index.vue

@@ -7,9 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="品牌" prop="durgArchivesId">
+      <el-form-item prop="durgArchivesId">
         <el-input
-          v-model="queryParams.durgArchivesId"
+          v-model="queryParams.durgBrand"
           placeholder="请输入品牌"
           clearable
           size="small"
@@ -52,7 +52,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="销毁时间" prop="createtime">
+      <!-- <el-form-item label="销毁时间" prop="createtime">
         <el-input
           v-model="queryParams.createtime"
           placeholder="请输入销毁时间"
@@ -61,7 +61,7 @@
           :editable="false"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="销毁时间" prop="putinId">
         <el-input
           v-model="queryParams.putinId"
@@ -89,7 +89,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -141,7 +141,7 @@
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table
       v-loading="loading"
@@ -150,16 +150,19 @@
       :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="putIn" />
+      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="厂家" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
-      <el-table-column label="销毁时间" align="center" prop="createtime" />
-      <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="putIn" />
+      <el-table-column label="销毁时间" align="center" prop="createtime">
+        <template slot-scope="scope">
+          <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
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -181,7 +184,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -345,6 +348,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.durgBrand = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },