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

package.json

@@ -45,6 +45,7 @@
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.13",
+    "decimal.js": "^10.5.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
     "element-plus": "^2.9.3",

src/views/finance/supplierBill/billingRecord.vue

@@ -113,6 +113,7 @@ const refPayment = ref();
 function handlePayment(item) {
   if (item != 'all') {
     state.flowIdList = [item.id]
+    state.allAmount = item.unPaidAmount
   } else {
     if( state.flowIdList.length <= 0 ){
       ElMessage({ type: "error", message: "请选择付款耗材" });

src/views/finance/supplierBill/components/payment.vue

@@ -6,7 +6,7 @@
         <el-input v-model="supplierName" placeholder="请输入供应商名称" readonly></el-input>
       </el-form-item>
       <el-form-item label="付款金额 " prop="amount">
-        <el-input-number v-model="form.amount" :readonly="form.flowIdList.length > 1" placeholder="请输入付款金额"
+        <el-input-number v-model="form.amount" :readonly="form.flowIdList.length > 1" :max="maxAmount" placeholder="请输入付款金额"
           style="width: 100%;"></el-input-number>
       </el-form-item>
       <el-form-item label="付款方式" prop="type">
@@ -46,13 +46,13 @@ const form = reactive({
   ...basicForm,
 });
 const supplierName = ref('');
+const maxAmount = ref(0);
 const show = ref(false);
 function open(item) {
   form.flowIdList = item.flowIdList
   supplierName.value = item.supplierName
-  if (item.flowIdList.length > 1 && item.allAmount) {
-    form.amount = item.allAmount
-  }
+  form.amount = item.allAmount
+  maxAmount.value = item.allAmount
   // Object.assign(form, item);
   show.value = true;
 }

src/views/finance/supplierBill/index.vue

@@ -21,16 +21,16 @@
         <el-row :gutter="24">
           <el-col :span="8" style="display: flex;flex-direction: column; justify-content: center;align-items: center;">
             <div>账单总金额（全部/本月）</div>
-            <div>{{ state.summaryData.amountPayable }} / {{ state.summaryData.mouthAmountPayable }}</div>
+            <div>{{ state.summaryData.amountPayable || 0 }} / {{ state.summaryData.mouthAmountPayable || 0 }}</div>
           </el-col>
 
           <el-col :span="8" style="display: flex;flex-direction: column; justify-content: center;align-items: center;">
             <div>已付款总金额（全部/本月）</div>
-            <div>{{ state.summaryData.actualPaymentAmount }} / {{ state.summaryData.mouthActualPaymentAmount }}</div>
+            <div>{{ state.summaryData.actualPaymentAmount || 0 }} / {{ state.summaryData.mouthActualPaymentAmount || 0 }}</div>
           </el-col>
           <el-col :span="8" style="display: flex;flex-direction: column; justify-content: center;align-items: center;">
             <div>未付款总金额（全部/本月）</div>
-            <div>{{ state.summaryData.unPaidAmount }} / {{ state.summaryData.mouthUnPaidAmount }}</div>
+            <div>{{ state.summaryData.unPaidAmount || 0 }} / {{ state.summaryData.mouthUnPaidAmount || 0 }}</div>
           </el-col>
         </el-row>
       </el-card>

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;
     },