feat: [模板管理] 试剂/供试品/给药制剂加上其他

src/utils/tpph.js

@@ -5,6 +5,7 @@ import axios from 'axios'
 import { Message } from 'element-ui'
 
 export async function getBalance(obj) {
+  alert('入参：' + JSON.stringify(obj))
   debugger
   return {
     success: true,
@@ -27,8 +28,8 @@ export async function getBalance(obj) {
     unit: '',
     message: '未获取到天平数据'
   }
-  let url = `/tpphurl/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
-  // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=${yq.cmdHex}&format=hex&comPort=${yq.serialPort}&baudRate=${yq.baudRate}&byteSize=${yq.byteSize}&parity=${yq.parity}`
+  // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
+  let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=${yq.cmdHex}&format=hex&comPort=${yq.serialPort}&baudRate=${yq.baudRate}&byteSize=${yq.byteSize}&parity=${yq.parity}`
   await axios
     .get(
       url,
@@ -40,6 +41,7 @@ export async function getBalance(obj) {
       }
     )
     .then((res) => {
+      // alert('127.0.0.1返回：' + JSON.stringify(res))
       if (res.status !== 200) {
         Message.error('获取天平失败')
         val.message = '获取天平失败'
@@ -50,6 +52,7 @@ export async function getBalance(obj) {
           val.message = data.msg || '获取天平数据失败'
         } else {
           val = parseBalanceData(data.data, dw)
+          // alert('parseBalanceData返回：' + JSON.stringify(val))
           debugger
         }
       }
@@ -67,8 +70,8 @@ export async function getPh(obj) {
   let yq = obj.yq
 
   let val = { success: false, value: '', message: '未获取到PH数据' }
-  let url = `/tpphurl/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
-  // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=${yq.cmdHex}&format=hex&comPort=${yq.serialPort}&baudRate=${yq.baudRate}&byteSize=${yq.byteSize}&parity=${yq.parity}`
+  // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
+  let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=${yq.cmdHex}&format=hex&comPort=${yq.serialPort}&baudRate=${yq.baudRate}&byteSize=${yq.byteSize}&parity=${yq.parity}`
   await axios
     .get(
       url,
@@ -182,7 +185,7 @@ export function parseBalanceData(rawData, unit, precision) {
 
     // 8. 单位换算核心逻辑
     let convertedValue =
-      unit === originalUnit ? num : convertUnit(num, originalUnit, unit)
+      result.unit === originalUnit ? num : convertUnit(num, originalUnit, unit)
 
     // 9. 数值格式化：保留原始精度（仅当传入precision时，按指定位数截取，不四舍五入）
     if (typeof precision === 'number' && precision >= 0) {

src/views/business/comps/template/dialog/SelectMixReagentDialog.vue

@@ -13,7 +13,7 @@
 
         <!-- 只有步骤才会又这个选项 --> 
         <!-- xb+xj也会 -->
-        <div v-if="sourceFrom === 'step' || selectType==='9' || selectType==='11'" class="other-reagent">
+        <div v-if="sourceFrom === 'step' || selectType==='1' || selectType==='3' || selectType==='7' || selectType==='9' || selectType==='11'" class="other-reagent">
             <el-checkbox v-model="otherChecked" @change="handleOtherChange">其他</el-checkbox>
             <el-input class="other-reagent-input" v-model="otherReagent"></el-input>
         </div>