更改要事日记样式，完成防疫过期新增，完成防疫销毁，完成耗材销毁，完成耗材过期新增，完成防疫销毁Api

src/api/medicalhealth/antiepidemicputin.js

@@ -59,4 +59,13 @@ export function exportAntiepidemiFangYi(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 查询过期列表
+export function exportAntiepidemiGuoQi(query) {
+  return request({
+    url: '/medicalhealth/fangyiguoqi/getGuoQi',
+    method: 'get',
+    params: query
+  })
+}

src/api/medicalhealth/consumeputin.js

@@ -63,7 +63,7 @@ export function exportYaoPing(query) {
 // 药品销毁
 export function exportYaoPingXiaoHui(query) {
   return request({
-    url: '/medicalhealth/yaopinguoqi/edit',
+    url: '/medicalhealth/yaopinguoqi',
     method: 'get',
     params: { id: query }
   })

src/assets/styles/global.css

@@ -970,10 +970,14 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 }
 
 #dialoges .greed {
-  margin-left: 0px;
+  width: 139px;
+  display: inline-block;
+  /* margin-left: 2px; */
   /* background-color: #fff; */
-  margin-bottom: 14px;
-  margin-right: 40px;
+  /* margin-bottom: 14px; */
+  margin-right: 34px;
+  font-size: 14px;
+  margin-bottom: 10px;
 }
 
 #dialoges .zuiDa {
@@ -1160,24 +1164,30 @@ input:-moz-placeholder {
 .el-dialog:not(.is-fullscreen) {
   margin-top: 10vh !important;
 }
+
 /* 规章制度弹框样式 */
-#fileinfodocx .el-dialog__body{
+#fileinfodocx .el-dialog__body {
   height: 650px !important;
   overflow: auto !important;
 }
-#fileinfopdf .el-dialog__body{
+
+#fileinfopdf .el-dialog__body {
   height: 650px !important;
   overflow: auto !important;
 }
-#fileinfodocx .el-dialog{
+
+#fileinfodocx .el-dialog {
   background-color: white !important;
 }
-#fileinfopdf .el-dialog{
+
+#fileinfopdf .el-dialog {
   background-color: white !important;
 }
-#fileinfodocx .el-dialog__title{
+
+#fileinfodocx .el-dialog__title {
   color: black !important;
 }
-#fileinfopdf .el-dialog__title{
+
+#fileinfopdf .el-dialog__title {
   color: black !important;
 }

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -9,8 +9,8 @@
     >
       <el-form-item prop="durgBrand">
         <el-input
-          v-model="queryParams.durgBrand"
-          placeholder="请输入品牌"
+          v-model="queryParams.durgName"
+          placeholder="请输入防疫品名称"
           clearable
           size="small"
           @input="handleQuery"
@@ -56,11 +56,8 @@
           }}</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="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">
@@ -72,20 +69,7 @@
       </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"
@@ -94,16 +78,17 @@
         <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="功能主治"
+      </el-table-column>
+      <el-table-column
+        label="过期日期"
         align="center"
-        prop="productIntroduction"
-      /> -->
-      <!-- <el-table-column label="库房" align="center" prop="unitId" /> -->
+        prop="expirationTime"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expirationTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="place">
         <template slot-scope="scope">
           <span
@@ -159,26 +144,26 @@
         label-width="80px"
         inline
       >
-        <el-form-item label="药品名称" prop="durgName">
-          <el-select v-model="form.durgName" placeholder="请选择药品名称">
+        <el-form-item label="防疫品名称" prop="durgArchivesId">
+          <el-select v-model="form.durgName" placeholder="请选择防疫品名称">
             <el-option
-              v-for="(item, i) in yaoList"
+              v-for="(item, i) in fangYi"
               :key="i"
               :value="item.durgName"
-              :label="item.yaoPinName"
-              @click.native="yapPing(item)"
+              :label="item.name"
+              @click.native="fangYiPingXuan(item)"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="药品来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入药品来源" />
+        <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-input v-model="form.putIn" placeholder="请输入过期数量" />
         </el-form-item>
         <el-form-item label="存放位置" prop="place">
-          <el-input v-model="form.place" placeholder="请输入入库位置" />
+          <el-input v-model="form.place" placeholder="请输入存放位置" />
         </el-form-item>
         <el-form-item label="入库时间" prop="putTime">
           <el-date-picker
@@ -194,11 +179,11 @@
         <!-- <el-form-item label="入库说明" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入入库说明" />
         </el-form-item> -->
-        <el-form-item label="过期日期" prop="overduedate">
+        <el-form-item label="过期日期" prop="expirationTime">
           <el-date-picker
             clearable
             size="small"
-            v-model="form.overduedate"
+            v-model="form.expirationTime"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择过期日期"
@@ -266,16 +251,13 @@
 
 <script>
 import {
-  updateBdgldurgputin,
-  delBdgldurgputin,
-  addBdgldurgputin,
-  exportBdgldurgputin,
-  exportYao,
-} from "@/api/medicalhealth/bdgldurgputin";
-import {
-  exportYaoPing,
-  exportYaoPingXiaoHui,
-} from "@/api/medicalhealth/consumeputin";
+  exportAntiepidemiFangYi,
+  exportAntiepidemiGuoQi,
+  addAntiepidemicputin,
+  updateAntiepidemicputin,
+  delAntiepidemicputin,
+  exportAntiepidemicputin,
+} from "@/api/medicalhealth/antiepidemicputin";
 
 export default {
   name: "Bdgldurgputin",
@@ -296,7 +278,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 药品入库登记表格数据
+      // 入库登记表格数据
       bdgldurgputinList: [],
       // 弹出层标题
       title: "",
@@ -309,54 +291,51 @@ export default {
         durgArchivesId: null,
         putIn: null,
         place: null,
-        source: null,
-        remarks: null,
-        overduedate: null,
         putTime: null,
         adminId: null,
-        number: null,
-        surplus: null,
-        status: null,
+        createtime: null,
+        updatetime: null,
         durgBrand: null,
-        manufacturer: null,
         specifications: null,
-        productIntroduction: null,
-        storeHouse: null,
         unitId: null,
+        storeHouse: null,
+        putNumber: null,
+        beizhu: null,
+        durgName: null,
+        source: null,
+        expirationTime: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
-      // 药品列表
-      yaoList: [],
+      // 防疫品名称
+      fangYi: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    // 药品名称触发赋值
-    yapPing(data) {
+    // 选择防疫品
+    fangYiPingXuan(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;
+      this.form.specifications = data.specifications;
+      this.form.storeHouse = data.storeHouse;
+      this.form.unitName = data.unitName;
     },
-    // 查询药品名称列表
-    getYaoPing() {
-      exportYao().then((response) => {
-        this.yaoList = response.data;
+    // 查询防疫品名称列表
+    fangYiPing() {
+      exportAntiepidemiFangYi().then((response) => {
+        this.fangYi = response.data;
       });
     },
-    /** 查询药品入库登记列表 */
+    /** 查询入库登记列表 */
     getList() {
       this.loading = true;
-      exportYaoPing(this.queryParams).then((response) => {
-        console.log(response);
+      exportAntiepidemiGuoQi(this.queryParams).then((response) => {
         this.bdgldurgputinList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -374,22 +353,19 @@ export default {
         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",
+        createtime: null,
+        updatetime: null,
         durgBrand: null,
-        manufacturer: null,
         specifications: null,
-        productIntroduction: null,
-        storeHouse: null,
         unitId: null,
+        storeHouse: null,
+        putNumber: null,
+        beizhu: null,
+        durgName: null,
+        source: null,
+        expirationTime: null,
       };
       this.resetForm("form");
     },
@@ -400,7 +376,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      (this.queryParams.durgName = null), this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
@@ -412,21 +388,23 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getYaoPing();
+      this.fangYiPing();
       this.open = true;
-      this.title = "添加药品过期情况";
+      this.title = "添加防疫用品过期情况";
     },
     /** 销毁按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids;
+      this.form = row;
       this.$modal
-        .confirm("是否确认销毁药品的数据项？", {
+        .confirm("是否确认销毁防疫用品的数据项？", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
         })
         .then(() => {
-          exportYaoPingXiaoHui(id).then((response) => {
+          console.log(this.form);
+          this.form.state = "1";
+          updateAntiepidemicputin(this.form).then((response) => {
             this.$modal.msgSuccess("销毁成功");
             this.getList();
           });
@@ -438,14 +416,14 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBdgldurgputin(this.form).then((response) => {
+            updateAntiepidemicputin(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             this.form.expiredstatus = "1";
-            addBdgldurgputin(this.form).then((response) => {
+            addAntiepidemicputin(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -458,9 +436,9 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm("是否确认删除药品入库登记的数据项？")
+        .confirm("是否确认删除防疫用品的数据项？")
         .then(function () {
-          return delBdgldurgputin(ids);
+          return delAntiepidemicputin(ids);
         })
         .then(() => {
           this.getList();
@@ -472,10 +450,10 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$modal
-        .confirm("是否确认导出所有药品入库登记数据项？")
+        .confirm("是否确认导出所有防疫用品数据项？")
         .then(() => {
           this.exportLoading = true;
-          return exportBdgldurgputin(queryParams);
+          return exportAntiepidemicputin(queryParams);
         })
         .then((response) => {
           this.$download.name(response.msg);

src/views/medicalhealth/antiepidemicputin/index.vue

@@ -205,6 +205,16 @@
           <span>{{ parseTime(scope.row.putTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="过期时间"
+        align="center"
+        prop="expirationTime"
+        width="140"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expirationTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="录入人(创建人)" align="center" prop="adminId" /> -->
       <!-- <el-table-column label="录入时间" align="center" prop="createtime" />
       <el-table-column label="更新时间" align="center" prop="updatetime" />
@@ -272,6 +282,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="入库编号" prop="number">
+          <el-input v-model="form.putNumber" placeholder="请输入入库编号" />
+        </el-form-item>
         <el-form-item label="入库数量" prop="putIn">
           <el-input v-model="form.putIn" placeholder="请输入入库数量" />
         </el-form-item>
@@ -289,11 +302,11 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="过期日期" prop="overduedate">
+        <el-form-item label="过期日期" prop="expirationTime">
           <el-date-picker
             clearable
             size="small"
-            v-model="form.overduedate"
+            v-model="form.expirationTime"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择过期日期"
@@ -342,8 +355,6 @@ import {
   exportAntiepidemicputin,
   exportAntiepidemiFangYi,
 } from "@/api/medicalhealth/antiepidemicputin";
-// 查询字典
-import { getDicts } from "@/api/system/dict/data";
 
 export default {
   name: "Antiepidemicputin",
@@ -385,6 +396,11 @@ export default {
         specifications: null,
         unitId: null,
         storeHouse: null,
+        putNumber: null,
+        beizhu: null,
+        durgName: null,
+        source: null,
+        expirationTime: null,
       },
       // 表单参数
       form: {},
@@ -398,14 +414,29 @@ 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.putNumber = year + month + day + hour + minute;
+    },
     // 选择防疫品
     fangYiPingXuan(data) {
-      this.form.unitId = data.unitId;
-      this.form.durgArchivesId = data.id;
-      this.form.durgBrand = data.durgBrand;
-      this.form.specifications = data.specifications;
-      this.form.storeHouse = data.storeHouse;
-      this.form.unitName = data.unitName;
+      this.planName();
+      // this.form.unitId = data.unitId;
+      // this.form.durgArchivesId = data.id;
+      // this.form.durgBrand = data.durgBrand;
+      // this.form.specifications = data.specifications;
+      // this.form.storeHouse = data.storeHouse;
+      // this.form.unitName = data.unitName;
     },
     // 查询防疫品名称列表
     fangYiPing() {
@@ -442,6 +473,11 @@ export default {
         specifications: null,
         unitId: null,
         storeHouse: null,
+        putNumber: null,
+        beizhu: null,
+        durgName: null,
+        source: null,
+        expirationTime: null,
       };
       this.resetForm("form");
     },
@@ -615,10 +651,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/antiepidemicputout/index.vue

@@ -784,10 +784,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/antiepidemicruin/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="durgArchivesId">
+      <el-form-item prop="durgBrand">
         <el-input
           v-model="queryParams.durgBrand"
           placeholder="请输入品牌"
@@ -51,18 +51,19 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <!-- <el-form-item label="销毁时间" prop="createtime">
-        <el-input
-          v-model="queryParams.createtime"
-          placeholder="请输入销毁时间"
+      </el-form-item>
+      <el-form-item label="销毁时间" prop="createtime">
+        <el-date-picker
           clearable
           size="small"
-          :editable="false"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="销毁时间" prop="putinId">
+          v-model="queryParams.createtime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择销毁时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="销毁时间" prop="putinId">
         <el-input
           v-model="queryParams.putinId"
           placeholder="请输入销毁时间"
@@ -82,7 +83,11 @@
         </el-select>
       </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>
@@ -97,7 +102,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['medicalhealth:bdgldurgruin:add']"
+          v-hasPermi="['medicalhealth:ruin:add']"
           >新增</el-button
         >
       </el-col>
@@ -109,7 +114,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['medicalhealth:bdgldurgruin:edit']"
+          v-hasPermi="['medicalhealth:ruin:edit']"
           >修改</el-button
         >
       </el-col>
@@ -121,7 +126,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['medicalhealth:bdgldurgruin:remove']"
+          v-hasPermi="['medicalhealth:ruin:remove']"
           >删除</el-button
         >
       </el-col>
@@ -133,7 +138,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['medicalhealth:bdgldurgruin:export']"
+          v-hasPermi="['medicalhealth:ruin:export']"
           >导出</el-button
         >
       </el-col>
@@ -145,7 +150,7 @@
 
     <el-table
       v-loading="loading"
-      :data="bdgldurgruinList"
+      :data="ruinList"
       @selection-change="handleSelectionChange"
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
@@ -157,36 +162,47 @@
           }}</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="manufacturer">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.storage_room"
+            :value="scope.row.manufacturer"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="销毁数量" align="center" prop="putIn" />
-      <el-table-column label="销毁时间" align="center" prop="createtime">
+      <el-table-column
+        label="销毁时间"
+        align="center"
+        prop="createtime"
+        width="180"
+      >
         <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"
+            size="mini"
             type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['medicalhealth:bdgldurgruin:edit']"
+            v-hasPermi="['medicalhealth:ruin:edit']"
             >修改</el-button
           >
           <el-button
-            size="btd"
+            size="mini"
             type="text"
+            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['medicalhealth:bdgldurgruin:remove']"
+            v-hasPermi="['medicalhealth:ruin:remove']"
             >删除</el-button
           >
         </template>
@@ -201,20 +217,13 @@
       @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-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="销毁时间" prop="durgArchivesId">
           <el-input
             v-model="form.durgArchivesId"
             placeholder="请输入销毁时间"
-            :editable="false"
           />
         </el-form-item>
         <el-form-item label="销毁数量" prop="putIn">
@@ -248,16 +257,17 @@
 
 <script>
 import {
-  listBdgldurgruin,
-  getBdgldurgruin,
-  delBdgldurgruin,
-  addBdgldurgruin,
-  updateBdgldurgruin,
-  exportBdgldurgruin,
-} from "@/api/medicalhealth/bdgldurgruin";
+  listRuin,
+  getRuin,
+  delRuin,
+  addRuin,
+  updateRuin,
+  exportRuin,
+} from "@/api/medicalhealth/antiepidemicruin";
 
 export default {
-  name: "Bdgldurgruin",
+  name: "Ruin",
+  dicts: ["storage_room"],
   data() {
     return {
       // 遮罩层
@@ -274,8 +284,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 药品销毁记录表格数据
-      bdgldurgruinList: [],
+      // 防疫用品销毁记录表格数据
+      ruinList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -296,33 +306,18 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-        durgArchivesId: [
-          {
-            required: true,
-            message: "销毁时间不能为空",
-            trigger: "blur",
-          },
-        ],
-        putIn: [
-          {
-            required: true,
-            message: "销毁数量不能为空",
-            trigger: "blur",
-          },
-        ],
-      },
+      rules: {},
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询药品销毁记录列表 */
+    /** 查询防疫用品销毁记录列表 */
     getList() {
       this.loading = true;
-      listBdgldurgruin(this.queryParams).then((response) => {
-        this.bdgldurgruinList = response.rows;
+      listRuin(this.queryParams).then((response) => {
+        this.ruinList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -354,7 +349,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.durgBrand = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -368,16 +362,16 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加药品销毁记录";
+      this.title = "添加防疫用品销毁记录";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getBdgldurgruin(id).then((response) => {
+      getRuin(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改药品销毁记录";
+        this.title = "修改防疫用品销毁记录";
       });
     },
     /** 提交按钮 */
@@ -385,14 +379,14 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBdgldurgruin(this.form).then((response) => {
-              this.msgSuccess("修改成功");
+            updateRuin(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addBdgldurgruin(this.form).then((response) => {
-              this.msgSuccess("新增成功");
+            addRuin(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -403,34 +397,28 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm("是否确认删除药品销毁记录的数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
+      this.$modal
+        .confirm('是否确认删除防疫用品销毁记录编号为"' + ids + '"的数据项？')
         .then(function () {
-          return delBdgldurgruin(ids);
+          return delRuin(ids);
         })
         .then(() => {
           this.getList();
-          this.msgSuccess("删除成功");
+          this.$modal.msgSuccess("删除成功");
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有药品销毁记录数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
+      this.$modal
+        .confirm("是否确认导出所有防疫用品销毁记录数据项？")
         .then(() => {
           this.exportLoading = true;
-          return exportBdgldurgruin(queryParams);
+          return exportRuin(queryParams);
         })
         .then((response) => {
-          this.download(response.msg);
+          this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});

src/views/medicalhealth/consumeguoqi/index.vue

@@ -28,6 +28,19 @@
       </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"
@@ -55,15 +68,24 @@
           />
         </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="remarks" /> -->
+      <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="putTime"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.putTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="过期日期"
         align="center"
         prop="overduedate"
-        width="180"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.overduedate, "{y}-{m}-{d}") }}</span>
@@ -88,6 +110,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"
@@ -130,29 +165,26 @@
         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-form-item label="耗材名称" prop="durgName">
+          <el-select v-model="form.durgName" placeholder="请选择耗材名称">
             <el-option
-              v-for="(item, i) in yaoList"
+              v-for="(item, i) in Consumables"
               :key="i"
-              :value="item.id"
-              :label="item.yaoPinName"
-              @click.native="yapPing(item)"
+              :label="item.name"
+              :value="item.durgName"
+              @click.native="haocailie(item)"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="药品来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入药品来源" />
+        <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 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 label="存放位置" prop="place">
+          <el-input v-model="form.place" placeholder="请输入存放位置" />
         </el-form-item>
         <el-form-item label="入库时间" prop="putTime">
           <el-date-picker
@@ -179,60 +211,18 @@
           >
           </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="请输入内容"
           />
         </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">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -240,13 +230,14 @@
 
 <script>
 import {
-  updateBdgldurgputin,
-  delBdgldurgputin,
-  addBdgldurgputin,
-  exportBdgldurgputin,
-  exportYao,
-} from "@/api/medicalhealth/bdgldurgputin";
-
+  listPutin,
+  getPutin,
+  delPutin,
+  addPutin,
+  updatePutin,
+  exportPutin,
+  exportHaoCai,
+} from "@/api/medicalhealth/consumeputin";
 import { consumeGuoQi, consumeXiaoHui } from "@/api/medicalhealth/consumeguoqi";
 export default {
   name: "Bdgldurgputin",
@@ -267,13 +258,14 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 药品入库登记表格数据
+      // 耗材入库登记表格数据
       bdgldurgputinList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       // 查询参数
+      // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -299,34 +291,31 @@ export default {
       form: {},
       // 表单校验
       rules: {},
-      // 药品列表
-      yaoList: [],
-      //   药品销毁
-      bdglDurgPutin: "",
+      // 耗材列表
+      Consumables: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    // 药品名称触发赋值
-    yapPing(data) {
-      // console.log(data);
+    // 选中耗材
+    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;
-      this.form.durgArchivesId = data.id;
-      this.form.durgBrand = data.durgBrand;
     },
-    // 查询药品名称列表
-    getYaoPing() {
-      exportYao().then((response) => {
-        this.yaoList = response.data;
+    // 获取耗材列表
+    getHaoCai() {
+      exportHaoCai().then((res) => {
+        this.Consumables = res.data;
       });
     },
-    /** 查询药品入库登记列表 */
+    /** 查询耗材入库登记列表 */
     getList() {
       this.loading = true;
       consumeGuoQi(this.queryParams).then((response) => {
@@ -385,9 +374,9 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getYaoPing();
+      this.getHaoCai();
       this.open = true;
-      this.title = "添加药品入库登记";
+      this.title = "添加耗材过期情况";
     },
     /** 销毁按钮操作 */
     handleUpdate(row) {
@@ -416,13 +405,14 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBdgldurgputin(this.form).then((response) => {
+            updatePutin(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addBdgldurgputin(this.form).then((response) => {
+            this.form.expiredstatus = "1";
+            addPutin(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -435,7 +425,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm("是否确认删除药品入库登的数据项？")
+        .confirm("是否确认删除耗材过期的数据项？")
         .then(function () {
           return delBdgldurgputin(ids);
         })
@@ -552,10 +542,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 {
@@ -616,7 +606,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-.el-button--btd{
-      text-indent: -8px;
+.el-button--btd {
+  text-indent: -8px;
 }
 </style>

src/views/medicalhealth/consumeputin/index.vue

@@ -387,55 +387,6 @@
           >
           </el-date-picker>
         </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-item label="库房" prop="unitId">
-          <el-input v-model="form.unitId" 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> -->
         <div class="jiben">入库说明</div>
         <el-form-item label="" prop="remarks">
           <el-input

src/views/medicalhealth/consumeruin/index.vue

@@ -83,9 +83,6 @@
         />
       </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>

src/views/medicalhealth/diagnose/index.vue

@@ -192,7 +192,7 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="登记人" align="center" prop="userName" />
+      <el-table-column label="陪护人" align="center" prop="userName" />
       <el-table-column label="登记时间" align="center" prop="createtime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
@@ -212,6 +212,13 @@
         width="180px"
       >
         <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['medicalhealth:diagnose:edit']"
+            >归队</el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -275,6 +282,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="陪护" prop="address">
+          <el-input v-model="form.address" placeholder="请输入陪护人" />
+        </el-form-item>
         <el-form-item label="地点" prop="address">
           <el-input v-model="form.address" placeholder="请输入地点" />
         </el-form-item>
@@ -621,5 +631,6 @@ export default {
   margin-right: 46px;
 }
 ::v-deep .el-dialog__body {
-    padding: 30px 0px 0px 65px;}
+  padding: 30px 0px 0px 65px;
+}
 </style>

src/views/medicalhealth/examine/index.vue

@@ -139,13 +139,14 @@
           <!-- <el-button @click="handleUpdate"> 添加体检信息 </el-button>
           <el-button @click="chaKan"> 查看 </el-button> -->
           <el-button
+            size="btp"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['medicalhealth:examine:edit']"
             >添加体检信息</el-button
           >
           <el-button
-            size="btd"
+            size="btu"
             type="text"
             @click="handleUpdates(scope.row)"
             v-hasPermi="['medicalhealth:examine:edit']"
@@ -228,6 +229,18 @@
           <el-form-item label="年份" prop="yeardate">
             <el-input v-model="form.yeardate" />
           </el-form-item>
+          <div class="xiangMu">
+            <el-form-item label="项目" prop="yeardate">
+              <el-select v-model="form.wuPinType" placeholder="请选择物品类型">
+                <el-option
+                  v-for="dict in dict.type.project"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
           <div class="jiben">体检信息</div>
           <el-form-item>
             <quill-editor
@@ -307,7 +320,7 @@ export default {
     Treeselect,
     quillEditor,
   },
-  dicts: ["personnel_type"],
+  dicts: ["personnel_type", "project"],
   data() {
     return {
       // 遮罩层
@@ -357,14 +370,6 @@ export default {
     this.getList();
   },
   methods: {
-    // // 添加人员体检信息
-    // submitForms() {
-    //   addExamine(this.form).then((response) => {
-    //     this.$modal.msgSuccess("新增成功");
-    //     this.opene = false;
-    //     this.getList();
-    //   });
-    // },
     // 点击查看人员体检信息
     handleUpdates(row) {
       this.reset();
@@ -622,4 +627,38 @@ export default {
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
+.xiangMu {
+  display: inline-block;
+}
+.xiangMu > .el-form-item {
+  margin-left: 124px;
+}
+/* 体检 btp */
+.el-button--btp.is-active,
+.el-button--btp:active {
+  background: #1d96ff;
+  border-color: #1d96ff;
+  color: #ffffff;
+}
+
+.el-button--btp:focus,
+.el-button--btp:hover {
+  background: #1d96ff;
+  border-color: #1d96ff;
+  color: #ffffff;
+}
+
+.el-button--btp {
+  width: 116px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1d96ff;
+}
+.el-select-dropdown__item.selected {
+  color: #111;
+}
 </style>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -1205,7 +1205,6 @@ export default {
     },
     // 选择审批模板触发
     shenPiThemplate(data) {
-      console.log(data);
       this.$set(this.form, "peopleoneName", data.oneshenpirenname);
       this.$set(this.form, "peopletwoName", data.twoshenpirenname);
       this.$set(this.form, "peoplethreeName", data.threeshenpirenname);