Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web

src/views/application/list/song/index.vue

@@ -104,7 +104,7 @@ export default {
       const res = await shopSongApi.url();
       console.log(res);
       const baseUrl =
-        location.hostname === "localhost" ? "https://admintestweb.sxczgkj.cn" : location.origin;
+        location.hostname === "localhost" ? "https://tapi.cashier.sxczgkj.cn" : location.origin;
       this.singgerUrl = baseUrl + "/song-H5/index.html?t=" + res;
     },
     jumpUrl(url) {

src/views/inventory/consumables/index.vue

@@ -88,7 +88,7 @@
     <!-- 耗材添加编辑 -->
     <add-haocai ref="refAddHaocai" @refresh="refresh"></add-haocai>
     <!-- 耗材盘点 -->
-    <addConsTakin ref="refAddHaocaiTakin" @refresh="refresh"></addConsTakin>
+    <addConsTakin ref="refAddHaocaiTakin" @success="refresh"></addConsTakin>
   </div>
 </template>
 

src/views/inventory/operation_in/components/consumableList.vue

@@ -81,7 +81,7 @@ export default {
       },
       resetSearchForm: "",
       tableData: {
-        page: 0,
+        page: 1,
         size: 10,
         total: 0,
         loading: false,
@@ -131,7 +131,7 @@ export default {
     // 重置查询
     resetHandle() {
       this.searchForm = { ...this.resetSearchForm };
-      this.tableData.page = 0;
+      this.tableData.page = 1;
       this.tableData.size = 10;
       this.tableData.list = [];
       this.getTableData();
@@ -143,7 +143,7 @@ export default {
     },
     // 分页回调
     paginationChange(e) {
-      this.tableData.page = e - 1;
+      this.tableData.page = e;
       this.getTableData();
     },
     // 耗材列表

src/views/inventory/operation_in/index.vue

@@ -200,7 +200,28 @@
               controls-position="right"
               @change="consCountTotal($event, scope.row, 'stockNumber')"
             ></el-input-number>
-            <div class="tips" style="font-size: 16px">入库前：</div>
+            <div class="tips" style="font-size: 16px">
+              {{ type == "in" ? "入库" : "出库" }}前：
+              {{
+                !scope.row.unit
+                  ? scope.row.defaultUnit
+                    ? scope.row.defaultUnit == scope.row.conUnitTwo
+                      ? scope.row.number / scope.row.conUnitTwoConvert
+                      : scope.row.number
+                    : scope.row.number
+                  : scope.row.unit == scope.row.conUnitTwo
+                  ? scope.row.number / scope.row.conUnitTwoConvert
+                  : scope.row.number
+              }}
+
+              {{
+                !scope.row.unit
+                  ? scope.row.defaultUnit
+                    ? scope.row.defaultUnit
+                    : scope.row.conUnit
+                  : scope.row.unit
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="小计">
@@ -625,7 +646,6 @@ export default {
                 this.queryForm.paymentTime = this.queryForm.paymentDate;
                 this.queryForm.supplierId = this.queryForm.vendorId;
                 const bodyList = this.tableData.list.map((v) => {
-                  console.log(v);
                   return {
                     conId: v.id,
                     conName: v.conName,
@@ -665,7 +685,7 @@ export default {
     selectConsumable(res) {
       console.log(res);
       let arr = res.map((item) => {
-        item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true);
+        item.number = item.stockNumber;
         item.stockNumber = 0;
         item.costPrice = item.price;
         item.conInfoId = item.id;

src/views/tool/Instead/components/order.vue

@@ -379,7 +379,7 @@ async function pointsInit() {
     return;
   }
   const res = await PointsApi.calcOrderUsablePoints({
-    userId: props.user.id,
+    shopUserId: props.user.id,
     orderAmount: currentpayMoney.value - pointsDiscountAmount.value,
   });
   pointsRes.value = res;
@@ -394,7 +394,7 @@ async function pointsInit() {
 // 根据积分计算可抵扣金额
 async function pointsToMoney() {
   const res = await PointsApi.calcPointsToMoney({
-    userId: props.user.id,
+    shopUserId: props.user.id,
     orderAmount: currentpayMoney.value - pointsDiscountAmount.value,
     points: usePointsNumber.value,
   });