From d00866a2ef1b5c8805fa6fe5dfe01a8aaefeed62 Mon Sep 17 00:00:00 2001
From: tangxuan <2233783319@qq.com>
Date: Thu, 30 Mar 2023 16:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=85=A7=E5=93=81=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ReagentForm/index.vue          | 28 ++++++++
 .../reagent/receivingandreturn/index.vue      | 66 +++++++++++++++----
 .../reagent/report/reagentinfo/index.vue      |  7 ++
 3 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/src/components/ReagentForm/index.vue b/src/components/ReagentForm/index.vue
index 4dd13aa..6d67e9e 100644
--- a/src/components/ReagentForm/index.vue
+++ b/src/components/ReagentForm/index.vue
@@ -100,6 +100,31 @@
             <el-input v-model="formData.category" placeholder="请输入分类" clearable :style="{ width: '100%' }" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="包装" prop="is_packing">
+            <el-select v-model="formData.is_packing" :style="{ width: '100%' }" placeholder="包装是否完好">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="标签" prop="is_label">
+            <el-select v-model="formData.is_label" :style="{ width: '100%' }" placeholder="标签是否清晰">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="外观" prop="is_aspect">
+            <el-select v-model="formData.is_aspect" :style="{ width: '100%' }" placeholder="外观是否符合要求">
+              <el-option label="是" value="1" default/>
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
         <el-col v-for="item in extra_form" :key="item.id" :span="12">
           <el-form-item :label="item.name" :prop="item.name">
             <el-input v-model="formData[item.name]" :placeholder="'请输入' + item.name" clearable
@@ -197,6 +222,9 @@ export default {
           trigger: 'blur'
         }],
         category:[],
+        is_packing: [],
+        is_label: [],
+        is_aspect: [],
       },
       extra_form: []
     }
diff --git a/src/views/reagent/receivingandreturn/index.vue b/src/views/reagent/receivingandreturn/index.vue
index ec30c2e..698470d 100644
--- a/src/views/reagent/receivingandreturn/index.vue
+++ b/src/views/reagent/receivingandreturn/index.vue
@@ -90,9 +90,19 @@
             <!-- <el-radio v-model="radio" label="2">用量称重</el-radio> -->
             <el-button type="primary" @click="updateDrugRemain">开始称重</el-button>
             <el-button type="primary" plain @click="doTare">去皮（初始化天平）</el-button>
-            <el-input v-model="inputWeigh" placeholder="手动输入" />
+            
             <el-button type="warning" @click="handleSetEmpty">设置为空</el-button>
           </div>
+          <div>
+            <el-input v-model="inputWeigh" placeholder="手动输入" slot="append" style="width: 50%">
+              <template slot="append">
+              <el-select style="width: 50px" v-model="select_unit" slot="prepend" placeholder="请选择单位" >
+                <el-option label="g" value="g"></el-option>
+                <el-option label="ml" value="ml"></el-option>
+              </el-select>
+              </template>
+            </el-input>
+          </div>
         </div>
       </div>
       <div class="bottom">
@@ -149,7 +159,7 @@
 
 <script>
 import Scannner from '@/components/Scannner/index'
-import { use, drug_return, use_or_return_list } from '@/api/reagent/receivingReturn'
+import { use, drug_return, use_or_return_list, calculate_volume_weight } from '@/api/reagent/receivingReturn'
 import {
   get_check_last_drug,
 } from '@/api/reagent/createapply'
@@ -180,7 +190,8 @@ export default {
       surplusWeigh: '',
       dialogVisible: false,
       place: null,
-      is_wait:true
+      is_wait:true,
+      select_unit: ""
     }
   },
   computed: {
@@ -228,7 +239,7 @@ export default {
           this.is_wait =false
           this.getDrugInfo(this.barCode)
           if (this.$route.name.indexOf('Receiving') !== -1) {
-
+          
             //设置用途说明
             that.$prompt('领用用途说明', '提示', {
               confirmButtonText: '确定',
@@ -247,18 +258,18 @@ export default {
                     }
                   })
                 })
-
+                
               }else{
                 that.$message({
                   type: 'info',
                   message: '请输入用途说明'
-                });
+                }); 
               }
             }).catch(() => {
               that.$message({
                 type: 'info',
                 message: '取消输入'
-              });
+              });       
             }).finally(() =>{
               this.is_wait =true
             })
@@ -366,7 +377,7 @@ export default {
         }
         set_drug_empty_bottle(stringify(data)).then(res => {
           this.$message.success(res.msg)
-          // 归还弹框提示用量
+           // 归还弹框提示用量
           if (this.$route.name === 'standardSendBack'){
             const h = this.$createElement;
             var msg = ""
@@ -387,14 +398,15 @@ export default {
         this.$message.warning('请选择试剂！')
       }
     },
-    updateDrugRemain() {
+    async updateDrugRemain() {
       if (this.infoData.medicament_id) {
-        const w = this.checkInputWeigh()
+        var weight = await this.check_volume_weight()
         const data = {
           'bar_code': this.infoData.bar_code,
           'medicament_id': this.infoData.medicament_id,
-          'remain': w ? parseFloat(this.inputWeigh).toFixed(2) : this.surplusWeigh
+          'remain': weight
         }
+      
         // 领用只需更新余量重量
         if (this.$route.name == "standardReceiving"){
           update_drug_remain(stringify(data)).then(res => {
@@ -410,23 +422,49 @@ export default {
             const h = this.$createElement;
             var msg = ""
             if (res.data.is_liquid){
-              msg += `用量：${res.data.use_quality},  液体 体积用量：${res.data.use_volum} ${res.data.net_weight_unit}`
+              msg += `用量：${res.data.use_quality},  液体 体积用量：${res.data.use_volume} ${res.data.net_weight_unit}`
             } else {
               msg += `当次用量：${res.data.use_quality} ${res.data.net_weight_unit}`
             }
-
+            
             this.$notify({
               title: '本次使用用量',
               message: h('i', { style: 'color: teal'}, msg)
             });
             
+
           })
         }
-
+        
       } else {
         this.$message.warning('请选择试剂！')
       }
+    },
+    // 体积转化为质量
+    check_volume_weight(){
+      return new Promise((resolve, reject) => { 
+        const w = this.checkInputWeigh()
+          if (this.inputWeigh && this.select_unit == "ml") {
+            const data = {
+              "variety_id": this.infoData.variety_id,
+              'input_volume': parseFloat(this.inputWeigh).toFixed(2)
+            }
+            calculate_volume_weight(stringify(data)).then(res => {
+              if (res.status == 0){
+                resolve(res.data.weight)
+              } else {
+                this.$message.error(res.msg)
+                reject(res.msg)
+              }
+            })
+        } else {
+          resolve(w ? parseFloat(this.inputWeigh).toFixed(2) : this.surplusWeigh)
+        }
+      })
+      
     }
+    
+
   }
 }
 </script>
diff --git a/src/views/reagent/report/reagentinfo/index.vue b/src/views/reagent/report/reagentinfo/index.vue
index 9af4a94..922d1db 100644
--- a/src/views/reagent/report/reagentinfo/index.vue
+++ b/src/views/reagent/report/reagentinfo/index.vue
@@ -45,6 +45,9 @@
           <el-tag :type="statusColorMap[scope.row.status-1]">{{ statusMap[scope.row.status - 1] }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column align="center" property="is_packing" label="包装是否完好" :formatter="formatInfo" />
+      <el-table-column align="center" property="is_label" label="标签是否清晰" :formatter="formatInfo"/>
+      <el-table-column align="center" property="is_aspect" label="外观是否符合要求" :formatter="formatInfo"/>
       <el-table-column align="center" property="by_user_name" label="最后使用人" />
       <el-table-column align="center" property="client_id" label="所属终端">
         <template slot-scope="scope">
@@ -137,6 +140,10 @@ export default {
       }).finally(() => {
         this.loadingReagent = false
       })
+    },
+     //信息转换
+    formatInfo(row, column) {
+      return row[column.property] == 1 ? "是" : "否"
     }
   }
 }