新增防疫用品过期页面，新增防疫用品销毁页面，修改防疫用品入库字段

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -0,0 +1,642 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item prop="durgBrand">
+        <el-input
+          v-model="queryParams.durgBrand"
+          placeholder="请输入品牌"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <!-- <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        > -->
+        <el-button size="btr" @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:bdgldurgarchives:add']"
+          >新增</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="bdgldurgputinList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="入库编号" align="center" prop="number" /> -->
+      <el-table-column label="药品名称" align="center" prop="durgName" />
+      <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="unitName" />
+      <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="place" />
+      <el-table-column label="过期数量" align="center" prop="putIn" />
+      <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="overduedate"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.overduedate, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        label="入库时间"
+        align="center"
+        prop="putTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.putTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="录入人(创建人)" align="center" prop="adminId" /> -->
+      <!-- <el-table-column label="编号" align="center" prop="number" /> -->
+
+      <!-- <el-table-column
+        label="功能主治"
+        align="center"
+        prop="productIntroduction"
+      /> -->
+      <!-- <el-table-column label="库房" align="center" prop="unitId" /> -->
+      <el-table-column label="备注" align="center" prop="place">
+        <template slot-scope="scope">
+          <span
+            v-if="scope.row.expiredstatus == '1'"
+            style="color: "
+            :title="scope.row.beizhu"
+            >手动添加</span
+          >
+          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+            >自动转入</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.status != '1'"
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['medicalhealth:bdgldurgputin:edit']"
+            >销毁</el-button
+          >
+          <el-button
+            v-if="scope.row.status == '1'"
+            size="btd"
+            type="text"
+            v-hasPermi="['medicalhealth:bdgldurgputin: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"
+        inline
+      >
+        <el-form-item label="药品名称" prop="durgName">
+          <el-select v-model="form.durgName" placeholder="请选择药品名称">
+            <el-option
+              v-for="(item, i) in yaoList"
+              :key="i"
+              :value="item.durgName"
+              :label="item.yaoPinName"
+              @click.native="yapPing(item)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="药品来源" prop="source">
+          <el-input v-model="form.source" 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="place">
+          <el-input v-model="form.place" placeholder="请输入入库位置" />
+        </el-form-item>
+        <el-form-item label="入库时间" prop="putTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.putTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择入库时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="入库说明" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入入库说明" />
+        </el-form-item> -->
+        <el-form-item label="过期日期" prop="overduedate">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.overduedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择过期日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="beizhu">
+          <el-input
+            v-model="form.beizhu"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+
+        <!-- <el-form-item label="录入人(创建人)" prop="adminId">
+          <el-select v-model="form.adminId" placeholder="请选择录入人(创建人)">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="编号" prop="number">
+          <el-input v-model="form.number" placeholder="请输入编号" />
+        </el-form-item>
+        <el-form-item label="剩余库存" prop="surplus">
+          <el-input v-model="form.surplus" placeholder="请输入剩余库存" />
+        </el-form-item>
+        <el-form-item label="是否销毁">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="品牌" prop="durgBrand">
+          <el-input v-model="form.durgBrand" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="生产厂商" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入生产厂商" />
+        </el-form-item>
+        <el-form-item label="规格" prop="specifications">
+          <el-input v-model="form.specifications" placeholder="请输入规格" />
+        </el-form-item>
+        <el-form-item label="功能主治" prop="productIntroduction">
+          <el-input
+            v-model="form.productIntroduction"
+            placeholder="请输入功能主治"
+          />
+        </el-form-item>
+        <el-form-item label="库房" prop="storeHouse">
+          <el-select v-model="form.storeHouse" placeholder="请选择库房">
+            <el-option
+              v-for="dict in dict.type.storage_room"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  updateBdgldurgputin,
+  delBdgldurgputin,
+  addBdgldurgputin,
+  exportBdgldurgputin,
+  exportYao,
+} from "@/api/medicalhealth/bdgldurgputin";
+import {
+  exportYaoPing,
+  exportYaoPingXiaoHui,
+} from "@/api/medicalhealth/consumeputin";
+
+export default {
+  name: "Bdgldurgputin",
+  dicts: ["storage_room"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 药品入库登记表格数据
+      bdgldurgputinList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        durgArchivesId: null,
+        putIn: null,
+        place: null,
+        source: null,
+        remarks: null,
+        overduedate: null,
+        putTime: null,
+        adminId: null,
+        number: null,
+        surplus: null,
+        status: null,
+        durgBrand: null,
+        manufacturer: null,
+        specifications: null,
+        productIntroduction: null,
+        storeHouse: null,
+        unitId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 药品列表
+      yaoList: [],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 药品名称触发赋值
+    yapPing(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;
+      this.form.durgArchivesId = data.id;
+      this.form.durgBrand = data.durgBrand;
+    },
+    // 查询药品名称列表
+    getYaoPing() {
+      exportYao().then((response) => {
+        this.yaoList = response.data;
+      });
+    },
+    /** 查询药品入库登记列表 */
+    getList() {
+      this.loading = true;
+      exportYaoPing(this.queryParams).then((response) => {
+        console.log(response);
+        this.bdgldurgputinList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        durgArchivesId: null,
+        putIn: null,
+        place: null,
+        source: null,
+        remarks: null,
+        overduedate: null,
+        putTime: null,
+        adminId: null,
+        createTime: null,
+        updateTime: null,
+        number: null,
+        surplus: null,
+        status: "0",
+        durgBrand: null,
+        manufacturer: null,
+        specifications: null,
+        productIntroduction: null,
+        storeHouse: null,
+        unitId: 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.getYaoPing();
+      this.open = true;
+      this.title = "添加药品过期情况";
+    },
+    /** 销毁按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认销毁药品的数据项？", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+        })
+        .then(() => {
+          exportYaoPingXiaoHui(id).then((response) => {
+            this.$modal.msgSuccess("销毁成功");
+            this.getList();
+          });
+        })
+        .catch(() => {});
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBdgldurgputin(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.expiredstatus = "1";
+            addBdgldurgputin(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除药品入库登记的数据项？")
+        .then(function () {
+          return delBdgldurgputin(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("是否确认导出所有药品入库登记数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportBdgldurgputin(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+}
+::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 50px;
+}
+::v-deep .el-dialog__body {
+  margin: 10px 30px 20px 50px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 刷新图标 */
+/* .el-icon-refresh {
+  width: 76px;
+  height: 36px;
+  color: #fff;
+  background-color: #1d96ff !important;
+  border-radius: 4px;
+  border: none;
+  margin-left: 20px;
+  font-size: 14px;
+} */
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #111;
+}
+.el-select-dropdown__item {
+  color: #111;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 42px 30px 0px;
+  margin-right: 30px;
+}
+/* 增加按钮弹框 */
+::v-deep .el-dialog {
+  width: 1060px !important;
+}
+::v-deep .el-dialog__body {
+  padding: none !important;
+}
+::v-deep .box4 .el-textarea__inner {
+  min-height: 120px !important;
+}
+
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+</style>

src/views/medicalhealth/antiepidemicputin/index.vue

@@ -249,7 +249,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="500px"
+      width="800px"
       append-to-body
       :close-on-click-modal="false"
     >
@@ -289,6 +289,25 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="过期日期" prop="overduedate">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.overduedate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择过期日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="beizhu">
+          <el-input
+            v-model="form.beizhu"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
         <!-- <el-form-item label="录入人(创建人)" prop="adminId">
           <el-input v-model="form.adminId" placeholder="请输入录入人(创建人)" />
         </el-form-item>
@@ -521,9 +540,10 @@ export default {
 /* 对话框背景颜色 */
 ::v-deep .el-dialog {
   background: #004d86 !important;
+  width: 820px !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 920px;
+  width: 610px;
   height: 104px;
   margin: auto;
 }
@@ -555,34 +575,30 @@ export default {
 }
 /* 基本信息背景 */
 .jiben {
-  width: 920px;
+  width: 700px;
   height: 32px;
-  background-image: url(../../../images/小标题底.png);
+  background-image: url(/static/img/小标题底.b7c6f45a.png);
   margin-bottom: 25px;
   color: #fff;
   padding-left: 16px;
   line-height: 32px;
+  background-size: 100%;
 }
 /*调整表单间距 */
 ::v-deep .el-form-item__content {
   width: 200px;
 }
-::v-deep .el-dialog .el-input__inner {
-  width: 260px;
-  height: 36px;
-}
-::v-deep .el-dialog .el-input--small .el-input__inner {
-  width: 260px;
+::v-deep .el-input__inner {
+  cursor: pointer !important;
 }
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
-  padding: 30px 50px;
+  padding: 30px 60px;
 }
 ::v-deep .el-dialog__body {
-  margin: 21px 34px 20px 55px;
+  margin: 22px 28px 0px 104px;
   padding-top: 20px !important;
   box-sizing: border-box;
-  /* padding: 30px 12px 30px 28px; */
 }
 .contents {
   padding: 0px 40px !important;
@@ -595,25 +611,14 @@ export default {
 .el-icon-arrow-down {
   font-size: 12px;
 }
-/* 刷新图标 */
-/* .el-icon-refresh {
-  width: 76px;
-  height: 36px;
-  color: #fff;
-  background-color: #1d96ff !important;
-  border-radius: 4px;
-  border: none;
-  margin-left: 20px;
-  font-size: 14px;
-} */
 /* 下拉菜单字体/背景颜色 */
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #004d86;
-  color: #111;
+  color: #fff;
 }
 .el-select-dropdown__item {
-  color: #111;
+  color: #fff;
 }
 /* 时间选择 */
 ::v-deep .el-input--small .el-input__inner {
@@ -650,22 +655,26 @@ export default {
 }
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
-  padding: 18px 42px 30px 0px;
-  margin-right: 44px;
-}
-/* 增加按钮弹框 */
-::v-deep .el-dialog {
-  width: 500px !important;
+  padding: 18px 50px;
+  margin-right: 56px;
 }
 ::v-deep .el-dialog__body {
-  padding-left: 0px;
-  padding-right: 0px;
-  padding-bottom: 0px;
+  padding: 0px 0px;
 }
-::v-deep .box4 .el-textarea__inner {
-  min-height: 120px !important;
+/* 小手样式 */
+::v-deep .el-table__cell {
+  cursor: pointer;
+}
+.el-button--mini {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
 }
-
 /* 调整输入框提示文字颜色 */
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
@@ -676,4 +685,10 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-</style>
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+.box {
+  background-color: #ffba00 !important;
+}
+</style>

src/views/medicalhealth/antiepidemicruin/index.vue

@@ -0,0 +1,561 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item prop="durgArchivesId">
+        <el-input
+          v-model="queryParams.durgBrand"
+          placeholder="请输入品牌"
+          clearable
+          size="small"
+          @input="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="manufacturer">
+        <el-input
+          v-model="queryParams.manufacturer"
+          placeholder="请输入厂家"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格" prop="specifications">
+        <el-input
+          v-model="queryParams.specifications"
+          placeholder="请输入规格"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品牌" prop="durgBrand">
+        <el-input
+          v-model="queryParams.durgBrand"
+          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"
+          :editable="false"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="销毁时间" prop="putinId">
+        <el-input
+          v-model="queryParams.putinId"
+          placeholder="请输入销毁时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销毁时间" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择销毁时间"
+          clearable
+          size="small"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item>
+        <!-- <el-button type="primary" size="btn" @click="handleQuery"
+          >搜索</el-button
+        > -->
+        <el-button size="btr" @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:bdgldurgruin: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:bdgldurgruin: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:bdgldurgruin: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:bdgldurgruin:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row> -->
+
+    <el-table
+      v-loading="loading"
+      :data="bdgldurgruinList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+      <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="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"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['medicalhealth:bdgldurgruin:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['medicalhealth:bdgldurgruin: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="700px" append-to-body>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="120px"
+        :inline="true"
+      >
+        <el-form-item label="销毁时间" prop="durgArchivesId">
+          <el-input
+            v-model="form.durgArchivesId"
+            placeholder="请输入销毁时间"
+            :editable="false"
+          />
+        </el-form-item>
+        <el-form-item label="销毁数量" prop="putIn">
+          <el-input v-model="form.putIn" placeholder="请输入销毁数量" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
+        </el-form-item>
+        <el-form-item label="规格" prop="specifications">
+          <el-input v-model="form.specifications" placeholder="请输入规格" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="durgBrand">
+          <el-input v-model="form.durgBrand" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="putinId">
+          <el-input v-model="form.putinId" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="品牌">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </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 {
+  listBdgldurgruin,
+  getBdgldurgruin,
+  delBdgldurgruin,
+  addBdgldurgruin,
+  updateBdgldurgruin,
+  exportBdgldurgruin,
+} from "@/api/medicalhealth/bdgldurgruin";
+
+export default {
+  name: "Bdgldurgruin",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 药品销毁记录表格数据
+      bdgldurgruinList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        durgArchivesId: null,
+        putIn: null,
+        manufacturer: null,
+        specifications: null,
+        durgBrand: null,
+        createtime: null,
+        putinId: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        durgArchivesId: [
+          {
+            required: true,
+            message: "销毁时间不能为空",
+            trigger: "blur",
+          },
+        ],
+        putIn: [
+          {
+            required: true,
+            message: "销毁数量不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询药品销毁记录列表 */
+    getList() {
+      this.loading = true;
+      listBdgldurgruin(this.queryParams).then((response) => {
+        this.bdgldurgruinList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        durgArchivesId: null,
+        putIn: null,
+        manufacturer: null,
+        specifications: null,
+        durgBrand: null,
+        createtime: null,
+        putinId: null,
+        status: 0,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.durgBrand = null;
+      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;
+      getBdgldurgruin(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) {
+            updateBdgldurgruin(this.form).then((response) => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBdgldurgruin(this.form).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm("是否确认删除药品销毁记录的数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return delBdgldurgruin(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有药品销毁记录数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.exportLoading = true;
+          return exportBdgldurgruin(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style scoped>
+/* 设置按钮透明边框  */
+.el-button {
+  border: 1px solid transparent;
+}
+.el-button--warning.is-plain {
+  width: auto;
+}
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+}
+::v-deep .el-textarea__inner {
+  width: 660px;
+  height: 104px;
+  margin: auto !important;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 660px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .el-pager li {
+  background: #004d86 !important;
+  color: #fff !important;
+}
+/* 输入框显示手指 */
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+</style>

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -28,6 +28,20 @@
       </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:bdgldurgarchives:add']"
+          >新增</el-button
+        >
+      </el-col>
+    </el-row>
+
     <el-table
       v-loading="loading"
       :data="bdgldurgputinList"
@@ -56,8 +70,8 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="入库位置" align="center" prop="place" />
-      <el-table-column label="入库数量" align="center" prop="putIn" />
+      <el-table-column label="存放位置" align="center" prop="place" />
+      <el-table-column label="过期数量" align="center" prop="putIn" />
       <el-table-column label="剩余库存" align="center" prop="surplus" />
       <el-table-column label="药品来源" align="center" prop="source" />
       <!-- <el-table-column label="入库说明" align="center" prop="remarks" /> -->
@@ -65,7 +79,7 @@
         label="过期日期"
         align="center"
         prop="overduedate"
-        width="180"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.overduedate, "{y}-{m}-{d}") }}</span>
@@ -90,6 +104,19 @@
         prop="productIntroduction"
       /> -->
       <!-- <el-table-column label="库房" align="center" prop="unitId" /> -->
+      <el-table-column label="备注" align="center" prop="place">
+        <template slot-scope="scope">
+          <span
+            v-if="scope.row.expiredstatus == '1'"
+            style="color: "
+            :title="scope.row.beizhu"
+            >手动添加</span
+          >
+          <span v-if="scope.row.expiredstatus == '0'" style="color: "
+            >自动转入</span
+          >
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -132,15 +159,12 @@
         label-width="80px"
         inline
       >
-        <el-form-item label="入库编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入药品来源" />
-        </el-form-item>
         <el-form-item label="药品名称" prop="durgName">
           <el-select v-model="form.durgName" placeholder="请选择药品名称">
             <el-option
               v-for="(item, i) in yaoList"
               :key="i"
-              :value="item.id"
+              :value="item.durgName"
               :label="item.yaoPinName"
               @click.native="yapPing(item)"
             >
@@ -150,10 +174,10 @@
         <el-form-item label="药品来源" prop="source">
           <el-input v-model="form.source" placeholder="请输入药品来源" />
         </el-form-item>
-        <el-form-item label="入库数量" prop="putIn">
+        <el-form-item label="过期数量" prop="putIn">
           <el-input v-model="form.putIn" placeholder="请输入入库数量" />
         </el-form-item>
-        <el-form-item label="入库位置" prop="place">
+        <el-form-item label="存放位置" prop="place">
           <el-input v-model="form.place" placeholder="请输入入库位置" />
         </el-form-item>
         <el-form-item label="入库时间" prop="putTime">
@@ -181,10 +205,10 @@
           >
           </el-date-picker>
         </el-form-item>
-        <div class="jiben">入库说明</div>
-        <el-form-item prop="remarks">
+        <div class="jiben">备注</div>
+        <el-form-item prop="beizhu">
           <el-input
-            v-model="form.remarks"
+            v-model="form.beizhu"
             type="textarea"
             placeholder="请输入内容"
           />
@@ -234,7 +258,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -242,13 +266,11 @@
 
 <script>
 import {
-  listBdgldurgputin,
   updateBdgldurgputin,
   delBdgldurgputin,
   addBdgldurgputin,
   exportBdgldurgputin,
   exportYao,
-  getBdgldurgputin,
 } from "@/api/medicalhealth/bdgldurgputin";
 import {
   exportYaoPing,
@@ -308,8 +330,6 @@ export default {
       rules: {},
       // 药品列表
       yaoList: [],
-      //   药品销毁
-      bdglDurgPutin: "",
     };
   },
   created() {
@@ -318,7 +338,6 @@ export default {
   methods: {
     // 药品名称触发赋值
     yapPing(data) {
-      // console.log(data);
       this.form.unitId = data.unitId;
       this.form.unitName = data.unitName;
       this.form.manufacturer = data.manufacturer;
@@ -395,7 +414,7 @@ export default {
       this.reset();
       this.getYaoPing();
       this.open = true;
-      this.title = "添加药品入库登记";
+      this.title = "添加药品过期情况";
     },
     /** 销毁按钮操作 */
     handleUpdate(row) {
@@ -413,12 +432,6 @@ export default {
           });
         })
         .catch(() => {});
-      //   exportYaoPingXiaoHui(id).then((response) => {
-      //     this.form = response.data;
-      //     this.getYaoPing();
-      //     this.open = true;
-      //     this.title = "修改药品入库登记";
-      //   });
     },
     /** 提交按钮 */
     submitForm() {
@@ -431,6 +444,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.expiredstatus = "1";
             addBdgldurgputin(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -561,10 +575,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/bdgldurgputin/index.vue

@@ -318,9 +318,22 @@ export default {
     this.getList();
   },
   methods: {
+    // 编号
+    planName() {
+      let date = new Date();
+      let year = date.getFullYear();
+      let month =
+        date.getMonth() + 1 <= 9
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1;
+      let day = date.getDate();
+      let hour = date.getHours() <= 9 ? "0" + date.getHours() : date.getHours();
+      let minute =
+        date.getMinutes <= 9 ? "0" + date.getMinutes() : date.getMinutes();
+      this.form.number = year + month + day + hour + minute;
+    },
     // 药品名称触发赋值
     yapPing(data) {
-      // console.log(data);
       this.form.unitId = data.unitId;
       this.form.unitName = data.unitName;
       this.form.manufacturer = data.manufacturer;
@@ -328,6 +341,7 @@ export default {
       this.form.storeHouse = data.storeHouse;
       this.form.durgArchivesId = data.id;
       this.form.durgBrand = data.durgBrand;
+      this.planName();
     },
     // 查询药品名称列表
     getYaoPing() {

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -506,6 +506,20 @@ export default {
     this.getList();
   },
   methods: {
+    // 编号
+    planName() {
+      let date = new Date();
+      let year = date.getFullYear();
+      let month =
+        date.getMonth() + 1 <= 9
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1;
+      let day = date.getDate();
+      let hour = date.getHours() <= 9 ? "0" + date.getHours() : date.getHours();
+      let minute =
+        date.getMinutes <= 9 ? "0" + date.getMinutes() : date.getMinutes();
+      this.form.number = year + month + day + hour + minute;
+    },
     // 使用人选择触发
     shiyongren(name) {
       this.form.peopleName = name;
@@ -539,7 +553,6 @@ export default {
     },
     // 药品名称触发赋值
     yapPing(data) {
-      console.log(data);
       this.form.unitId = data.unitId;
       this.form.unitName = data.unitName;
       this.form.manufacturer = data.manufacturer;
@@ -548,6 +561,7 @@ export default {
       this.form.durgArchivesId = data.id;
       this.form.durgBrand = data.durgBrand;
       this.yaoPingShu = data.amount;
+      this.planName();
     },
     // 查询药品名称列表
     getYaoPing() {