阳光彩印web 修改销售合同号为订单编号

张诺

4 小时以前 19f73dc4a398c5d89b6568ede10bf2804a43bbf8

阳光彩印web 修改销售合同号为订单编号

 src/api/salesManagement/salesLedger.js

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

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

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

@@ -150,7 +150,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/collaborativeApproval/purchaseApproval/index.vue

@@ -17,7 +17,7 @@
                :prefix-icon="Search"
            />
          </el-form-item>
          <el-form-item label="销售合同号：">
          <el-form-item label="订单编号：">
            <el-input v-model="searchForm.salesContractNo" placeholder="请输入" clearable prefix-icon="Search"
                      @change="handleQuery" />
          </el-form-item>
@@ -96,7 +96,7 @@
          show-overflow-tooltip
        />
        <el-table-column
          label="销售合同号"
          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/procurementManagement/invoiceEntry/components/Modal.vue

@@ -14,7 +14,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="销售合同号：" prop="salesContractNo">
                    <el-form-item label="订单编号：" prop="salesContractNo">
                        <el-input
                            v-model="form.salesContractNo"
                            placeholder="自动填充"

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -21,10 +21,10 @@
          />
        </el-form-item>

        <el-form-item label="销售合同号">
        <el-form-item label="订单编号">
          <el-input
              v-model="filters.salesContractNo"
              placeholder="请输入销售合同号"
              placeholder="请输入订单编号"
              clearable
          />
        </el-form-item>
@@ -127,7 +127,7 @@
      width:150
    },
    {
      label: "销售合同号",
      label: "订单编号",
      prop: "salesContractNo",
      width:150
    },

 src/views/procurementManagement/paymentEntry/index.vue

@@ -4,11 +4,11 @@
      <el-form :inline="true" :model="searchForm" style="width: 100%">
        <el-row justify="space-between">
          <el-col :span="20">
            <el-form-item label="供应商名称/合同号">
            <el-form-item label="供应商名称/订单编号">
              <el-input
                v-model="searchForm.supplierNameOrContractNo"
                style="width: 240px"
                placeholder="输入供应商名称/合同号搜索"
                placeholder="输入供应商名称/订单编号搜索"
                clearable
                prefix-icon="Search"
                @change="handleQuery"
@@ -144,7 +144,7 @@
      >
        <el-table-column type="index" label="序号" width="50" align="center"/>
        <el-table-column label="采购合同号" prop="purchaseContractNumber" show-overflow-tooltip />
        <el-table-column label="销售合同号" prop="salesContractNo" show-overflow-tooltip />
        <el-table-column label="订单编号" prop="salesContractNo" show-overflow-tooltip />
        <el-table-column label="供应商名称" prop="supplierName" show-overflow-tooltip />
        <el-table-column
          label="产品大类"
@@ -254,7 +254,7 @@
    width:160
  },
  {
    label: "销售合同号",
    label: "订单编号",
    prop: "salesContractNo",
    width:160
  },

 src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue

@@ -10,7 +10,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="销售合同号：">
          <el-form-item label="订单编号：">
            <el-text>{{ form.salesContractNo }}</el-text>
          </el-form-item>
        </el-col>
@@ -107,7 +107,7 @@
const { form, resetForm } = useFormData({
  id: undefined,
  purchaseContractNumber: undefined, // 采购合同号
  salesContractNo: undefined, // 销售合同号
  salesContractNo: undefined, // 订单编号
  createdAt: undefined, // 创建时间
  invoiceNumber: undefined, // 发票号
  ticketsNum: undefined, // 来票数

 src/views/procurementManagement/procurementInvoiceLedger/index.vue

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

 src/views/procurementManagement/procurementLedger/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
@@ -112,7 +112,7 @@
                         prop="purchaseContractNumber"
                         width="160"
                         show-overflow-tooltip />
        <el-table-column label="销售合同号"
        <el-table-column label="订单编号"
                         prop="salesContractNo"
                          width="160"
                         show-overflow-tooltip />
@@ -207,7 +207,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/productionManagement/productionOrder/index.vue

@@ -125,7 +125,7 @@
      width: '120px',
    },
    {
      label: "销售合同号",
      label: "订单编号",
      prop: "salesContractNo",
      width: '150px',
    },

 src/views/productionManagement/productionReporting/index.vue

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

 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/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="请输入" clearable prefix-icon="Search" style="width: 200px"
            @change="handleQuery" />
        </el-form-item>

 src/views/salesManagement/invoiceLedger/index.vue

@@ -2,8 +2,8 @@
  <div class="app-container">
    <div class="search_form">
      <el-form :inline="true" :model="searchForm">
        <el-form-item label="客户名称/合同号">
          <el-input v-model="searchForm.searchText" style="width: 240px" placeholder="输入客户名称/销售合同号搜索"
        <el-form-item label="客户名称/订单编号">
          <el-input v-model="searchForm.searchText" style="width: 240px" placeholder="输入客户名称/订单编号搜索"
            @change="handleQuery" clearable :prefix-icon="Search" />
        </el-form-item>
        <el-form-item label="开票日期">
@@ -30,7 +30,7 @@
        :row-key="(row) => row.id" show-summary :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="销售合同号" prop="salesContractNo" show-overflow-tooltip width="180" />
        <el-table-column label="订单编号" prop="salesContractNo" show-overflow-tooltip width="180" />
        <el-table-column label="客户名称" prop="customerName" show-overflow-tooltip width="240" />
        <el-table-column label="产品大类" prop="productCategory" width="200" />
        <el-table-column label="规格型号" prop="specificationModel" width="160" show-overflow-tooltip />
@@ -56,7 +56,7 @@
      <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="salesContractNo">
            <el-form-item label="订单编号：" prop="salesContractNo">
              <el-input v-model="form.salesContractNo" disabled></el-input>
            </el-form-item>
          </el-col>

 src/views/salesManagement/invoiceRegistration/index.vue

@@ -116,7 +116,7 @@
                </el-table-column>
                <el-table-column align="center" label="序号" type="index" width="60" />
                <el-table-column
                    label="销售合同号"
                    label="订单编号"
                    prop="salesContractNo"
                    show-overflow-tooltip
                />
@@ -184,7 +184,7 @@
            >
                <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="销售合同号：" prop="salesContractNo">
                        <el-form-item label="订单编号：" prop="salesContractNo">
                            <el-input v-model="form.salesContractNo" disabled placeholder="多合同批量处理（具体合同号见产品列表）"></el-input>
                        </el-form-item>
                    </el-col>
@@ -609,7 +609,7 @@
                    allProductData.push({
                        ...item,
                        // id: contractId, // 明确设置合同ID
                        salesContractNo: contract.salesContractNo, // 添加销售合同号
                        salesContractNo: contract.salesContractNo, // 添加订单编号
                        customerName: contract.customerName, // 添加客户名称
                        customerContractNo: contract.customerContractNo // 添加客户合同号
                    });
@@ -617,13 +617,13 @@
            }
        });
        
        // 设置表单数据（使用第一个合同的基本信息，销售合同号留空）
        // 设置表单数据（使用第一个合同的基本信息，订单编号留空）
        form.value = { ...results[0] };
        form.value.createTime = dayjs().format("YYYY-MM-DD");
        form.value.issueDate = dayjs().format("YYYY-MM-DD");
        form.value.createUer = userStore.nickName;
        form.value.selectedContractIds = selectedRows.value.map(row => row.id); // 存储所有选中的合同ID
        form.value.salesContractNo = ""; // 销售合同号留空，因为会在产品表格中分别显示
        form.value.salesContractNo = ""; // 订单编号留空，因为会在产品表格中分别显示
        
        productData.value = allProductData;
        

 src/views/salesManagement/receiptPayment/index.vue

@@ -129,7 +129,7 @@
        </el-table-column>
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
          label="销售合同号"
          label="订单编号"
          prop="salesContractNo"
          show-overflow-tooltip
          width="240"
@@ -209,7 +209,7 @@
        size="small"
      >
        <el-table-column type="index" label="序号" width="50" align="center"/>
        <el-table-column label="销售合同号" prop="salesContractNo" show-overflow-tooltip />
        <el-table-column label="订单编号" prop="salesContractNo" show-overflow-tooltip />
        <el-table-column label="客户名称" prop="customerName" show-overflow-tooltip />
                <el-table-column
                    label="产品大类"

 src/views/salesManagement/receiptPaymentHistory/index.vue

@@ -76,7 +76,7 @@
const { proxy } = getCurrentInstance();
const tableColumn = ref([
  {
    label: "销售合同号",
    label: "订单编号",
    prop: "salesContractNo",
    width:240
  },

 src/views/salesManagement/receiptPaymentLedger/index.vue

@@ -91,7 +91,7 @@
                        width="110"
          />
          <el-table-column
            label="销售合同号"
            label="订单编号"
            prop="salesContractNo"
            show-overflow-tooltip
                        width="200"

 src/views/salesManagement/salesLedger/index.vue

@@ -6,12 +6,7 @@
          <el-input v-model="searchForm.customerName" placeholder="请输入" clearable prefix-icon="Search"
            @change="handleQuery" />
        </el-form-item>
<!--        <el-form-item label="销售合同号：">-->
<!--          <el-input v-model="searchForm.salesContractNo" placeholder="请输入" clearable prefix-icon="Search"-->
<!--            @change="handleQuery" />-->
<!--        </el-form-item>-->
<!--        <el-input v-model="form.salesContractNo" placeholder="可手动输入或自动生成" clearable :disabled="operationType === 'view'">-->
        <el-form-item label="销售订单号：">
        <el-form-item label="订单编号：">
          <el-input v-model="form.salesContractNo" placeholder="可手动输入或自动生成" clearable :disabled="operationType === 'view'" />
                  </el-form-item>
        <el-form-item label="录入日期：">
@@ -109,10 +104,10 @@
          </template>
        </el-table-column>
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="销售订单号" prop="salesContractNo" width="180" show-overflow-tooltip />
        <el-table-column label="订单编号" prop="salesContractNo" width="180" show-overflow-tooltip />
        <el-table-column label="客户名称" prop="customerName" width="300" show-overflow-tooltip />
        <el-table-column label="业务员" prop="salesman" width="100" show-overflow-tooltip />
        <el-table-column label="项目名称" prop="projectName" width="180" show-overflow-tooltip />
<!--        <el-table-column label="项目名称" prop="projectName" width="180" show-overflow-tooltip />-->
        <el-table-column label="付款方式" prop="paymentMethod" show-overflow-tooltip />
        <el-table-column label="合同金额(元)" prop="contractAmount" width="220" show-overflow-tooltip
          :formatter="formattedNumber" />
@@ -137,7 +132,7 @@
                <!-- 报价单导入入口：放在表单顶部，选择后反显客户/业务员等 -->
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="销售订单号：" prop="salesContractNo">
            <el-form-item label="订单编号：" prop="salesContractNo">
              <el-input v-model="form.salesContractNo" placeholder="可手动输入或自动生成" clearable :disabled="operationType === 'view'" />
            </el-form-item>
          </el-col>