Merge remote-tracking branch 'origin/dev_HXSJ' into dev_HXSJ

yuan

4 天以前 f7f5d63b359aab0283e1a6926cf14803bd3e40e8

Merge remote-tracking branch 'origin/dev_HXSJ' into dev_HXSJ

 src/views/inventoryManagement/receiptManagement/index.vue

@@ -76,6 +76,14 @@
                         prop="inboundNum"
                         width="90"
                         show-overflow-tooltip />
        <el-table-column label="缺货数量"
                         prop="outStockQuantity"
                         width="100"
                         show-overflow-tooltip />
        <el-table-column label="缺货情况"
                         prop="shortageDescription"
                         width="150"
                         show-overflow-tooltip />
        <el-table-column label="含税单价"
                         prop="taxInclusiveUnitPrice"
                         width="100"
@@ -177,6 +185,25 @@
                               :min="0"
                               style="width: 100%"
                               v-model="scope.row.quantityStock" />
            </template>
          </el-table-column>
          <el-table-column label="缺货数量"
                           prop="outStockQuantity"
                           width="150">
            <template #default="scope">
              <el-input-number :step="0.01"
                               :min="0"
                               style="width: 100%"
                               v-model="scope.row.outStockQuantity" />
            </template>
          </el-table-column>
          <el-table-column label="缺货情况"
                           prop="shortageDescription"
                           width="150">
            <template #default="scope">
              <el-input v-model="scope.row.shortageDescription"
                        placeholder="请输入缺货情况"
                        clearable />
            </template>
          </el-table-column>
          <el-table-column label="税率(%)"
@@ -486,6 +513,8 @@
    const stockInData = {
      id: selectedRows.value[0].recordId,
      quantityStock: Number(selectedRows.value[0].quantityStock), // 使用新格式化函数
      outStockQuantity: selectedRows.value[0].outStockQuantity,
      shortageDescription: selectedRows.value[0].shortageDescription,
    };
    await updateStockIn(stockInData);
    proxy.$modal.msgSuccess("修改入库成功");
@@ -531,6 +560,8 @@
          // id: product.salesLedgerProductId,
          inboundQuantity: Number(product.quantityStock),
          productModelId: product.productModelId,
          outStockQuantity: product.outStockQuantity,
          shortageDescription: product.shortageDescription,
        })),
      };
      // 调用API