Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into test

src/api/product/stock.ts

@@ -36,7 +36,6 @@ const Api = {
     });
   },
   //耗材报损
-
   reportDamage(data: any) {
     return request<any>({
       url: `${baseURL}/reportDamage`,
@@ -52,14 +51,6 @@ const Api = {
       params,
     });
   },
-  //耗材库存变动记录
-  reportinglosses(data: any) {
-    return request<any>({
-      url: `${baseURL}/reportDamage`,
-      method: "POST",
-      data,
-    });
-  },
 };
 
 export default Api;

src/views/inventory/operation_in/index.vue

@@ -380,7 +380,7 @@ export default {
                 inOutNumber = v.stockNumber;
               }
               if (v.conUnitTwo && v.unit == v.conUnitTwo) {
-                inOutNumber = v.stockNumber / v.conUnitTwoConvert;
+                inOutNumber = v.stockNumber * v.conUnitTwoConvert;
               }
               return {
                 conId: v.id,
@@ -398,7 +398,7 @@ export default {
             } else if (this.type == "out") {
               await stockApi.out({ ...this.queryForm, bodyList });
             } else if (this.type == "reportinglosses") {
-              await stockApi.reportinglosses(bodyList);
+              await stockApi.reportDamage(bodyList);
             }
             this.queryFormLoading = false;
             // const title = this.type == "in" ? "入库" : "出库";