Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inven...

yyb

5 小时以前 14653f7ebb58c63ff700ab5f62c3108f1ff39eea

Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂

 src/api/salesManagement/salesLedger.js

@@ -212,3 +212,11 @@
    data,
  });
}

//  已发货客户
export function shippedCustomers() {
  return request({
    url: "/sales/ledger/shippedCustomers",
    method: "get",
  })
}

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

@@ -21,7 +21,7 @@
            </el-col>
            <el-col :span="4">
              <el-form-item label="客户名称：" prop="customerId">
                <el-select v-model="form.customerId" filterable placeholder="请选择客户" @change="customerNameChange">
                <el-select v-model="form.customerId" filterable placeholder="请选择客户" @change="customerNameChange" clearable >
                  <el-option
                    v-for="item in customerNameOptions"
                    :key="item.value"
@@ -33,7 +33,7 @@
            </el-col>
            <el-col :span="4">
              <el-form-item label="关联出库单号：" prop="shippingId">
                <el-select v-model="form.shippingId" filterable placeholder="请选择出库单号" @change="outboundNoChange">
                <el-select v-model="form.shippingId" filterable placeholder="请选择出库单号" @change="outboundNoChange" clearable>
                  <el-option
                    v-for="item in outboundOptions"
                    :key="item.value"
@@ -45,7 +45,7 @@
            </el-col>
            <el-col :span="4">
              <el-form-item label="制单人：" prop="maker">
                <el-select v-model="form.maker" filterable placeholder="请选择制单人">
                <el-select v-model="form.maker" filterable placeholder="请选择制单人" clearable>
                  <el-option v-for="u in userOptions" :key="u.value" :label="u.label" :value="u.value" />
                </el-select>
              </el-form-item>
@@ -147,7 +147,8 @@
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column align="center" prop="productCategory" label="产品大类" />
        <el-table-column align="center" prop="specificationModel" label="规格型号" />
        <el-table-column align="center" prop="unit" label="单位" />
        <el-table-column align="center" prop="thickness" label="厚度(mm)" />
        <el-table-column align="center" prop="productModelUnit" label="单位" />
        <el-table-column align="center" prop="quantity" label="总数量" />
        <el-table-column align="center" prop="unQuantity" label="未退货数量" />
        <el-table-column align="center" label="已退货数量">
@@ -168,10 +169,10 @@
<script setup>
import { reactive, ref, toRefs, getCurrentInstance } from "vue";
import { returnManagementAdd, returnManagementUpdate, returnManagementGetByShippingId, getSalesLedger, returnManagementGetById } from "@/api/salesManagement/returnOrder.js";
import { getAllCustomerList } from "@/api/customerService/index.js";
import useUserStore from "@/store/modules/user.js";
import { userListNoPageByTenantId } from "@/api/system/user.js";
import { listProject } from "@/api/oaSystem/projectManagement.js";
import { shippedCustomers } from "@/api/salesManagement/salesLedger";

const { proxy } = getCurrentInstance();
const emit = defineEmits(['close'])
@@ -354,11 +355,11 @@
};

const initCustomers = async () => {
  const res = await getAllCustomerList({});
  if (res?.records) {
    customerNameOptions.value = res.records.map(item => ({
  const res = await shippedCustomers({});
  if (res?.data) {
    customerNameOptions.value = res.data.map(item => ({
      label: item.customerName,
      value: item.customerName, // Keep value as name if needed for other logic, but request says customerId
      value: item.customerName,
      id: item.id,
      code: item.customerCode
    }));

 src/views/salesManagement/salesLedger/index.vue

@@ -3644,7 +3644,28 @@
      } else {
        const res = await getProcessCard(selectedId);
        const processCardData = res?.data ?? {};
        printFinishedProcessCard(processCardData);
        const routeNodes = processCardData?.routeNodes;
        const isProcessRouteEmpty =
          !Array.isArray(routeNodes) || routeNodes.length === 0;
        if (isProcessRouteEmpty) {
          proxy.$modal.closeLoading();
          try {
            await ElMessageBox.confirm(
              "当前订单未绑定工艺路线也没有设置默认的工艺路线，是否仍要打印？",
              "提示",
              {
                confirmButtonText: "打印",
                cancelButtonText: "取消",
                type: "warning",
              }
            );
          } catch {
            return;
          }
          printFinishedProcessCard(processCardData);
        } else {
          printFinishedProcessCard(processCardData);
        }
      }
    } catch (error) {
      console.error(