feat: 隐藏多规格退款退回库存,修改所有page为1

2025-03-21 09:35:32 +08:00
parent 812b01391b
commit c40281902a
11 changed files with 110 additions and 291 deletions
--- a/src/views/inventory/consumables/components/addConsTakin.vue
+++ b/src/views/inventory/consumables/components/addConsTakin.vue
@@ -6,32 +6,17 @@
        <el-input v-model="form.stockNumber" readonly style="width: 180px"></el-input>
      </el-form-item>
      <el-form-item label="实际数量">
-        <el-input-number
-          v-model="form.actualNumber"
-          :min="0"
-          :step="1"
-          step-strictly
-          style="width: 180px"
-        ></el-input-number>
+        <el-input-number v-model="form.actualNumber" :min="0" :step="1" step-strictly
+          style="width: 180px"></el-input-number>
      </el-form-item>
      <el-form-item label="盈亏数量">
-        <el-input
-          v-model="profitNumber"
-          readonly
-          :class="{ lose: profitNumber < 0 }"
-          style="width: 180px"
-        ></el-input>
+        <el-input v-model="profitNumber" readonly :class="{ lose: profitNumber < 0 }" style="width: 180px"></el-input>
      </el-form-item>
      <el-form-item label="单价">
        <el-input v-model="form.price" readonly></el-input>
      </el-form-item>
      <el-form-item label="盈亏金额">
-        <el-input
-          v-model="profitPrice"
-          readonly
-          :class="{ lose: profitNumber < 0 }"
-          style="width: 180px"
-        ></el-input>
+        <el-input v-model="profitPrice" readonly :class="{ lose: profitNumber < 0 }" style="width: 180px"></el-input>
      </el-form-item>
      <el-form-item label="备注">
        <el-input v-model="form.remark" placeholder="请输入备注" style="width: 300px"></el-input>
@@ -70,15 +55,9 @@
        <el-table-column label="盘点备注" prop="remark"></el-table-column>
      </el-table>
    </div>
-    <el-pagination
-      :total="tableData.total"
-      :current-page="tableData.page + 1"
-      :page-sizes="[5, 10, 30, 50]"
-      :page-size="tableData.size"
-      @current-change="paginationChange"
-      @size-change="sizeChange"
-      layout="total, sizes, prev, pager, next, jumper"
-    ></el-pagination>
+    <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-sizes="[5, 10, 30, 50]"
+      :page-size="tableData.size" @current-change="paginationChange" @size-change="sizeChange"
+      layout="total, sizes, prev, pager, next, jumper"></el-pagination>
  </el-dialog>
 </template>

@@ -117,7 +96,7 @@ export default {
        productId: "",
      },
      tableData: {
-        page: 0,
+        page: 1,
        size: 5,
        total: 0,
        loading: false,
--- a/src/views/inventory/operation_in/components/goods-list.vue
+++ b/src/views/inventory/operation_in/components/goods-list.vue
@@ -6,12 +6,7 @@
      </el-form-item>
      <el-form-item>
        <el-select v-model="searhForm.category" placeholder="商品分类">
-          <el-option
-            :label="item.name"
-            :value="item.id"
-            v-for="item in categoryList"
-            :key="item.id"
-          ></el-option>
+          <el-option :label="item.name" :value="item.id" v-for="item in categoryList" :key="item.id"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item>
@@ -20,20 +15,9 @@
      </el-form-item>
    </el-form>
    <div class="head-container">
-      <el-table
-        ref="table"
-        :data="tableData.list"
-        @select="firstSelectChange"
-        v-loading="tableData.loading"
-        :row-key="getRowKey"
-        @selection-change="onSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-          :reserve-selection="true"
-        ></el-table-column>
+      <el-table ref="table" :data="tableData.list" @select="firstSelectChange" v-loading="tableData.loading"
+        :row-key="getRowKey" @selection-change="onSelectionChange">
+        <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
        <el-table-column label="商品信息">
          <template v-slot="scope">
            <div class="shop_info">
@@ -72,14 +56,9 @@
        <el-table-column label="分类名称" prop="categoryName"></el-table-column>
      </el-table>
    </div>
-    <el-pagination
-      :total="tableData.total"
-      :current-page="tableData.page + 1"
-      :page-size="tableData.size"
-      @current-change="paginationChange"
-      @size-change="sizeChange"
-      layout="total, sizes, prev, pager, next, jumper"
-    ></el-pagination>
+    <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+      @current-change="paginationChange" @size-change="sizeChange"
+      layout="total, sizes, prev, pager, next, jumper"></el-pagination>
    <template #footer>
      <span class="dialog-footer">
        <el-button @click="dialogVisible = false">取 消</el-button>
@@ -103,7 +82,7 @@ export default {
      },
      categoryList: [],
      tableData: {
-        page: 0,
+        page: 1,
        size: 10,
        total: 0,
        loading: false,
@@ -198,7 +177,7 @@ export default {
    async tbShopCategoryGet() {
      try {
        const res = await tbShopCategoryGet({
-          page: 0,
+          page: 1,
          size: 100,
          sort: "id",
          shopId: localStorage.getItem("shopId"),
@@ -239,6 +218,7 @@ export default {
  max-height: 60vh;
  overflow-y: scroll;
 }
+
 .shop_info {
  display: flex;
  align-items: center;
--- a/src/views/inventory/operation_in/index.vue
+++ b/src/views/inventory/operation_in/index.vue
@@ -1,13 +1,7 @@
 <template>
  <div class="app-container bg-fff u-m-20">
    <div class="head-container">
-      <el-form
-        ref="queryForm"
-        :model="queryForm"
-        :rules="queryRules"
-        label-position="left"
-        label-width="100px"
-      >
+      <el-form ref="queryForm" :model="queryForm" :rules="queryRules" label-position="left" label-width="100px">
        <el-row>
          <el-form-item label="类型">
            <el-radio-group :model-value="type">
@@ -19,87 +13,49 @@
        <el-row>
          <el-col :span="8">
            <el-form-item label="供应商">
-              <el-select
-                v-model="queryForm.vendorId"
-                placeholder="请选择供应商"
-                clearable
-                style="width: 220px"
-                @change="changeTypeEnum"
-              >
-                <el-option
-                  :label="item.name"
-                  :value="item.id"
-                  v-for="item in purveyorList"
-                  :key="item.id"
-                ></el-option>
+              <el-select v-model="queryForm.vendorId" placeholder="请选择供应商" clearable style="width: 220px"
+                @change="changeTypeEnum">
+                <el-option :label="item.name" :value="item.id" v-for="item in purveyorList" :key="item.id"></el-option>
              </el-select>
              {{ queryForm.waitAmount }}
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="出入库时间" prop="inOutDate">
-              <el-date-picker
-                v-model="queryForm.inOutDate"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="选择日期"
-                style="width: 220px"
-              ></el-date-picker>
+              <el-date-picker v-model="queryForm.inOutDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                placeholder="选择日期" style="width: 220px"></el-date-picker>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="shopTypes[shopTypesActive].value == 'purveyor'">
          <el-col :span="8">
            <el-form-item label="应付金额">
-              <el-input
-                v-model="queryForm.amountPayable"
-                placeholder="请输入应收金额"
-                style="width: 220px"
-              ></el-input>
+              <el-input v-model="queryForm.amountPayable" placeholder="请输入应收金额" style="width: 220px"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="实付金额">
-              <el-input
-                v-model="queryForm.actualPaymentAmount"
-                placeholder="请输入实收金额"
-                style="width: 220px"
-              ></el-input>
+              <el-input v-model="queryForm.actualPaymentAmount" placeholder="请输入实收金额" style="width: 220px"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="shopTypes[shopTypesActive].value == 'purveyor'">
          <el-col :span="8">
            <el-form-item label="付款时间">
-              <el-date-picker
-                v-model="queryForm.paymentDate"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="选择日期"
-                style="width: 220px"
-              ></el-date-picker>
+              <el-date-picker v-model="queryForm.paymentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                placeholder="选择日期" style="width: 220px"></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="批号">
-              <el-input
-                v-model="queryForm.batchNo"
-                placeholder="请输入批号"
-                style="width: 220px"
-              ></el-input>
+              <el-input v-model="queryForm.batchNo" placeholder="请输入批号" style="width: 220px"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="8">
            <el-form-item label="备注">
-              <el-input
-                v-model="queryForm.remark"
-                placeholder="请输入备注"
-                style="width: 220px"
-              ></el-input>
+              <el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -111,14 +67,10 @@
          <el-button type="primary" @click="$refs.shopList.show(tableData.list)" v-else>
            选择商品
          </el-button>
-          <el-autocomplete
-            v-model="autocompletename"
-            :fetch-suggestions="querySearchAsync"
+          <el-autocomplete v-model="autocompletename" :fetch-suggestions="querySearchAsync"
            :value-key="inTabValue == 'goods' ? 'name' : 'conName'"
-            :placeholder="inTabValue == 'goods' ? '商品搜索' : '耗材搜索'"
-            @select="handleSelect"
-            style="width: 200px; margin-left: 20px"
-          ></el-autocomplete>
+            :placeholder="inTabValue == 'goods' ? '商品搜索' : '耗材搜索'" @select="handleSelect"
+            style="width: 200px; margin-left: 20px"></el-autocomplete>
        </el-form-item>
      </el-form>
    </div>
@@ -141,12 +93,8 @@
        </el-table-column>
        <el-table-column label="进价">
          <template v-slot="scope">
-            <el-input-number
-              v-model="scope.row.price"
-              :min="0"
-              controls-position="right"
-              @change="consCountTotal($event, scope.row, 'price')"
-            ></el-input-number>
+            <el-input-number v-model="scope.row.price" :min="0" controls-position="right"
+              @change="consCountTotal($event, scope.row, 'price')"></el-input-number>
            <div class="tips" style="font-size: 16px">
              原价￥
              <!-- {{ scope.row.costPrice }}/{{ scope.row.conUnit }} -->
@@ -159,8 +107,8 @@
                      : scope.row.costPrice
                    : scope.row.costPrice
                  : scope.row.unit == scope.row.conUnitTwo
-                  ? (scope.row.costPrice * scope.row.conUnitTwoConvert).toFixed(2)
-                  : scope.row.costPrice
+                    ? (scope.row.costPrice * scope.row.conUnitTwoConvert).toFixed(2)
+                    : scope.row.costPrice
              }}
              /
              {{
@@ -175,31 +123,19 @@
        </el-table-column>
        <el-table-column label="单位">
          <template v-slot="scope">
-            <el-select
-              @change="consCountTotal($event, scope.row, 'unit')"
-              v-model="scope.row.unit"
-              :placeholder="scope.row.defaultUnit ? scope.row.defaultUnit : scope.row.conUnit"
-            >
+            <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
+              :placeholder="scope.row.defaultUnit ? scope.row.defaultUnit : scope.row.conUnit">
              <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"></el-option>
-              <el-option
-                :label="scope.row.conUnitTwo"
-                :value="scope.row.conUnitTwo"
-                v-if="scope.row.conUnitTwo"
-              ></el-option>
+              <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
+                v-if="scope.row.conUnitTwo"></el-option>
            </el-select>
            <div class="tips">&nbsp;</div>
          </template>
        </el-table-column>
        <el-table-column label="数量">
          <template v-slot="scope">
-            <el-input-number
-              v-model="scope.row.stockNumber"
-              :min="0"
-              :step="1"
-              step-strictly
-              controls-position="right"
-              @change="consCountTotal($event, scope.row, 'stockNumber')"
-            ></el-input-number>
+            <el-input-number v-model="scope.row.stockNumber" :min="0" :step="1" step-strictly controls-position="right"
+              @change="consCountTotal($event, scope.row, 'stockNumber')"></el-input-number>
            <div class="tips" style="font-size: 16px">
              {{ type == "in" ? "入库" : "出库" }}前：
              {{
@@ -210,8 +146,8 @@
                      : scope.row.number
                    : scope.row.number
                  : scope.row.unit == scope.row.conUnitTwo
-                  ? scope.row.number / scope.row.conUnitTwoConvert
-                  : scope.row.number
+                    ? scope.row.number / scope.row.conUnitTwoConvert
+                    : scope.row.number
              }}

              {{
@@ -257,25 +193,15 @@
        </el-table-column>
        <el-table-column label="进价">
          <template v-slot="scope">
-            <el-input-number
-              v-model="scope.row.costPrice"
-              :min="0"
-              controls-position="right"
-              @change="modifyPrice($event, scope.row, 'costPrice')"
-            ></el-input-number>
+            <el-input-number v-model="scope.row.costPrice" :min="0" controls-position="right"
+              @change="modifyPrice($event, scope.row, 'costPrice')"></el-input-number>
            <div class="tips">成本价￥{{ scope.row.costPrice }}/{{ scope.row.unitName }}</div>
          </template>
        </el-table-column>
        <el-table-column label="数量">
          <template v-slot="scope">
-            <el-input-number
-              v-model="scope.row.number"
-              :min="0"
-              :step="1"
-              step-strictly
-              controls-position="right"
-              @change="modifyPrice($event, scope.row, 'number', 'amountPayable')"
-            ></el-input-number>
+            <el-input-number v-model="scope.row.number" :min="0" :step="1" step-strictly controls-position="right"
+              @change="modifyPrice($event, scope.row, 'number', 'amountPayable')"></el-input-number>
            <div class="tips" style="font-size: 16px">
              入库前：

@@ -287,8 +213,8 @@
                      : scope.row.number
                    : scope.row.number
                  : scope.row.unit == scope.row.conUnitTwo
-                  ? scope.row.number / scope.row.conUnitTwoConvert
-                  : scope.row.number
+                    ? scope.row.number / scope.row.conUnitTwoConvert
+                    : scope.row.number
              }}

              {{
@@ -305,11 +231,7 @@
          <template v-slot="scope">
            <!-- <el-input-number v-model="scope.row.amountPayable" :min="0"
                          controls-position="right"></el-input-number> -->
-            <el-input
-              :value="scope.row.costPrice * scope.row.number"
-              readonly
-              style="width: 100px"
-            />
+            <el-input :value="scope.row.costPrice * scope.row.number" readonly style="width: 100px" />
          </template>
        </el-table-column>
        <el-table-column label="变动后剩余库存">
@@ -333,17 +255,8 @@
    <goods-list ref="shopList" @success="selectShop" />
    <!-- 选择耗材 -->
    <ConsumableList ref="ConsumableList" @success="selectConsumable" />
-    <el-dialog
-      v-model="showResult"
-      :show-close="false"
-      :close-on-press-escape="false"
-      :close-on-click-modal="false"
-    >
-      <el-result
-        icon="success"
-        title="入库提交成功"
-        :subTitle="`共操作${tableData.list.length}件商品`"
-      >
+    <el-dialog v-model="showResult" :show-close="false" :close-on-press-escape="false" :close-on-click-modal="false">
+      <el-result icon="success" title="入库提交成功" :subTitle="`共操作${tableData.list.length}件商品`">
        <template #extra>
          <template>
            <el-button type="primary" size="medium" @click="resetHandle">创建新的入库单</el-button>
@@ -462,7 +375,7 @@ export default {
      let res = null;
      if (this.inTabValue == "goods") {
        res = await tbProductlist({
-          page: 0,
+          page: 1,
          size: 20,
          name: queryString ? queryString : "",
          shopId: localStorage.getItem("shopId"),
@@ -470,7 +383,7 @@ export default {
        });
      } else {
        res = await consApi.getList({
-          page: 0,
+          page: 1,
          size: 20,
          conName: queryString ? queryString : "",
        });
@@ -730,6 +643,6 @@ export default {
    margin-right: 10px;
  }
 }
-.app-container {
-}
+
+.app-container {}
 </style>