fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

liding

6 天以前 df084ef7fc2f3b1a00790ed55616188b280f9594

 src/views/inventoryManagement/receiptManagement/Record.vue

@@ -15,6 +15,16 @@
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
        <span class="search_title ml10">来源：</span>
        <el-select v-model="searchForm.recordType"
                  style="width: 240px"
                  placeholder="请选择"
                  clearable>
          <el-option v-for="item in stockRecordTypeOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"/>
        </el-select>
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">搜索
@@ -24,7 +34,8 @@
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger"
                   plain
                   @click="handleDelete">删除
                   @click="handleDelete"
                   v-if="hasReceiptCancel">删除
        </el-button>
      </div>
    </div>
@@ -36,43 +47,234 @@
                :expand-row-keys="expandedRowKeys"
                :row-key="row => row.id"
                style="width: 100%"
                height="calc(100vh - 18.5em)">
                height="calc(100vh - 18.5em)"
                :fit="true">
        <el-table-column align="center"
                         type="selection"
                         width="55"/>
                         min-width="55"
                         fixed="left"/>
        <el-table-column align="center"
                         label="序号"
                         type="index"
                         width="60"/>
        <el-table-column label="入库批次"
                         prop="inboundBatches"
                         width="280"
                         min-width="60"
                         fixed="left"/>
        <el-table-column label="产品类型"
                         prop="parentName"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="入库时间"
                         prop="createTime"
        <el-table-column label="车牌号"
                         prop="licensePlateNo"
                         v-if="type === '0'"
                         min-width="120"
                         show-overflow-tooltip/>
        <el-table-column label="产品大类"
        <el-table-column label="产品名称"
                         prop="productName"
                         min-width="120"
                         show-overflow-tooltip/>
        <el-table-column label="规格型号"
                         prop="model"
                         show-overflow-tooltip/>
        <el-table-column label="单位"
                         prop="unit"
                         min-width="150"
                         show-overflow-tooltip/>
        <el-table-column label="入库数量"
                         prop="stockInNum"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="毛重"
                         prop="grossWeight"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="皮重"
                         prop="tareWeight"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="净重"
                         prop="netWeight"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="单位"
                         prop="unit"
                         min-width="80"
                         show-overflow-tooltip/>
        <el-table-column label="过磅日期"
                         prop="weighingDate"
                         v-if="type === '0'"
                         min-width="160"
                         show-overflow-tooltip/>
        <el-table-column label="过磅员"
                         prop="weighingOperator"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="入库人"
                         prop="createBy"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="入库时间"
                         prop="createTime"
                         min-width="160"
                         show-overflow-tooltip/>
        <el-table-column label="入库批次"
                         prop="inboundBatches"
                         min-width="150"
                         show-overflow-tooltip/>
        <el-table-column label="来源"
                         prop="recordType"
                         min-width="100"
                         show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column label="操作"
                         min-width="200"
                         align="center"
                         fixed="right">
          <template #default="scope">
            <el-button v-if="scope.row.recordType === '0' && hasReceiptEdit"
              type="primary"
              size="mini"
              @click="handleEdit(scope.row)"
            >编辑</el-button>
            <el-button v-if="scope.row.recordType === '0' && scope.row.parentName === '原材料'"
                       type="primary"
                       size="mini"
                       @click="handlePreview(scope.row)">导出过磅单</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0"
                  :total="total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="pageProductChange"/>
      <el-dialog
        v-model="isShowEditModal"
        title="编辑入库"
        width="800"
        @close="closeEditModal"
      >
        <el-form label-width="140px" :model="editForm" label-position="top" ref="editFormRef">
          <!-- 原材料显示入库数量 -->
          <template v-if="editForm.parentName !== '原材料'">
            <el-form-item
              label="入库数量"
              prop="stockInNum"
            >
              <el-input-number
                v-model="editForm.stockInNum"
                :min="0"
                :step="1"
                :precision="0"
                controls-position="right"
                style="width: 100%"
              />
            </el-form-item>
          </template>

          <!-- 非原材料显示过磅相关字段 -->
          <template v-if="type === '0' && editForm.parentName === '原材料'">
            <el-form-item
              label="车牌号"
              prop="licensePlateNo"
              :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur', 'change'] }]"
            >
              <el-input v-model="editForm.licensePlateNo" />
            </el-form-item>
            <el-form-item
              label="单位"
              prop="unit"
            >
              <el-select
                v-model="editForm.unit"
                placeholder="请选择单位"
                style="width: 100%"
                clearable
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
              </el-select>
            </el-form-item>
            <el-form-item
              label="毛重"
              prop="grossWeight"
              :rules="[{ required: true, message: '请输入毛重', trigger: ['blur', 'change'] }]"
            >
              <el-input-number
                v-model="editForm.grossWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeightEdit"
              />
            </el-form-item>

            <el-form-item
              label="皮重"
              prop="tareWeight"
              :rules="[{ required: true, message: '请输入皮重', trigger: ['blur', 'change'] }]"
            >
              <el-input-number
                v-model="editForm.tareWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeightEdit"
              />
            </el-form-item>

            <el-form-item
              label="净重"
              prop="netWeight"
              :rules="[{ required: true, message: '请输入净重', trigger: ['blur', 'change'] }]"
            >
              <el-input-number
                v-model="editForm.netWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                disabled
              />
            </el-form-item>

            <el-form-item
              label="过磅日期"
              prop="weighingDate"
              :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
            >
              <el-date-picker
                style="width: 100%"
                v-model="editForm.weighingDate"
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                type="datetime"
                placeholder="请选择过磅日期"
                clearable
              />
            </el-form-item>

            <el-form-item
              label="过磅员"
              prop="weighingOperator"
              :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur', 'change'] }]"
            >
              <el-input v-model="editForm.weighingOperator" />
            </el-form-item>
          </template>
        </el-form>

        <template #footer>
          <div class="dialog-footer">
            <el-button type="primary" @click="handleEditSubmit">确认</el-button>
            <el-button @click="closeEditModal">取消</el-button>
          </div>
        </template>
      </el-dialog>
      <div style="margin-top: 12px; display: flex; justify-content: flex-end;">
        <pagination v-show="total > 0"
                    :total="total"
                    layout="total, sizes, prev, pager, next, jumper"
                    :page="page.current"
                    :limit="page.size"
                    @pagination="pageProductChange"/>
      </div>
    </div>
  </div>
</template>
@@ -85,13 +287,18 @@
  toRefs,
  onMounted,
  getCurrentInstance,
  nextTick,
  computed,
} from "vue";
import {ElMessageBox} from "element-plus";
import { checkPermi } from "@/utils/permission.js";
import {
  getStockInRecordListPage,
  batchDeleteStockInRecords,
  editStockInStock,
} from "@/api/inventoryManagement/stockInRecord.js";
import {
  findAllQualifiedStockInRecordTypeOptions, findAllUnQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";

const {proxy} = getCurrentInstance();

@@ -103,14 +310,17 @@
  }
})

const hasReceiptEdit = computed(() => checkPermi(['receipt_edit']));
const hasReceiptCancel = computed(() => checkPermi(['receipt_cancel']));

const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const activeTab = ref("production"); // 当前激活的 tab

// 来源类型选项
const stockRecordTypeOptions = ref([]);
const page = reactive({
  current: 1,
  size: 100,
  size: 10,
});
const total = ref(0);

@@ -118,6 +328,7 @@
  searchForm: {
    productName: "",
    timeStr: "",
    recordType: "",
  },
});
const {searchForm} = toRefs(data);
@@ -127,6 +338,10 @@
  page.current = 1;
  getList();
};

const getRecordType = (recordType) => {
  return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
}

const pageProductChange = obj => {
  page.current = obj.page;
@@ -139,13 +354,30 @@
  const params = {...page, type: props.type};
  params.timeStr = searchForm.value.timeStr;
  params.productName = searchForm.value.productName;
  params.recordType = searchForm.value.recordType;
  getStockInRecordListPage(params)
      .then(res => {
        tableData.value = res.data.records;
        total.value = res.data.total ?? 0;
      }).finally(() => {
    tableLoading.value = false;
  })
};

// 获取来源类型选项
const fetchStockRecordTypeOptions = () => {
  if (props.type === '0') {
    findAllQualifiedStockInRecordTypeOptions()
        .then(res => {
          stockRecordTypeOptions.value = res.data;
        })
    return
  }
  findAllUnQualifiedStockInRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
      })
}

// 表格选择数据
const handleSelectionChange = selection => {
@@ -153,6 +385,60 @@
};

const expandedRowKeys = ref([]);

// 导出过磅单
const handlePreview = (row) => {
  proxy.$download.name(row.weighbridgeDocPath);
}

// 编辑
const isShowEditModal = ref(false);
const editFormRef = ref(null);
const editForm = ref({});

// 毛重 - 皮重 计算净重（保留两位小数，且不为负）
const computeNetWeightEdit = () => {
  const gross = Number(editForm.value?.grossWeight ?? NaN);
  const tare = Number(editForm.value?.tareWeight ?? NaN);
  if (Number.isFinite(gross) && Number.isFinite(tare)) {
    const net = gross - tare;
    const safeNet = Number(net.toFixed(2));
    editForm.value.netWeight = safeNet > 0 ? safeNet : 0;
  } else {
    editForm.value.netWeight = undefined;
  }
};

const handleEdit = (row) => {
  editForm.value = { ...row };
  if (props.type === '0') {
    computeNetWeightEdit();
  }
  isShowEditModal.value = true;
};

const closeEditModal = () => {
  isShowEditModal.value = false;
  editForm.value = {};
  // 清理表单校验状态（有 ref 时）
  editFormRef.value?.clearValidate?.();
};

const handleEditSubmit = () => {
  editFormRef.value?.validate?.((valid) => {
    if (!valid) return;
    const submitData = {
      ...editForm.value,
      productType: editForm.value.parentName === '原材料' ? 0 : 1,
      netWeight: editForm.value.parentName === '原材料' ? editForm.value.netWeight : editForm.value.stockInNum
    };
    editStockInStock(submitData).then(() => {
      closeEditModal();
      proxy.$modal.msgSuccess("编辑成功");
      getList();
    });
  });
};

// 导出
const handleOut = () => {
@@ -163,11 +449,7 @@
  })
      .then(() => {
        // 根据不同的 tab 类型调用不同的导出接口
        let exportUrl = "/stockin/export";
        if (activeTab.value === "production") {
          exportUrl = "/stockin/exportOne";
        }
        proxy.download(exportUrl, {}, "入库台账.xlsx");
        proxy.download("/stockInRecord/exportStockInRecord", {type: props.type}, props.type === '0' ? "合格入库.xlsx" : "不合格入库.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
@@ -204,6 +486,7 @@

onMounted(() => {
  getList();
  fetchStockRecordTypeOptions();
});
</script>