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

yuan

2026-04-25 24f97b8c8187e1f25e777934a70cf1719333e20a

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

 src/api/productionManagement/processRouteItem.js

@@ -28,7 +28,7 @@
// 排序接口
export function sortProcessRouteItem(data) {
  return request({
    url: "/processRouteItem/sort",
    url: "/technologyRoutingOperation/sort",
    method: "post",
    data: data,
  });

 src/views/basicData/parameterMaintenance/index.vue

@@ -566,6 +566,10 @@

  // 提交表单
  const handleSubmit = () => {
    if (formData.paramType == 3 && !formData.paramFormat) {
      ElMessage.warning("下拉字典不能为空！");
      return;
    }
    formRef.value.validate(valid => {
      if (valid) {
        if (formData.id) {

 src/views/productionPlan/productionPlan/index.vue

@@ -88,6 +88,13 @@
        <template #qtyRequired="{ row }">
          {{ row.qtyRequired || '-' }}<span style="color:rgba(12, 46, 40, 0.76)"> {{ row.unit || '方' }}</span>
        </template>
        <template #salesContractNo="{ row }">
          <el-button type="primary"
                     text
                     link
                     @click="showDetail(row)">{{ row.salesContractNo }}
          </el-button>
        </template>
      </PIMTable>
    </div>
    <!-- 合并下发弹窗 -->
@@ -286,9 +293,13 @@
      width: "150px",
      dataType: "tag",
      formatType: params => {
        return params == "内部" ? "info" : "primary";
        return params == "销售" ? "primary" : "info";
      },
      formatData: params => {
        return params == "销售" ? "销售" : "内部";
      },
    },

    {
      label: "产品名称",
      prop: "productName",
@@ -361,6 +372,23 @@
      width: "160px",
      className: "date-cell",
      formatData: cell => (cell ? dayjs(cell).format("YYYY-MM-DD") : ""),
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      width: "200px",
      dataType: "slot",
      slot: "salesContractNo",
    },
    {
      label: "客户名称",
      prop: "customerName",
      width: "150px",
    },
    {
      label: "项目名称",
      prop: "projectName",
      width: "150px",
    },
    {
      label: "备注",
@@ -717,6 +745,14 @@
    // 打开弹窗
    isShowNewModal.value = true;
  };
  const showDetail = row => {
    router.push({
      path: "/salesManagement/salesLedger",
      query: {
        salesContractNo: row.salesContractNo,
      },
    });
  };

  // 处理合并下发提交
  const handleMergeSubmit = () => {

 src/views/salesManagement/salesLedger/index.vue

@@ -944,8 +944,10 @@
  import useFormData from "@/hooks/useFormData.js";
  import dayjs from "dayjs";
  import { getCurrentDate } from "@/utils/index.js";
  import { useRouter, useRoute } from "vue-router";
  import { listCustomerPrivatePool } from "@/api/basicData/customerFile.js";

  const router = useRouter();
  const route = useRoute();
  const userStore = useUserStore();
  const { proxy } = getCurrentInstance();
  const tableData = ref([]);
@@ -2058,7 +2060,8 @@
                                                  <div class="info-row">
                                                    <span class="label">单号：</span>
                                                    <span class="value">${
                                                      item.salesContractNo || ""
                                                                item.salesContractNo ||
                                                                ""
                                                    }</span>
                                                  </div>
                                                </div>
@@ -2078,7 +2081,8 @@
                                                    <tbody>
                                                      ${
                                                        item.products &&
                                                        item.products.length > 0
                                                                  item.products
                                                                    .length > 0
                                                          ? item.products
                                                              .map(
                                                                product => `
@@ -2092,7 +2096,8 @@
                                                              ""
                                                            }</td>
                                                            <td>${
                                                              product.unit || ""
                                                                        product.unit ||
                                                                        ""
                                                            }</td>
                                                            <td>${
                                                              product.taxInclusiveUnitPrice ||
@@ -2584,6 +2589,7 @@
    currentFactoryName.value = res.user.currentFactoryName;
  };
  onMounted(() => {
    searchForm.salesContractNo = route.query.salesContractNo;
    getList();
    userListNoPage().then(res => {
      userList.value = res.data;