库存管理 药品和出库table页

src/api/financial/drug.js

@@ -41,7 +41,7 @@ export function getDrug(id) {
 // 查询药品入库存信息
 export function getDrugInventory(query) {
   return request({
-    url: '/finance/stock/drug/detail/listAllByDrugId',
+    url: '/finance/stock/drug/detail/list',
     method: 'get',
     params: query
   })
@@ -53,11 +53,13 @@ export function getDrugInventoryDetail(id) {
     method: 'get'
   })
 }
-// // 查询药品库存信息
-// export function getDrugInventory1(drugId) {
-//   return request({
-//     url: '/finance/stock/drug/detail/listAllByDrugId',
-//     method: 'get',
-//   })
-// }
+
+// 详情药品入库
+export function addQty(data) {
+  return request({
+    url: '/finance/stock/drug/manage/addQty',
+    method: 'post',
+    data: data
+  })
+}
 

src/views/inventory-management/drug-delivery-management/drug-delivery-management.vue

@@ -206,9 +206,9 @@
         :data="drugInventoryList"
         :header-cell-style="{ background:'#E8E9E8'}"
         :row-key="getRowKeys"
+        heght="500"
         @selection-change="handleSelectionChange"
       >
-
         <el-table-column label="药品名称" align="left" prop="type" show-overflow-tooltip />
         <el-table-column label="处方数量" align="left" prop="qty" show-overflow-tooltip />
         <el-table-column label="销售数量" align="left" prop="create_by" />
@@ -224,10 +224,18 @@
             @keydown.native="keydown($event)"
           />
         </el-table-column>
-        <el-table-column label="批次号" align="left" prop="batch_number">
-          <el-input v-model.trim="form.name" placeholder="请输入药品批次号" />
-        </el-table-column>
+        <!--        <el-table-column label="批次号" align="left" prop="batch_number">-->
+        <!--          <el-input v-model.trim="form.name" placeholder="请输入药品批次号" />-->
+        <!--        </el-table-column>-->
       </el-table>
+      <el-row>
+        <el-col style="display: flex;justify-content: left; margin-left: 10px; margin-top: 50px">
+          <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">
+            <span>确认</span>
+          </el-button>
+          <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="close">返 回</el-button>
+        </el-col>
+      </el-row>
     </el-dialog>
     <el-dialog title="配药出库" :visible.sync="isShowOne" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" label-width="100px">
@@ -298,6 +306,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
 
         <div class="title-paragraph">
           <div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">处方信息</div>
@@ -340,11 +349,11 @@
               />
             </el-form-item>
           </el-col>
-            <el-col :span="8">
-              <el-form-item label="批次号" prop="approvalNum">
-                <el-input v-model.trim="form.approvalNum" placeholder="请输入入库批次" style="width: 180px" />
-              </el-form-item>
-            </el-col>
+          <!--            <el-col :span="8">-->
+          <!--              <el-form-item label="批次号" prop="approvalNum">-->
+          <!--                <el-input v-model.trim="form.approvalNum" placeholder="请输入入库批次" style="width: 180px" />-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
           <el-col :span="8">
             <el-form-item label="货位">
               <el-input v-model.trim="form.location" style="width: 180px" disabled />
@@ -361,15 +370,14 @@
             <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="closeWindow">返 回</el-button>
           </el-col>
         </el-row>
-
-        </el-row></el-form></el-dialog>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { regionData } from 'element-china-area-data'
 import { delDevice, listDeviceAll } from '@/api/business/device'
-import { getInfo } from '@/api/login'
 import { parseTime } from '@/utils/ruoyi'
 import { mapGetters } from 'vuex'
 import { listDrugDelivery } from '../../../api/financial/drug'
@@ -529,39 +537,12 @@ export default {
   computed: {
     ...mapGetters(['userType'])
   },
-  watch: {
-    useTime: {
-      handler(newVal, oldVal) {
-        if ((this.useTime.ame != null && this.useTime.ams != null && this.useTime.pme == null && this.useTime.pms == null) || (this.useTime.pme != null && this.useTime.pms != null && this.useTime.ame == null && this.useTime.ams == null) || (this.useTime.ame != null && this.useTime.ams != null && this.useTime.pme != null && this.useTime.pms != null)) {
-          this.rules.userTime.forEach(item => item.required = false)
-          console.log('111')
-        } else {
-          this.rules.userTime.forEach(item => item.required = true)
-          console.log('2222')
-        }
-      },
-      deep: true
-    }
-  },
+
   created() {
     this.getList()
   },
   methods: {
-    // 获取登陆人信息
-    getUserInfo() {
-      getInfo().then(res => {
-        console.log('-------------------', res)
-        this.userType = res.user.userType
-        console.log('this.userTyep', this.userType)
-        if (this.userType === '3') {
-          this.orderShow = false
-        }
-        if (this.userType === '00') {
-          this.serviceShow = false
-        }
-      })
-    },
-
+    // 数字两位显示
     fun(val) {
       return Number(val).toFixed(2)
     },
@@ -610,43 +591,6 @@ export default {
       })
     },
 
-    // // 取消按钮
-    // cancel() {
-    //   this.open = false
-    //   this.reset()
-    // },
-    // // 表单重置
-    // reset() {
-    //   this.daterangeCreateTime = ''
-    //   this.serviceArea = ''
-    //   this.form = {
-    //     id: null,
-    //     deviceCode: null,
-    //     deptId: null,
-    //     deviceName: null,
-    //     head: null,
-    //     phone: null,
-    //     deviceType: null,
-    //     checkType: null,
-    //     isPrivate: null,
-    //     serviceArea: null,
-    //     reservationMethod: null,
-    //     useTime: null,
-    //     servicePrice: null,
-    //     orderPrice: null,
-    //     status: null,
-    //     useNum: null,
-    //     sort: null,
-    //     delFlag: null,
-    //     createBy: null,
-    //     createTime: null,
-    //     updateBy: null,
-    //     updateTime: null,
-    //     remark: null
-    //
-    //   }
-    //   this.resetForm('form')
-    // },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -666,9 +610,7 @@ export default {
         isPrivate: null,
         sortedColumn: ''
       }
-      //   this.handleQuery()
-      // this.queryParams.checkTypeList = ''
-      // this.resetForm('queryForm')
+
       this.handleQuery()
     },
     getRowKeys(row) {
@@ -811,9 +753,24 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style lang="scss">
 .app-container{
   background-color: white;
 }
+.title-paragraph {
+  margin-bottom: 20px;
+  border-left: 5px solid #5FB54B;
+
+  .title-text {
+    margin-left: 10px;
+  }
+
+  .title {
+    color: #666666;
+    font-weight: 600;
+    font-size: 17px
+
+  }
+}
 
 </style>