Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz

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

@@ -40,7 +40,7 @@
         <el-input-number v-model="form.conWarning" placeholder="请输入耗材预警值"></el-input-number>
       </el-form-item>
       <el-form-item label="是否检测耗材">
-        <el-switch v-model="form.status" :active-value="1" :inactive-value="0"></el-switch>
+        <el-switch v-model="form.isStock" :active-value="1" :inactive-value="0"></el-switch>
       </el-form-item>
       <el-form-item label="第二单位" prop="conUnitTwo">
         <el-input v-model="form.conUnitTwo" placeholder="请输入第二单位"></el-input>
@@ -100,6 +100,8 @@ const basicForm = {
   conUnit: "",
   price: undefined,
   conWarning: undefined,
+  id: "",
+  isStock: 1,
 };
 const forms = ref([{ ...basicForm }]);
 const form = reactive({
@@ -175,7 +177,7 @@ async function submitForms() {
   }
 }
 function reset() {
-  console.log("reset");
+  refform.value.resetFields();
   Object.assign(form, basicForm);
   console.log(form);
 }

src/views/inventory/operation_in/index.vue

@@ -157,7 +157,7 @@
 <script>
 import { ElMessage, ElMessageBox } from "element-plus";
 import consApi from "@/api/product/cons";
-
+import Decimal from "decimal.js";
 import vendorApi from "@/api/product/vendor";
 import stockApi from "@/api/product/stock";
 import dayjs from "dayjs";
@@ -260,7 +260,9 @@ export default {
         return price;
       }
       if (row.conUnitTwo && row.unit == row.conUnitTwo) {
-        return price / row.conUnitTwoConvert;
+        console.log(price / row.conUnitTwoConvert);
+        console.log(new Decimal(price).div(new Decimal(row.conUnitTwoConvert)));
+        return new Decimal(price).div(new Decimal(row.conUnitTwoConvert));
       }
       return price;
     },