新疆马铃薯 1.销售合同号都改成订单号 2.页面有订单号的关联带出总合同号

gaoluyang

2026-06-25 7ac3482d5ad405889d00e1234875a28c41d9496b

新疆马铃薯
1.销售合同号都改成订单号
2.页面有订单号的关联带出总合同号

 doc/20260618_customer_transactions_optimization.md

@@ -113,7 +113,7 @@
| 字段 | 类型 | 说明 |
|------|------|------|
| salesLedgerId | Long | 销售台账ID |
| salesContractNo | String | 销售合同号 |
| salesContractNo | String | 订单号 |
| productId | Long | 产品ID |
| productName | String | 产品名称 |
| model | String | 规格型号 |
@@ -179,7 +179,7 @@
| 字段 | 类型 | 说明 |
|------|------|------|
| salesLedgerId | Long | 销售台账ID |
| salesContractNo | String | 销售合同号 |
| salesContractNo | String | 订单号 |
| shippingId | Long | 发货单ID |
| shippingNo | String | 发货单号 |
| productName | String | 产品名称 |

 doc/20260618_shipping_info_for_return.md

@@ -27,7 +27,7 @@
|------|------|------|
| shippingId | Long | 发货单ID |
| shippingNo | String | 发货单号 |
| salesContractNo | String | 销售合同号 |
| salesContractNo | String | 订单号 |
| customerName | String | 客户名称 |
| productName | String | 产品名称 |
| model | String | 规格型号 |
@@ -257,7 +257,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="销售合同号">
          <el-form-item label="订单号">
            <el-input v-model="form.salesContractNo" disabled />
          </el-form-item>
        </el-col>

 src/api/customerService/index.js

@@ -111,7 +111,7 @@
    })
}

// 根据客户查询销售订单号
// 根据客户查询订单号号
// afterSalesService/listSalesLedger
export function getSalesLedger(query) {
    return request({
@@ -121,7 +121,7 @@
    })
}

// 根据销售订单号查询销售订单详情
// 根据订单号号查询订单号详情
// afterSalesService/count
export function getSalesLedgerDetail(query) {
    return request({

 src/api/salesManagement/returnOrder.js

@@ -51,7 +51,7 @@
  });
}

// 销售退货-根据出库单查询销售订单以及产品信息
// 销售退货-根据出库单查询订单号以及产品信息
// /returnManagement/getByShippingId
export function returnManagementGetByShippingId(query) {
  return request({

 src/api/salesManagement/salesLedger.js

@@ -101,7 +101,7 @@
  });
}

// 根据销售合同号查产品信息
// 根据订单号查产品信息
export function getProductInfoByContractNo(query) {
  return request({
    url: "/purchase/ledger/getProductBySalesNo",

 src/components/AIChatSidebar/index.vue

@@ -1147,7 +1147,7 @@
  collectionStrategy: '回款策略',
  quotationStrategy: '报价策略',
  nextAction: '下一步动作',
  salesContractNo: '销售合同号',
  salesContractNo: '订单号',
  revenue: '收入',
  materialCost: '材料成本',
  laborCost: '人工成本',
@@ -1188,9 +1188,9 @@
  purchaseContractNumber: '采购合同号',
  purchaseContractNo: '采购合同号',
  purchaseOrderNumber: '采购合同号',
  salesContractNo: '销售合同号',
  salesContractNumber: '销售合同号',
  salesOrderNumber: '销售合同号',
  salesContractNo: '订单号',
  salesContractNumber: '订单号',
  salesOrderNumber: '订单号',
  salesContractNoId: '销售合同ID',
  approveUserIds: '审批用户ID列表',
  entryDateStart: '录入开始日期',
@@ -1253,9 +1253,9 @@
  采购合同号: 'purchaseContractNumber',
  采购单号: 'purchaseContractNumber',
  采购订单号: 'purchaseContractNumber',
  销售合同号: 'salesContractNo',
  销售单号: 'salesContractNo',
  销售订单号: 'salesContractNo',
  订单号: 'salesContractNo',
  订单号: 'salesContractNo',
  订单号号: 'salesContractNo',
  销售合同ID: 'salesContractNoId',
  审批用户ID列表: 'approveUserIds',
  录入开始日期: 'entryDateStart',

 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -128,7 +128,7 @@
                <el-descriptions-item label="采购合同号">{{ currentPurchase.purchaseContractNumber }}</el-descriptions-item>
                <el-descriptions-item label="供应商名称">{{ currentPurchase.supplierName }}</el-descriptions-item>
                <el-descriptions-item label="项目名称">{{ currentPurchase.projectName }}</el-descriptions-item>
                <el-descriptions-item label="销售合同号">{{ currentPurchase.salesContractNo }}</el-descriptions-item>
                <el-descriptions-item label="订单号">{{ currentPurchase.salesContractNo }}</el-descriptions-item>
                <el-descriptions-item label="签订日期">{{ currentPurchase.executionDate }}</el-descriptions-item>
                <el-descriptions-item label="录入日期">{{ currentPurchase.entryDate }}</el-descriptions-item>
                <el-descriptions-item label="付款方式">{{ currentPurchase.paymentMethod }}</el-descriptions-item>
@@ -186,7 +186,7 @@
            <template v-else>
              <el-descriptions :column="2"
                               border>
                <el-descriptions-item label="销售订单">{{ currentDelivery.shippingInfo.salesContractNo || '--' }}</el-descriptions-item>
                <el-descriptions-item label="订单号">{{ currentDelivery.shippingInfo.salesContractNo || '--' }}</el-descriptions-item>
                <el-descriptions-item label="发货订单号">{{ currentDelivery.shippingInfo.shippingNo || '--' }}</el-descriptions-item>
                <el-descriptions-item label="客户名称">{{ currentDelivery.shippingInfo.customerName || '--' }}</el-descriptions-item>
                <el-descriptions-item label="发货类型">{{ currentDelivery.shippingInfo.type || '--' }}</el-descriptions-item>

 src/views/collaborativeApproval/purchaseApproval/index.vue

@@ -19,7 +19,7 @@
                      clearable
                      :prefix-icon="Search" />
          </el-form-item>
          <el-form-item label="销售合同号：">
          <el-form-item label="订单号：">
            <el-input v-model="searchForm.salesContractNo"
                      placeholder="请输入"
                      clearable
@@ -101,7 +101,7 @@
                         prop="purchaseContractNumber"
                         width="200"
                         show-overflow-tooltip />
        <el-table-column label="销售合同号"
        <el-table-column label="订单号"
                         prop="salesContractNo"
                         width="200"
                         show-overflow-tooltip />

 src/views/collaborativeApproval/shipmentReview/index.vue

@@ -2,11 +2,11 @@
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">销售合同号：</span>
        <span class="search_title">订单号：</span>
        <el-input
            v-model="searchForm.salesContractNo"
            style="width: 240px"
            placeholder="请输入销售合同号搜索"
            placeholder="请输入订单号搜索"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
@@ -110,7 +110,7 @@
    },
  },
  {
    label: "销售合同号",
    label: "订单号",
    prop: "salesContractNo",
    width: 170
  },

 src/views/customerService/afterSalesHandling/index.vue

@@ -67,7 +67,7 @@
              <el-form-item>
                <el-input
                    v-model="searchForm.orderNo"
                    placeholder="请输入销售单号"
                    placeholder="请输入订单号"
                    clearable
                />
              </el-form-item>
@@ -146,7 +146,7 @@
    align: "center"
  },
  {
    label: "销售单号",
    label: "订单号",
    prop:"salesContractNo",
    width: 150,
    align: "center"

 src/views/customerService/feedbackRegistration/components/formDia.vue

@@ -38,7 +38,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="4">
              <el-form-item label="关联销售单号："
              <el-form-item label="关联订单号："
                            prop="salesContractNo">
                <el-select v-model="form.salesContractNo"
                           @change="associatedSalesOrderNumberChange"

 src/views/customerService/feedbackRegistration/index.vue

@@ -67,7 +67,7 @@
          <el-col :span="4">
            <el-form-item>
              <el-input v-model="searchForm.orderNo"
                        placeholder="请输入销售单号"
                        placeholder="请输入订单号"
                        clearable />
            </el-form-item>
          </el-col>
@@ -182,7 +182,7 @@
      align: "center",
    },
    {
      label: "销售单号",
      label: "订单号",
      prop: "salesContractNo",
      width: 150,
      align: "center",

 src/views/financialManagement/receivable/invoiceApply.vue

@@ -240,7 +240,7 @@
        <el-table-column prop="customerName" label="客户名称" min-width="120" show-overflow-tooltip />
        <el-table-column prop="productName" label="产品名称" min-width="120" show-overflow-tooltip />
        <el-table-column prop="specificationModel" label="规格型号" min-width="140" show-overflow-tooltip />
        <el-table-column prop="salesContractNo" label="销售合同号" min-width="140" show-overflow-tooltip />
        <el-table-column prop="salesContractNo" label="订单号" min-width="140" show-overflow-tooltip />
        <el-table-column prop="shippingNo" label="发货单号" min-width="130" show-overflow-tooltip />
        <el-table-column prop="shippingDate" label="发货日期" width="110" align="center" />
        <el-table-column prop="outboundAmount" label="出库金额" width="110" align="right">

 src/views/financialManagement/receivable/receipt.vue

@@ -257,7 +257,7 @@
                         min-width="140"
                         show-overflow-tooltip />
        <el-table-column prop="salesContractNo"
                         label="销售合同号"
                         label="订单号"
                         min-width="140"
                         show-overflow-tooltip />
        <el-table-column prop="shippingNo"

 src/views/financialManagement/receivable/salesOut.vue

@@ -96,7 +96,7 @@
            }),
    },
    { label: "发货编号", prop: "shippingNo", minWidth: "140" },
    { label: "销售订单号", prop: "salesContractNo", minWidth: "150" },
    { label: "订单号号", prop: "salesContractNo", minWidth: "150" },
  ];

  const dataList = ref([]);

 src/views/financialManagement/receivable/salesReturn.vue

@@ -87,7 +87,7 @@
        : Number(val).toLocaleString("zh-CN", { minimumFractionDigits: 2, maximumFractionDigits: 2 }),
  },
  { label: "退货原因", prop: "returnReason", minWidth: "150", showOverflowTooltip: true },
  { label: "销售订单号", prop: "salesContractNo", minWidth: "150" },
  { label: "订单号号", prop: "salesContractNo", minWidth: "150" },
];

const dataList = ref([]);

 src/views/inventoryManagement/stockManagement/New.vue

@@ -8,77 +8,121 @@
               :model="formState"
               label-position="top"
               ref="formRef">
        <el-form-item label="产品名称"
                      prop="productModelId"
                      :rules="[
                {
                required: true,
                message: '请选择产品',
                trigger: 'change',
              }
            ]">
          <el-button type="primary"
                     @click="showProductSelectDialog = true">
            {{ formState.productName ? formState.productName : '选择产品' }}
          </el-button>
        </el-form-item>
        <el-form-item label="规格"
                      prop="productModelName">
          <el-input v-model="formState.productModelName"
                    disabled />
        </el-form-item>
        <el-form-item label="单位"
                      prop="unit">
          <el-input v-model="formState.unit"
                    disabled />
        </el-form-item>
        <el-form-item label="库存类型"
                      prop="type"
                      :rules="[
                {
                required: true,
                message: '请选择库存类型',
                trigger: 'change',
              }
            ]">
          <el-select v-model="formState.type"
                     placeholder="请选择库存类型">
            <el-option label="合格库存"
                       value="qualified" />
            <el-option label="不合格库存"
                       value="unqualified" />
          </el-select>
        </el-form-item>
        <el-form-item label="库存数量"
                      prop="qualitity">
          <el-input-number v-model="formState.qualitity"
                           :step="1"
                           :min="1"
                           style="width: 100%" />
        </el-form-item>
        <el-form-item label="批号"
                      prop="batchNo">
          <el-input v-model="formState.batchNo"
                    placeholder="请输入批号" />
        </el-form-item>
        <el-form-item v-if="formState.type === 'qualified'"
                      label="库存预警数量"
                      prop="warnNum">
          <el-input-number v-model="formState.warnNum"
                           :step="1"
                           :min="0"
                           :max="formState.qualitity"
                           style="width: 100%" />
        </el-form-item>
        <el-form-item label="入库时间"
                      prop="createTime">
          <el-date-picker v-model="formState.createTime"
                          type="datetime"
                          placeholder="请选择入库时间"
                          value-format="YYYY-MM-DD HH:mm:ss"
                          format="YYYY-MM-DD HH:mm:ss"
                          style="width: 100%" />
        </el-form-item>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="产品名称"
                          prop="productModelId"
                          :rules="[
                    {
                    required: true,
                    message: '请选择产品',
                    trigger: 'change',
                  }
                ]">
              <el-button type="primary"
                         @click="showProductSelectDialog = true">
                {{ formState.productName ? formState.productName : '选择产品' }}
              </el-button>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="规格"
                          prop="productModelName">
              <el-input v-model="formState.productModelName"
                        disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="单位"
                          prop="unit">
              <el-input v-model="formState.unit"
                        disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="库存类型"
                          prop="type"
                          :rules="[
                    {
                    required: true,
                    message: '请选择库存类型',
                    trigger: 'change',
                  }
                ]">
              <el-select v-model="formState.type"
                         placeholder="请选择库存类型">
                <el-option label="合格库存"
                           value="qualified" />
                <el-option label="不合格库存"
                           value="unqualified" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="库存数量"
                          prop="qualitity">
              <el-input-number v-model="formState.qualitity"
                               :step="1"
                               :min="1"
                               style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="批号"
                          prop="batchNo">
              <el-input v-model="formState.batchNo"
                        placeholder="请输入批号" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="入库时间"
                          prop="createTime">
              <el-date-picker v-model="formState.createTime"
                              type="datetime"
                              placeholder="请选择入库时间"
                              value-format="YYYY-MM-DD HH:mm:ss"
                              format="YYYY-MM-DD HH:mm:ss"
                              style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="formState.type === 'qualified'"
                          label="库存预警数量"
                          prop="warnNum">
              <el-input-number v-model="formState.warnNum"
                               :step="1"
                               :min="0"
                               :max="formState.qualitity"
                               style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="是否质检"
                          prop="needInspect">
              <el-switch v-model="formState.needInspect"
                         active-text="需要质检"
                         inactive-text="直接入库" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="formState.needInspect"
                          label="质检类型"
                          prop="inspectType">
              <el-radio-group v-model="formState.inspectType">
                <el-radio :value="0">原材料检验</el-radio>
                <el-radio :value="1">过程检验</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="备注"
                      prop="remark">
          <el-input v-model="formState.remark"
@@ -134,6 +178,8 @@
    warnNum: 0,
    createTime: "",
    remark: "",
    needInspect: false,
    inspectType: 0,
  });

  const isShow = computed({
@@ -173,6 +219,8 @@
      warnNum: 0,
      createTime: "",
      remark: "",
      needInspect: false,
      inspectType: 0,
    };
    isShow.value = false;
  };
@@ -204,17 +252,21 @@
          proxy.$modal.msgError("请选择规格");
          return;
        }
        // 构建请求参数
        const params = {
          ...formState.value,
          // 如果不需要质检，不传 inspectType
          inspectType: formState.value.needInspect ? formState.value.inspectType : undefined,
        };
        if (formState.value.type === "qualified") {
          addStockInRecordOnly(formState.value).then(res => {
            // 关闭模态框
          addStockInRecordOnly(params).then(res => {
            isShow.value = false;
            // 告知父组件已完成
            emit("completed");
            proxy.$modal.msgSuccess("提交成功");
          });
        } else {
          formState.value.warnNum = 0;
          createStockUnInventory(formState.value).then(res => {
          params.warnNum = 0;
          createStockUnInventory(params).then(res => {
            // 关闭模态框
            isShow.value = false;
            // 告知父组件已完成

 src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue

@@ -60,7 +60,7 @@
        <div v-if="detailData.shippingInfo" class="shipment-detail">
          <el-divider content-position="left">发货详情</el-divider>
          <el-descriptions :column="2" border>
            <el-descriptions-item label="销售订单">{{
            <el-descriptions-item label="订单号">{{
              detailData.shippingInfo.salesContractNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="出库批号">{{
@@ -142,7 +142,7 @@
            <el-descriptions-item label="项目名称">{{
              detailData.projectName || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="销售合同号">{{
            <el-descriptions-item label="订单号">{{
              detailData.salesContractNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="签订日期">{{

 src/views/procurementManagement/paymentLedger/index.vue

@@ -84,6 +84,9 @@
            <el-table-column label="采购合同号"
                             prop="purchaseContractNumber"
                             show-overflow-tooltip/>
            <el-table-column label="采购总合同号"
                             prop="masterContractNo"
                             show-overflow-tooltip/>
            <el-table-column label="项目名称"
                             prop="projectName"
                             show-overflow-tooltip/>

 src/views/procurementManagement/procurementLedger/index.vue

@@ -27,7 +27,7 @@
                      clearable
                      :prefix-icon="Search" />
          </el-form-item>
          <el-form-item label="销售合同号：">
          <el-form-item label="订单号：">
            <el-input v-model="searchForm.salesContractNo"
                      placeholder="请输入"
                      clearable
@@ -217,7 +217,7 @@
                         prop="purchaseContractNumber"
                         width="160"
                         show-overflow-tooltip />
        <el-table-column label="销售合同号"
        <el-table-column label="订单号"
                         prop="salesContractNo"
                         width="160"
                         show-overflow-tooltip />
@@ -325,7 +325,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="销售合同号："
            <el-form-item label="订单号："
                          prop="salesLedgerId">
              <el-select v-model="form.salesLedgerId"
                         placeholder="请选择"

 src/views/procurementManagement/purchaseReturnOrder/index.vue

@@ -275,6 +275,11 @@
    width: 160,
  },
  {
    label: "采购总合同号",
    prop: "masterContractNo",
    width: 160,
  },
  {
    label: "制作日期",
    prop: "preparedAt",
    width: 130,

 src/views/procurementManagement/receivingManagement/index.vue

@@ -21,7 +21,7 @@
            @change="handleQuery"
          />
        </el-form-item>
        <el-form-item label="销售合同号：">
        <el-form-item label="订单号：">
          <el-input
            v-model="searchForm.salesContractNo"
            placeholder="请输入"
@@ -92,7 +92,8 @@
        </el-table-column>
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="采购合同号" prop="purchaseContractNumber" width="160" show-overflow-tooltip />
        <el-table-column label="销售合同号" prop="salesContractNo" width="160" show-overflow-tooltip />
        <el-table-column label="采购总合同号" prop="masterContractNo" width="160" show-overflow-tooltip />
        <el-table-column label="订单号" prop="salesContractNo" width="160" show-overflow-tooltip />
        <el-table-column label="供应商名称" prop="supplierName" width="160" show-overflow-tooltip />
        <el-table-column label="项目名称" prop="projectName" width="320" show-overflow-tooltip />
        <el-table-column label="收货状态" prop="status" width="100" show-overflow-tooltip>

 src/views/procurementManagement/receivingManagement/modal/ReceiptForm.vue

@@ -16,7 +16,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="销售合同号：">
          <el-form-item label="订单号：">
            <el-input :model-value="detailData.salesContractNo || ''" disabled />
          </el-form-item>
        </el-col>

 src/views/productionManagement/productionOrder/index.vue

@@ -278,6 +278,11 @@
      prop: "npsNo",
      width: "150px",
    },
    {
      label: "销售总合同号",
      prop: "masterContractNo",
      width: "150px",
    },
    // 1.待开始、2.进行中、3.已完成、4.已取消、5.已结束
    {
      label: "状态",

 src/views/productionManagement/productionReporting/index.vue

@@ -202,7 +202,7 @@
      width: 120,
    },
    {
      label: "销售合同号",
      label: "订单号",
      prop: "salesContractNo",
      width: 120,
    },

 src/views/productionManagement/workOrderManagement/index.vue

@@ -302,6 +302,11 @@
      width: "140",
    },
    {
      label: "销售总合同号",
      prop: "masterContractNo",
      width: "140",
    },
    {
      label: "产品名称",
      prop: "productName",
      width: "140",

 src/views/productionPlan/productionPlan/index.vue

@@ -13,7 +13,7 @@
                    style="width: 160px;"
                    @keyup.enter="handleQuery" />
        </el-form-item>
        <el-form-item label="销售合同号:"
        <el-form-item label="订单号:"
                      prop="salesContractNo">
          <el-input v-model="searchForm.salesContractNo"
                    placeholder="请输入"
@@ -318,13 +318,17 @@
      },
    },
    {
      label: "销售合同号",
      label: "订单号",
      prop: "salesContractNo",
      width: "200px",
      dataType: "slot",
      slot: "salesContractNo",
    },

    {
      label: "销售总合同号",
      prop: "masterContractNo",
      width: "150px",
    },
    {
      label: "产品名称",
      prop: "productName",

 src/views/qualityManagement/afterSalesTraceability/index.vue

@@ -116,7 +116,7 @@
    >
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="序号" type="index" width="55" align="center" />
      <el-table-column label="销售合同号" prop="contractNo" width="160" />
      <el-table-column label="订单号" prop="contractNo" width="160" />
      <el-table-column label="产品编号" prop="productCode" width="140" />
      <el-table-column label="产品型号" prop="productModel" width="140" />
      <el-table-column label="客户名称" prop="customerName" width="160" />
@@ -172,10 +172,10 @@
      >
        <el-row>
          <el-col :span="12">
            <el-form-item label="销售合同号" prop="contractNo">
            <el-form-item label="订单号" prop="contractNo">
              <el-input
                v-model="form.contractNo"
                placeholder="请选择关联销售合同号"
                placeholder="请选择关联订单号"
              />
            </el-form-item>
          </el-col>
@@ -387,7 +387,7 @@
  },
  rules: {
    contractNo: [
      { required: true, message: "销售合同号不能为空", trigger: "blur" },
      { required: true, message: "订单号不能为空", trigger: "blur" },
    ],
    productCode: [
      { required: true, message: "产品编号不能为空", trigger: "blur" },

 src/views/qualityManagement/finalInspection/components/formDia.vue

@@ -9,10 +9,10 @@
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="销售订单：" prop="salesLedgerId">
            <el-form-item label="订单号：" prop="salesLedgerId">
              <el-select
                v-model="form.salesLedgerId"
                placeholder="请选择销售订单"
                placeholder="请选择订单号"
                clearable
                filterable
                :disabled="isViewMode"
@@ -330,7 +330,7 @@
const currentProductId = ref(0);
const testStandardOptions = ref([]); // 指标选择下拉框数据
const modelOptions = ref([]);
const salesLedgerOptions = ref([]); // 销售订单下拉框数据
const salesLedgerOptions = ref([]); // 订单号下拉框数据

// 打开弹框
const openDialog = async (type, row) => {
@@ -471,12 +471,12 @@
  form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
}

// 销售订单选择变化处理
// 订单号选择变化处理
const handleSalesLedgerChange = async (value) => {
  const selectedItem = salesLedgerOptions.value.find(item => item.id == value);
  if (selectedItem) {
    form.value.salesContractNo = selectedItem.salesContractNo || '';
    // 根据销售订单ID查询产品信息，只赋值数量
    // 根据订单号ID查询产品信息，只赋值数量
    try {
      const res = await productList({ salesLedgerId: value, type: 1 });
      const productData = res.data && res.data.length > 0 ? res.data[0] : null;
@@ -486,8 +486,8 @@
        calcSampleQuantity();
      }
    } catch (e) {
      console.error('查询销售订单产品信息失败', e);
      proxy.$modal.msgError('查询销售订单产品信息失败');
      console.error('查询订单号产品信息失败', e);
      proxy.$modal.msgError('查询订单号产品信息失败');
    }
  } else {
    form.value.salesContractNo = '';

 src/views/qualityManagement/finalInspection/index.vue

@@ -26,11 +26,11 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="销售单号"
            <el-form-item label="订单号"
                          prop="salesContractNo">
              <el-input v-model="searchForm.salesContractNo"
                        style="width: 240px"
                        placeholder="请输入销售单号搜索"
                        placeholder="请输入订单号搜索"
                        clearable />
            </el-form-item>
          </el-col>
@@ -154,11 +154,16 @@
      width: 120,
    },
    {
      label: "销售单号",
      label: "订单号",
      prop: "salesContractNo",
      width: 120,
    },
    {
      label: "销售总合同号",
      prop: "masterContractNo",
      width: 120,
    },
    {
      label: "检验员",
      prop: "checkName",
    },

 src/views/reportAnalysis/projectProfit/index.vue

@@ -57,7 +57,7 @@
    },
    [
        {
            label: "销售合同号",
            label: "订单号",
            align: "center",
            prop: "customerContractNo",
        },

 src/views/safeProduction/safeWorkApproval/components/approvalDia.vue

@@ -157,7 +157,7 @@
                <el-descriptions-item label="采购合同号">{{ currentPurchase.purchaseContractNumber }}</el-descriptions-item>
                <el-descriptions-item label="供应商名称">{{ currentPurchase.supplierName }}</el-descriptions-item>
                <el-descriptions-item label="项目名称">{{ currentPurchase.projectName }}</el-descriptions-item>
                <el-descriptions-item label="销售合同号">{{ currentPurchase.salesContractNo }}</el-descriptions-item>
                <el-descriptions-item label="订单号">{{ currentPurchase.salesContractNo }}</el-descriptions-item>
                <el-descriptions-item label="签订日期">{{ currentPurchase.executionDate }}</el-descriptions-item>
                <el-descriptions-item label="录入日期">{{ currentPurchase.entryDate }}</el-descriptions-item>
                <el-descriptions-item label="付款方式">{{ currentPurchase.paymentMethod }}</el-descriptions-item>

 src/views/salesManagement/deliveryLedger/index.vue

@@ -2,7 +2,7 @@
  <div class="app-container">
    <div class="search_form">
      <el-form :model="searchForm" :inline="true">
        <el-form-item label="销售订单号：">
        <el-form-item label="订单号号：">
          <el-input
            v-model="searchForm.salesContractNo"
            placeholder="请输入"
@@ -57,8 +57,13 @@
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
          label="销售订单"
          label="订单号"
          prop="salesContractNo"
          show-overflow-tooltip
        />
        <el-table-column
          label="销售总合同号"
          prop="masterContractNo"
          show-overflow-tooltip
        />
        <el-table-column
@@ -287,7 +292,7 @@
    >
      <div v-if="detailRow" class="detail-wrapper">
        <el-descriptions :column="2" border>
          <el-descriptions-item label="销售订单">{{
          <el-descriptions-item label="订单号">{{
            detailRow.salesContractNo || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="发货订单号">{{
@@ -403,7 +408,7 @@
const dialogFormVisible = ref(false);
const data = reactive({
  searchForm: {
    salesContractNo: "", // 销售订单号
    salesContractNo: "", // 订单号号
    shippingCarNumber: "", // 车牌号
    expressNumber: "", // 快递单号
  },
@@ -421,7 +426,7 @@
  },
  rules: {
    salesContractNo: [
      { required: true, message: "请选择销售订单", trigger: "change" },
      { required: true, message: "请选择订单号", trigger: "change" },
    ],
    customerName: [
      { required: true, message: "请输入客户名称", trigger: "blur" },
@@ -474,7 +479,7 @@
    });
};

// 销售订单变化时自动填充客户名称
// 订单号变化时自动填充客户名称
const handleSalesOrderChange = (value) => {
  const selectedOrder = salesOrderOptions.value.find(
    (item) => item.salesContractNo === value

 src/views/salesManagement/receiptPaymentLedger/index.vue

@@ -95,10 +95,14 @@
                             label="序号"
                             type="index"
                             width="60" />
            <el-table-column label="销售订单"
            <el-table-column label="订单号"
                             prop="salesContractNo"
                             show-overflow-tooltip
                             width="150" />
            <el-table-column label="销售总合同号"
                             prop="masterContractNo"
                             show-overflow-tooltip
                             width="150" />
            <!-- <el-table-column label="发货订单号"
                             prop="shippingNo"
                             show-overflow-tooltip

 src/views/salesManagement/returnOrder/components/detailDia.vue

@@ -8,7 +8,7 @@
          <el-tag :type="getStatusType(detail.status)">{{ getStatusText(detail.status) }}</el-tag>
        </el-descriptions-item>
        <el-descriptions-item label="客户名称">{{ detail.customerName }}</el-descriptions-item>
        <el-descriptions-item label="销售单号">{{ detail.salesContractNo }}</el-descriptions-item>
        <el-descriptions-item label="订单号">{{ detail.salesContractNo }}</el-descriptions-item>
        <el-descriptions-item label="业务员">{{ detail.salesman }}</el-descriptions-item>
        <el-descriptions-item label="关联批号">{{ detail.shippingNo }}</el-descriptions-item>
        <!-- <el-descriptions-item label="项目名称">{{ detail.projectName }}</el-descriptions-item> -->

 src/views/salesManagement/returnOrder/components/formDia.vue

@@ -120,7 +120,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="4">
              <el-form-item label="销售合同号：">
              <el-form-item label="订单号：">
                <el-input v-model="form.salesContractNo" disabled placeholder="--" />
              </el-form-item>
            </el-col>

 src/views/salesManagement/returnOrder/index.vue

@@ -8,8 +8,8 @@
                <el-form-item label="客户名称">
                    <el-input v-model="searchForm.customerName" placeholder="客户名称" clearable />
                </el-form-item>
                <el-form-item label="销售单号">
                    <el-input v-model="searchForm.salesContractNo" placeholder="销售单号" clearable />
                <el-form-item label="订单号">
                    <el-input v-model="searchForm.salesContractNo" placeholder="订单号" clearable />
                </el-form-item>
                <el-form-item label="关联批号">
                    <el-input v-model="searchForm.shippingNo" placeholder="关联批号" clearable />
@@ -122,7 +122,8 @@
  { label: "退货状态", prop: "returnStatus", minWidth: 100, dataType: "slot", slot: "returnStatus" },
  { label: "制单时间", prop: "makeTime", minWidth: 170 },
  { label: "客户名称", prop: "customerName", minWidth: 220 },
  { label: "销售单号", prop: "salesContractNo", minWidth: 160 },
  { label: "订单号", prop: "salesContractNo", minWidth: 160 },
  { label: "销售总合同号", prop: "masterContractNo", minWidth: 160 },
  { label: "业务员", prop: "salesman", minWidth: 120 },
  { label: "关联批号", prop: "shippingNo", minWidth: 170 },
  { label: "项目名称", prop: "projectName", minWidth: 180 },

 src/views/salesManagement/salesLedger/index.vue

@@ -20,7 +20,7 @@
            @change="handleQuery"
          />
        </el-form-item>
        <el-form-item label="销售合同号：">
        <el-form-item label="订单号：">
          <el-input
            v-model="searchForm.salesContractNo"
            placeholder="请输入"
@@ -198,7 +198,7 @@
          show-overflow-tooltip
        />
        <el-table-column
          label="销售合同号"
          label="订单号"
          prop="salesContractNo"
          width="180"
          show-overflow-tooltip
@@ -349,7 +349,7 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="销售合同号：" prop="salesContractNo">
            <el-form-item label="订单号：" prop="salesContractNo">
              <div
                style="
                  display: flex;
@@ -1863,7 +1863,7 @@
    form.value.executionDate = getCurrentDate();
    // 创建时间默认为当天
    form.value.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
    // 默认自动生成销售合同号
    // 默认自动生成订单号
    form.value.autoGenerateContractNo = true;
  } else {
    currentId.value = row.id;
@@ -2220,7 +2220,7 @@
  return status === "已发货" || status === "审核通过";
};

/** 判断销售订单下是否存在已发货/发货完成的产品（不可删除） */
/** 判断订单号下是否存在已发货/发货完成的产品（不可删除） */
const hasShippedProducts = (products) => {
  if (!products || !products.length) return false;
  return products.some((p) => {
@@ -2249,7 +2249,7 @@
  }
  const ids = selectedRows.value.map((item) => item.id);

  // 检查是否有已进行发货或发货完成的销售订单，若有则不允许删除
  // 检查是否有已进行发货或发货完成的订单号，若有则不允许删除
  const cannotDeleteNames = [];
  for (const row of selectedRows.value) {
    let products =
@@ -2268,7 +2268,7 @@
  }
  if (cannotDeleteNames.length > 0) {
    proxy.$modal.msgWarning(
      "已进行发货或发货完成的销售订单不能删除：" + cannotDeleteNames.join("、")
      "已进行发货或发货完成的订单号不能删除：" + cannotDeleteNames.join("、")
    );
    return;
  }