Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventor...

spring

2026-04-24 a582fffa7d3f7283e809a7940538ab02e4677948

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -67,6 +67,11 @@
               show-overflow-tooltip
            />
            <el-table-column
               label="批号"
               prop="batchNo"
               show-overflow-tooltip
            />
            <el-table-column
               label="单位"
               prop="unit"
               show-overflow-tooltip
@@ -112,9 +117,7 @@
   delStockOut,
} from "@/api/inventoryManagement/stockOut.js";
import {
  findAllQualifiedStockRecordTypeOptions,
  findAllStockRecordTypeOptions,
  findAllUnqualifiedStockRecordTypeOptions
  findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
} from "@/api/basicData/enum.js";

const userStore = useUserStore();
@@ -135,6 +138,10 @@
    type: String,
    required: true,
    default: '0'
  },
  topParentProductId: {
    type: [String, Number],
    default: undefined
  }
})

@@ -165,7 +172,7 @@
};
const getList = () => {
   tableLoading.value = true;
   getStockOutPage({ ...searchForm.value, ...page, type: props.type })
   getStockOutPage({ ...searchForm.value, ...page, type: props.type, topParentProductId: props.topParentProductId })
      .then((res) => {
         tableLoading.value = false;
         tableData.value = res.data.records;
@@ -186,13 +193,13 @@
// 获取来源类型选项
const fetchStockRecordTypeOptions = () => {
  if (props.type === '0') {
    findAllQualifiedStockRecordTypeOptions()
    findAllQualifiedStockOutRecordTypeOptions()
        .then(res => {
          stockRecordTypeOptions.value = res.data;
        })
    return
  }
  findAllUnqualifiedStockRecordTypeOptions()
  findAllUnQualifiedStockOutRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
      })
@@ -214,7 +221,7 @@
      type: "warning",
   })
      .then(() => {
         proxy.download("/stockmanagement/export", {}, "出库台账.xlsx");
         proxy.download("/stockOutRecord/exportStockOutRecord", {type: props.type}, props.type === '0' ? "合格出库台账.xlsx" : "不合格出库台账.xlsx");
      })
      .catch(() => {
         proxy.$modal.msg("已取消");
@@ -407,7 +414,6 @@
      <div class="print-page">
        <div class="delivery-note">
          <div class="header">
            <div class="company-name">鼎诚瑞实业有限责任公司</div>
            <div class="document-title">零售发货单</div>
          </div>
          
@@ -419,7 +425,7 @@
              </div>
              <div>
                <span class="label">客户名称：</span>
                <span class="value">${item.supplierName || '张爱有'}</span>
                <span class="value">${item.supplierName}</span>
              </div>
            </div>
            <div class="info-row">
@@ -539,6 +545,14 @@
   getList();
  fetchStockRecordTypeOptions();
});

watch(
  () => props.topParentProductId,
  () => {
    page.current = 1;
    getList();
  }
);
</script>

<style scoped lang="scss">