fix: 耗材单位换算计算统一为第一单位大，第二单位*换算值=第一单位

src/views/inventory/consumables/components/add-haocai.vue

@@ -28,6 +28,14 @@
       <el-form-item label="单位" prop="conUnit">
         <el-input v-model="form.conUnit" placeholder="请输入单位"></el-input>
       </el-form-item>
+      <el-alert
+        class="u-m-t-10 u-m-b-10"
+        title="提示"
+        description="换算值为第二单位*第二单位转换数量=第一单位"
+        type="warning"
+        show-icon
+        :closable="false"
+      ></el-alert>
       <el-form-item label="预警值">
         <el-input-number v-model="form.conWarning" placeholder="请输入耗材预警值"></el-input-number>
       </el-form-item>

src/views/inventory/operation_in/index.vue

@@ -341,11 +341,11 @@ export default {
       if (!row.unit) {
         return price;
       }
-
+      if (row.unit == row.conUnit) {
-      if (row.unit && row.defaultUnit && row.unit != row.defaultUnit) {
+        return price;
-        price = price / row.conUnitTwoConvert;
+      }
-      } else {
+      if (row.conUnitTwo && row.unit == row.conUnitTwo) {
-        price = price;
+        return price / row.conUnitTwoConvert;
       }
       return price;
     },
@@ -353,7 +353,10 @@ export default {
       if (!row.unit) {
         return number;
       }
-      if (row.defaultUnit && row.unit != row.defaultUnit) {
+      if (row.unit == row.conUnit) {
+        return number;
+      }
+      if (row.conUnitTwo && row.unit == row.conUnitTwo) {
         return number * row.conUnitTwoConvert;
       }
       return number;
@@ -433,10 +436,13 @@ export default {
           try {
             this.queryFormLoading = true;
             const bodyList = this.tableData.list.map((v) => {
-              const inOutNumber =
+              let inOutNumber = v.stockNumber;
-                v.defaultUnit && v.unit != v.defaultUnit
+              if (v.unit == v.conUnit) {
-                  ? v.stockNumber / v.conUnitTwoConvert
+                inOutNumber = v.stockNumber;
-                  : v.stockNumber;
+              }
+              if (v.conUnitTwo && v.unit == v.conUnitTwo) {
+                inOutNumber = v.stockNumber / v.conUnitTwoConvert;
+              }
               return {
                 conId: v.id,
                 conName: v.conName,
@@ -476,8 +482,9 @@ export default {
         item.stockNumber = 0;
         item.costPrice = item.price;
         item.conInfoId = item.id;
-        item.unit = item.defaultUnit;
+        item.unit = item.defaultUnit || item.conUnit;
         item.originPrice = item.price;
+        item.price = this.returnPrice(item, item.price);
         return item;
       });
       this.tableData.list = [...this.tableData.list, ...arr];