湟水峡 1.采购模块不要项目名称 2.加一个有待回款登记的提示 3.回款登记、付款登记改成和销售订单价格关联，并且可以多个一起回款或付款 4.合同管理...

gaoluyang

5 天以前 e00905e53ee5d91d9e488ecf5ece3e25b9889436

 src/views/productionManagement/productionOrder/index.vue

@@ -1,391 +1,301 @@
<template>
   <div class="app-container">
      <div class="search_form">
         <div>
            <span class="search_title">产品大类：</span>
            <el-tree-select
               v-model="searchForm.productCategory"
               :data="productOptions"
               placeholder="请选择"
      <el-form :model="searchForm"
               :inline="true">
        <el-form-item label="客户名称:">
          <el-input v-model="searchForm.customerName"
                    placeholder="请输入"
               clearable
               check-strictly
               :render-after-expand="false"
               style="width: 240px"
               @change="handleQuery"
            />
            <span class="search_title ml10">录入日期：</span>
            <el-date-picker v-model="searchForm.registerDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                                    placeholder="请选择" clearable @change="changeDaterange" />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
            >搜索</el-button
            >
         </div>
                    prefix-icon="Search"
                    style="width: 160px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="合同号:">
          <el-input v-model="searchForm.salesContractNo"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                    style="width: 160px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="产品名称:">
          <el-input v-model="searchForm.productCategory"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                    style="width: 160px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="规格:">
          <el-input v-model="searchForm.specificationModel"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                    style="width: 160px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item>
          <el-button type="primary"
                     @click="handleQuery">搜索</el-button>
        </el-form-item>
      </el-form>
         <div>
            <el-button type="primary" @click="openDialog('create')">新增订单</el-button>
            <el-button @click="handleOut">导出</el-button>
         </div>
      </div>
      <div class="table_list">
         <PIMTable
            rowKey="id"
      <PIMTable rowKey="id"
            :column="tableColumn"
            :tableData="tableData"
            :page="page"
            :tableLoading="tableLoading"
            @pagination="pagination"
         >
            <template #action="{ row }">
               <el-button type="primary" link @click="handleEdit(row)">编辑</el-button>
               <el-button type="danger" link @click="handleDelete(row)">删除</el-button>
                @pagination="pagination">
        <template #completionStatus="{ row }">
          <el-progress
            :percentage="toProgressPercentage(row?.completionStatus)"
            :color="progressColor(toProgressPercentage(row?.completionStatus))"
            :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
          />
            </template>
         </PIMTable>
      </div>
   <el-dialog v-model="dialogVisible" :title="dialogTitle" width="40%" @close="closeDialog">
      <el-form ref="formRef" :model="form" :rules="formRules" label-width="100px">
         <el-form-item label="录入日期" prop="registerDate">
            <el-date-picker v-model="form.registerDate" type="date" value-format="YYYY-MM-DD" format="YYYY-MM-DD" placeholder="请选择录入日期" style="width: 100%"/>
         </el-form-item>
         <el-form-item label="产品大类" prop="productCategory">
            <el-tree-select
               v-model="form.productCategory"
               :data="productOptions"
               placeholder="请选择产品大类"
               clearable
               check-strictly
               :render-after-expand="false"
               style="width: 100%"
               @change="handleCategoryChange"
            />
         </el-form-item>
         <el-form-item label="规格型号" prop="productModelId">
            <el-select v-model="form.productModelId" placeholder="请选择规格型号" style="width: 100%" @change="handleModelChange">
               <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id"/>
    <el-dialog v-model="bindRouteDialogVisible"
               title="绑定工艺路线"
               width="500px">
      <el-form label-width="90px">
        <el-form-item label="工艺路线">
          <el-select v-model="bindForm.routeId"
                     placeholder="请选择工艺路线"
                     style="width: 100%;"
                     :loading="bindRouteLoading">
            <el-option v-for="item in routeOptions"
                       :key="item.id"
                       :label="`${item.processRouteCode || ''}`"
                       :value="item.id" />
            </el-select>
         </el-form-item>
         <el-form-item label="单位" prop="unit">
            <el-input v-model="form.unit" placeholder="自动带出" disabled/>
         </el-form-item>
         <el-form-item label="数量" prop="quantity">
            <el-input-number v-model="form.quantity" :min="0" :step="0.1" style="width: 100%"/>
         </el-form-item>
      </el-form>
      <template #footer>
         <div class="dialog-footer">
            <el-button type="primary" @click="submitForm">确认</el-button>
            <el-button @click="closeDialog">取消</el-button>
         </div>
        <span class="dialog-footer">
          <el-button @click="bindRouteDialogVisible = false">取 消</el-button>
          <el-button type="primary"
                     :loading="bindRouteSaving"
                     @click="handleBindRouteConfirm">确 认</el-button>
        </span>
      </template>
   </el-dialog>
   </div>
</template>

<script setup>
import {onMounted, ref, reactive, toRefs, getCurrentInstance} from "vue";
  import { onMounted, ref } from "vue";
import { ElMessageBox } from "element-plus";
import dayjs from "dayjs";
import {schedulingListPage, addProductionOrder, updateProductionOrder, deleteProductionOrder} from "@/api/productionManagement/productionOrder.js";
import {productTreeList, modelList} from "@/api/basicData/product.js";
  import { useRouter } from "vue-router";
  import {
    productOrderListPage,
    listProcessRoute,
    bindingRoute,
    listProcessBom,
  } from "@/api/productionManagement/productionOrder.js";
  import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
const { proxy } = getCurrentInstance();

  const router = useRouter();

const tableColumn = ref([
   {
      label: "录入日期",
      prop: "registerDate",
      width: 120,
   },
   {
      label: "生产订单号",
      prop: "orderNo",
      prop: "npsNo",
      width: '120px',
   },
   {
      label: "产品大类",
      label: "销售合同号",
      prop: "salesContractNo",
      width: '150px',
    },
    {
      label: "客户名称",
      prop: "customerName",
      width: '200px',
    },
    {
      label: "产品名称",
      prop: "productCategory",
      width: '120px',
   },
   {
      label: "规格型号",
      label: "规格",
      prop: "specificationModel",
      width: '120px',
   },
   {
      label: "单位",
      prop: "unit",
      label: "工艺路线编号",
      prop: "processRouteCode",
      width: '200px',
   },
   {
      label: "数量",
      label: "需求数量",
      prop: "quantity",
   },
   // {
   //    label: "排产数量",
   //    prop: "schedulingNum",
   //    width: 100,
   // },
   // {
   //    label: "完工数量",
   //    prop: "successNum",
   //    width: 100,
   // },
   {
      label: "操作",
      prop: "action",
      width: 120,
      fixed: "right",
      label: "完成数量",
      prop: "completeQuantity",
    },
    {
      dataType: "slot",
      label: "完成进度",
      prop: "completionStatus",
      slot: "completionStatus",
      width: 180,
    },
    {
      label: "开始日期",
      prop: "startTime",
      formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
      width: 120,
    },
    {
      label: "结束日期",
      prop: "endTime",
      formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
      width: 120,
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
      slot: "action"
   }
      fixed: "right",
      width: 200,
      operation: [
        {
          name: "工艺路线",
          type: "text",
          clickFun: row => {
            showRouteItemModal(row);
          },
        },
        {
          name: "绑定工艺路线",
          type: "text",
          showHide: row => !row.processRouteCode,
          clickFun: row => {
            openBindRouteDialog(row);
          },
        },
        {
          name: "产品结构",
          type: "text",
          clickFun: row => {
            showProductStructure(row);
          },
        },
      ],
    },
]);
const tableData = ref([]);
const tableLoading = ref(false);
const page = ref({
  const page = reactive({
   current: 1,
   size: 100,
   total: 0,
});
const dialogVisible = ref(false);
const dialogTitle = ref("");
const dialogMode = ref(""); // 'create' 或 'edit'
const formRef = ref();
const productOptions = ref([]);
const modelOptions = ref([]);
const form = reactive({
   id: null,
   registerDate: dayjs().format("YYYY-MM-DD"),
   productCategory: "",
   productCategoryName: "",
   productModelId: "",
   specificationModel: "",
   unit: "",
   quantity: null,
});
const formRules = {
   registerDate: [{ required: true, message: "请选择录入日期", trigger: "change" }],
   productCategory: [{ required: true, message: "请选择产品大类", trigger: "change" }],
   productModelId: [{ required: true, message: "请选择规格型号", trigger: "change" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
};

const data = reactive({
   searchForm: {
      customerName: "",
      salesContractNo: "",
      projectName: "",
      productCategory: "",
      registerDate: null, // 录入日期
      entryDateStart: undefined,
      entryDateEnd: undefined,
      specificationModel: "",
   },
});
const { searchForm } = toRefs(data);

const openDialog = (mode, row = null) => {
   dialogMode.value = mode;
   if (mode === 'create') {
      dialogTitle.value = "新增生产订单";
      resetForm();
   } else if (mode === 'edit') {
      dialogTitle.value = "编辑生产订单";
      resetForm();
  const toProgressPercentage = val => {
    const n = Number(val);
    if (!Number.isFinite(n)) return 0;
    if (n <= 0) return 0;
    if (n >= 100) return 100;
    return Math.round(n);
  };
      
      console.log('编辑数据:', row);
  // 30/50/80/100 分段颜色：红/橙/蓝/绿
  const progressColor = percentage => {
    const p = toProgressPercentage(percentage);
    if (p < 30) return "#f56c6c";
    if (p < 50) return "#e6a23c";
    if (p < 80) return "#409eff";
    return "#67c23a";
  };
      
      // 填充编辑数据
      form.id = row.id;
      form.registerDate = row.registerDate;
      form.productCategoryName = row.productCategory;
      form.specificationModel = row.specificationModel;
      form.unit = row.unit;
      form.quantity = row.quantity;
		
      // 先加载产品选项，然后根据名称查找对应的ID
      if (productOptions.value.length === 0) {
         getProductOptions().then(() => {
            findAndSetProductCategory(row.productCategory);
  // 绑定工艺路线弹框
  const bindRouteDialogVisible = ref(false);
  const bindRouteLoading = ref(false);
  const bindRouteSaving = ref(false);
  const routeOptions = ref([]);
  const bindForm = reactive({
    orderId: null,
    routeId: null,
         });
      } else {
         findAndSetProductCategory(row.productCategory);
      }
   }
   
   dialogVisible.value = true;
   if (productOptions.value.length === 0) {
      getProductOptions();
   }
};

const closeDialog = () => {
   dialogVisible.value = false;
};

const resetForm = () => {
   form.id = null;
   form.registerDate = dayjs().format("YYYY-MM-DD");
   form.productCategory = "";
   form.productCategoryName = "";
   form.productModelId = "";
   form.specificationModel = "";
   form.unit = "";
   form.quantity = null;
   modelOptions.value = [];
};

const handleCategoryChange = (value) => {
   form.productCategory = value;
   form.productCategoryName = findNodeById(productOptions.value, value) || "";
   form.productModelId = "";
   form.specificationModel = "";
   form.unit = "";
   modelOptions.value = [];
   if (value) {
      getModels(value);
   }
};

const handleModelChange = (value) => {
   form.productModelId = value;
   const selected = modelOptions.value.find(item => item.id === value);
   if (selected) {
      form.specificationModel = selected.model;
      form.unit = selected.unit || "";
   } else {
      form.specificationModel = "";
      form.unit = "";
   }
};

const submitForm = () => {
   formRef.value?.validate(async (valid) => {
      if (!valid) return;
      if (!form.unit) {
         proxy.$modal.msgWarning("请先选择规格型号以带出单位");
  const openBindRouteDialog = async row => {
    bindForm.orderId = row.id;
    bindForm.routeId = null;
    bindRouteDialogVisible.value = true;
    routeOptions.value = [];
    if (!row.productModelId) {
      proxy.$modal.msgWarning("当前订单缺少产品型号，无法查询工艺路线");
      bindRouteDialogVisible.value = false;
         return;
      }
    bindRouteLoading.value = true;
      try {
         const payload = {
            registerDate: form.registerDate,
            productCategory: form.productCategoryName,
            specificationModel: form.specificationModel,
            unit: form.unit,
            quantity: form.quantity,
      const res = await listProcessRoute({ productModelId: row.productModelId });
      routeOptions.value = res.data || [];
    } catch (e) {
      console.error("获取工艺路线列表失败：", e);
      proxy.$modal.msgError("获取工艺路线列表失败");
    } finally {
      bindRouteLoading.value = false;
    }
         };
         
         if (dialogMode.value === 'create') {
            await addProductionOrder(payload);
            proxy.$modal.msgSuccess("新增成功");
         } else if (dialogMode.value === 'edit') {
            payload.id = form.id;
            await updateProductionOrder(payload);
            proxy.$modal.msgSuccess("编辑成功");
  const handleBindRouteConfirm = async () => {
    if (!bindForm.routeId) {
      proxy.$modal.msgWarning("请选择工艺路线");
      return;
         }
			
         closeDialog();
    bindRouteSaving.value = true;
    try {
      await bindingRoute({
        id: bindForm.orderId,
        routeId: bindForm.routeId,
      });
      proxy.$modal.msgSuccess("绑定成功");
      bindRouteDialogVisible.value = false;
         getList();
      } catch (err) {
         console.error(`${dialogMode.value === 'create' ? '新增' : '编辑'}失败`, err);
         proxy.$modal.msgError(`${dialogMode.value === 'create' ? '新增' : '编辑'}失败，请重试`);
      }
   });
};

// 编辑方法
const handleEdit = (row) => {
   openDialog('edit', row);
};

// 删除方法
const handleDelete = (row) => {
   proxy.$modal.confirm(`确定要删除生产订单"${row.orderNo}"吗？`, "删除确认", {
      confirmButtonText: "确定",
      cancelButtonText: "取消",
      type: "warning",
   }).then(async () => {
      try {
         await deleteProductionOrder([row.id]);
         proxy.$modal.msgSuccess("删除成功");
         getList(); // 刷新列表
      } catch (err) {
         console.error("删除失败", err);
         proxy.$modal.msgError("删除失败，请重试");
      }
   }).catch(() => {
      proxy.$modal.msg("已取消删除");
   });
};

const getProductOptions = () => {
   return productTreeList().then((res) => {
      productOptions.value = convertIdToValue(res || []);
   });
};

const getModels = (value) => {
   return modelList({ id: value }).then((res) => {
      modelOptions.value = res || [];
   });
};

const convertIdToValue = (data) => {
   return data.map((item) => {
      const { id, children, ...rest } = item;
      const newItem = {
         ...rest,
         value: id,
      };
      if (children && children.length > 0) {
         newItem.children = convertIdToValue(children);
      }
      return newItem;
   });
};

const findNodeById = (nodes, value) => {
   for (let i = 0; i < nodes.length; i++) {
      if (nodes[i].value === value) {
         return nodes[i].label;
      }
      if (nodes[i].children && nodes[i].children.length > 0) {
         const label = findNodeById(nodes[i].children, value);
         if (label) return label;
      }
   }
   return null;
};

const findNodeByLabel = (nodes, label) => {
   for (let i = 0; i < nodes.length; i++) {
      if (nodes[i].label === label) {
         return nodes[i].value;
      }
      if (nodes[i].children && nodes[i].children.length > 0) {
         const value = findNodeByLabel(nodes[i].children, label);
         if (value) return value;
      }
   }
   return null;
};

const findAndSetProductCategory = (categoryName) => {
   const categoryId = findNodeByLabel(productOptions.value, categoryName);
   if (categoryId) {
      form.productCategory = categoryId;
      // 加载对应的规格型号选项
      getModels(categoryId).then(() => {
         // 根据规格型号名称查找对应的ID
         const modelItem = modelOptions.value.find(item => item.model === form.specificationModel);
         if (modelItem) {
            form.productModelId = modelItem.id;
         }
      });
    } catch (e) {
      console.error("绑定工艺路线失败：", e);
      proxy.$modal.msgError("绑定工艺路线失败");
    } finally {
      bindRouteSaving.value = false;
   }
};

// 查询列表
/** 搜索按钮操作 */
const handleQuery = () => {
   page.value.current = 1;
    page.current = 1;
   getList();
};
const pagination = (obj) => {
   page.value.current = obj.page;
   page.value.size = obj.limit;
  const pagination = obj => {
    page.current = obj.page;
    page.size = obj.limit;
   getList();
};
const changeDaterange = (value) => {
  const changeDaterange = value => {
   if (value) {
      searchForm.value.entryDateStart = value[0];
      searchForm.value.entryDateEnd = value[1];
@@ -398,29 +308,59 @@
const getList = () => {
   tableLoading.value = true;
   // 构造一个新的对象，不包含entryDate字段
   const params = { ...searchForm.value, ...page.value };
   params.registerDate = undefined
   if (params.productCategory) {
      // 如果是对象类型，获取其label（名称）而不是value（ID）
      if (typeof params.productCategory === "object") {
         params.productCategory = findNodeById(productOptions.value, params.productCategory) || params.productCategory;
      }
      // 如果是ID，转换为名称
      else if (typeof params.productCategory === "string" || typeof params.productCategory === "number") {
         const categoryName = findNodeById(productOptions.value, params.productCategory);
         if (categoryName) {
            params.productCategory = categoryName;
         }
      }
   }
   schedulingListPage(params).then((res) => {
      console.log('params---', res)
    const params = { ...searchForm.value, ...page };
    params.entryDate = undefined;
    productOrderListPage(params)
      .then(res => {
      tableLoading.value = false;
      tableData.value = res.data.data.records;
      page.value.total = res.data.data.total;
   }).catch(() => {
      tableLoading.value = false;
        tableData.value = res.data.records;
        page.total = res.data.total;
   })
      .catch(() => {
        tableLoading.value = false;
      });
  };

  const showRouteItemModal = async row => {
    const orderId = row.id;
    try {
      const res = await getOrderProcessRouteMain(orderId);
      const data = res.data || {};
      if (!data || !data.id) {
        proxy.$modal.msgWarning("未找到关联的工艺路线");
        return;
      }
      router.push({
        path: "/productionManagement/processRouteItem",
        query: {
          id: data.id,
          processRouteCode: data.processRouteCode || "",
          productName: data.productName || "",
          model: data.model || "",
          bomNo: data.bomNo || "",
          description: data.description || "",
          orderId,
          type: "order",
        },
      });
    } catch (e) {
      console.error("获取工艺路线主信息失败：", e);
      proxy.$modal.msgError("获取工艺路线信息失败");
    }
  };

  const showProductStructure = row => {
    router.push({
      path: "/productionManagement/productStructureDetail",
      query: {
        id: row.id,
        bomNo: row.bomNo || "",
        productName: row.productCategory || "",
        productModelName: row.specificationModel || "",
        orderId: row.id,
        type: "order",
      },
    });
};

// 导出
@@ -431,17 +371,21 @@
      type: "warning",
   })
      .then(() => {
         proxy.download("/productionOrder/export", {}, "生产订单.xlsx");
        proxy.download("/productOrder/export", {...searchForm.value}, "生产订单.xlsx");
      })
      .catch(() => {
         proxy.$modal.msg("已取消");
      });
};

  const handleConfirmRoute = () => {};

onMounted(() => {
   getList();
   getProductOptions();
});
</script>

<style scoped lang="scss"></style>
<style scoped lang="scss">
.search_form{
  align-items: start;
}</style>