Browse Source

修复医疗管理防疫发放,修改药品摧毁Api,修复过期药品查询

sunyanqiang 3 years ago
parent
commit
d399291f47

+ 9 - 0
src/api/medicalhealth/antiepidemicputin.js

@@ -50,4 +50,13 @@ export function exportAntiepidemicputin(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询防疫品名称
+export function exportAntiepidemiFangYi(query) {
+  return request({
+    url: '/medicalhealth/antiepidemicputin/getlist',
+    method: 'get',
+    params: query
+  })
 }

+ 7 - 7
src/api/medicalhealth/antiepidemicputout.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 查询防疫用品发放登记列表
-export function listPutout(query) {
+export function listAntiepidemicputout(query) {
   return request({
     url: '/medicalhealth/antiepidemicputout/list',
     method: 'get',
@@ -10,7 +10,7 @@ export function listPutout(query) {
 }
 
 // 查询防疫用品发放登记详细
-export function getPutout(id) {
+export function getAntiepidemicputout(id) {
   return request({
     url: '/medicalhealth/antiepidemicputout/' + id,
     method: 'get'
@@ -18,16 +18,16 @@ export function getPutout(id) {
 }
 
 // 新增防疫用品发放登记
-export function addPutout(data) {
+export function addAntiepidemicputout(data) {
   return request({
-    url: '/antiepidemicputout/putout',
+    url: '/medicalhealth/antiepidemicputout',
     method: 'post',
     data: data
   })
 }
 
 // 修改防疫用品发放登记
-export function updatePutout(data) {
+export function updateAntiepidemicputout(data) {
   return request({
     url: '/medicalhealth/antiepidemicputout',
     method: 'put',
@@ -36,7 +36,7 @@ export function updatePutout(data) {
 }
 
 // 删除防疫用品发放登记
-export function delPutout(id) {
+export function delAntiepidemicputout(id) {
   return request({
     url: '/medicalhealth/antiepidemicputout/' + id,
     method: 'delete'
@@ -44,7 +44,7 @@ export function delPutout(id) {
 }
 
 // 导出防疫用品发放登记
-export function exportPutout(query) {
+export function exportAntiepidemicputout(query) {
   return request({
     url: '/medicalhealth/antiepidemicputout/export',
     method: 'get',

+ 16 - 8
src/api/medicalhealth/consumeputin.js

@@ -52,11 +52,19 @@ export function exportPutin(query) {
   })
 }
 
-// // 药品过期列表
-// export function exportYaoPing(query) {
-//   return request({
-//     url: '/medicalhealth/yaopinguoqi/getGuoQ',
-//     method: 'get',
-//     params: query
-//   })
-// }
+// 药品过期列表
+export function exportYaoPing(query) {
+  return request({
+    url: '/medicalhealth/yaopinguoqi/getGuoQi',
+    method: 'get',
+    params: query
+  })
+}
+// 药品销毁
+export function exportYaoPingXiaoHui(query) {
+  return request({
+    url: '/medicalhealth/yaopinguoqi/eidtguoqi',
+    method: 'get',
+    params: { id: query }
+  })
+}

+ 4 - 9
src/views/medicalhealth/antiepidemicputin/index.vue

@@ -106,15 +106,10 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
-          type="primary"
-          size="btn"
-          @click="handleQuery"
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
         >
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -599,10 +594,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 {

+ 3 - 7
src/views/medicalhealth/bdgldurgarchives/index.vue

@@ -107,15 +107,10 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
-          type="primary"
-          size="btn"
-          @click="handleQuery"
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
         >
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -346,6 +341,7 @@ export default {
   components: {
     Treeselect,
   },
+  dicts: ["storage_room"],
   data() {
     return {
       // 遮罩层

+ 11 - 8
src/views/medicalhealth/bdgldurgputout/index.vue

@@ -151,15 +151,10 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
-          type="primary"
-          size="btn"
-          @click="handleQuery"
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
         >
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -251,7 +246,14 @@
         prop="productIntroduction"
       /> -->
       <el-table-column label="出库编号" align="center" prop="number" />
-      <el-table-column label="库房" align="center" prop="storeHouse" />
+      <el-table-column label="库房" align="center" prop="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="unitId" /> -->
       <el-table-column label="单位" align="center" prop="unitName1" />
       <!-- <el-table-column
@@ -436,6 +438,7 @@ export default {
   components: {
     Treeselect,
   },
+  dicts: ["storage_room"],
   data() {
     return {
       // 遮罩层