From 75740b73ae1050e7df006b05d4314715e1369cdd Mon Sep 17 00:00:00 2001
From: duan <duanduanduan.com>
Date: Tue, 30 Aug 2022 08:56:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(src/views/reagent/weighing):=20=E7=A7=B0?=
 =?UTF-8?q?=E9=87=8Dapi=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reagent/weight.js            |  8 ++++++++
 src/views/reagent/weighing/index.vue | 29 ++++++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/api/reagent/weight.js b/src/api/reagent/weight.js
index 553f1c9..85f22eb 100644
--- a/src/api/reagent/weight.js
+++ b/src/api/reagent/weight.js
@@ -15,3 +15,11 @@ export function update_drug_remain(data) {
     data
   })
 }
+
+export function get_drug_info(data) {
+  return request({
+    url: '/api/drug/get_drug_info',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/reagent/weighing/index.vue b/src/views/reagent/weighing/index.vue
index faca264..c57ec65 100644
--- a/src/views/reagent/weighing/index.vue
+++ b/src/views/reagent/weighing/index.vue
@@ -23,7 +23,7 @@
             <el-radio v-model="radio" label="2">用量称重</el-radio>
             <el-button type="primary" @click="doWeigh">开始称重</el-button>
             <el-button type="primary" plain>去皮（初始化天平）</el-button>
-            <el-input placeholder="手动输入" />
+            <el-input placeholder="手动输入"/>
             <el-button type="warning">设置为空</el-button>
           </div>
         </div>
@@ -31,12 +31,12 @@
       <div class="bottom">
         <div class="title">详情信息</div>
         <el-descriptions class="margin-top" :column="2" border>
-          <el-descriptions-item span="2" label="试剂名称">{{ infoData.name }}</el-descriptions-item>
-          <el-descriptions-item span="2" label="英文名称">{{ infoData.english_name }}}</el-descriptions-item>
+          <el-descriptions-item label-style="width:100px" span="2" label="试剂名称">{{infoData.name }}</el-descriptions-item>
+          <el-descriptions-item span="2" label="英文名称">{{ infoData.english_name }}</el-descriptions-item>
           <el-descriptions-item label="条码编号">{{ infoData.bar_code }}</el-descriptions-item>
-          <el-descriptions-item label="CAS码">{{ infoData.cas_number }}</el-descriptions-item>
+          <el-descriptions-item label-style="width:100px" label="CAS码">{{ infoData.cas_number }}</el-descriptions-item>
           <el-descriptions-item label="试剂纯度">{{ infoData.purity }}</el-descriptions-item>
-          <el-descriptions-item label="试剂余量">578</el-descriptions-item>
+          <el-descriptions-item label="试剂余量">{{ infoData.remain }}</el-descriptions-item>
           <el-descriptions-item label="生产日期">{{ infoData.production_date }}</el-descriptions-item>
           <el-descriptions-item label="过期日期">{{ infoData.expiration_date }}</el-descriptions-item>
           <el-descriptions-item label="生产厂家">{{ infoData.manufacturer }}</el-descriptions-item>
@@ -49,7 +49,7 @@
           <el-descriptions-item label="是否监管">{{ infoData.is_supervise }}</el-descriptions-item>
           <el-descriptions-item label="所属终端">{{ infoData.client_id }}</el-descriptions-item>
           <el-descriptions-item label="最后使用人">
-            <el-tag>{{ infoData.by_user_name }}</el-tag>
+            <el-tag v-if="infoData.by_user_name">{{ infoData.by_user_name }}</el-tag>
           </el-descriptions-item>
         </el-descriptions>
       </div>
@@ -59,18 +59,17 @@
 </template>
 
 <script>
-import Scannner from '@/components/Scannner/index'
-import { use } from '@/api/reagent/receivingReturn'
 import stringify from '@/utils/stringify'
-import { update_drug_remain, weigh } from '@/api/reagent/weight'
-import { set_drug_empty_bottle } from '@/api/reagent/management'
+import Scannner from '@/components/Scannner/index'
+import {update_drug_remain, weigh, get_drug_info} from '@/api/reagent/weight'
+import {set_drug_empty_bottle} from '@/api/reagent/management'
 
 export default {
   name: 'Weighing',
-  components: { Scannner },
+  components: {Scannner},
   data() {
     return {
-      headerStyle: { 'background': '#E6E6E6' },
+      headerStyle: {'background': '#E6E6E6'},
       tableData: [],
       radio: '1',
       barCode: '',
@@ -83,9 +82,9 @@ export default {
   watch: {
     // 如果 `barCode` 发生改变，这个函数就会运行
     // 扫码后提交后台并自动选择下一行
-    barCode: function(newCode, oldCode) {
+    barCode: function (newCode, oldCode) {
       if (this.$route.name === 'Receiving') {
-        use(stringify({ 'bar_code': newCode })).then(res => {
+        get_drug_info(stringify({'bar_code': newCode})).then(res => {
           this.infoData = res.data
           this.$message.success(res.data.name + '  试剂领扫描成功！')
         })
@@ -218,6 +217,7 @@ export default {
             padding: 0.75rem 8.25rem 0.75rem 8.25rem;
             width: 41.25rem;
             height: 7.75rem;
+            display: inline-block;
             background: linear-gradient(180deg, #FFFFFF 0%, #F2F6FC 100%);
             box-shadow: inset 0rem 0.25rem 0.75rem 0.0625rem #DCDFE6;
             border-radius: 0.25rem 0.25rem 0.25rem 0.25rem;
@@ -225,6 +225,7 @@ export default {
             font-size: 6.25rem;
             font-weight: 400;
             color: #606266;
+            text-align: center;
           }
 
           .unit {