fix: 代码合并,耗材出入库代码修改

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>
@@ -58,7 +43,7 @@
           </template>
         </el-table-column>
         <el-table-column label="售价" prop="price">
-          <template v-slot="scope">￥{{ scope.row.price }}</template>
+          <template v-slot="scope">￥{{ scope.row.winLossAmount }}</template>
         </el-table-column>
         <el-table-column label="账存数量" prop="beforeNumber"></el-table-column>
         <el-table-column label="盈亏数量" prop="inOutNumber"></el-table-column>
@@ -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,

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;

src/views/inventory/operation_in/index.vue

@@ -513,6 +513,7 @@ export default {
     margin-right: 10px;
   }
 }
+
 .app-container {
 }
 </style>