gaoluyang
2025-11-26 a0bee2b2dc61a4c4ca860fcbb34f7848b30fef99
1.湟水峡-生产派单逻辑修改联调
已修改3个文件
38 ■■■■ 文件已修改
src/views/productionManagement/productionDispatching/components/formDia.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionDispatching/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionDispatching/components/formDia.vue
@@ -8,31 +8,29 @@
    >
      <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="projectName">
              <el-input v-model="form.projectName" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
<!--          <el-col :span="12">-->
<!--            <el-form-item label="项目名称:" prop="projectName">-->
<!--              <el-input v-model="form.projectName" placeholder="请输入" clearable disabled/>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
          <el-col :span="12">
            <el-form-item label="产品大类:" prop="productCategory">
              <el-input v-model="form.productCategory" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
                    <el-col :span="12">
                        <el-form-item label="总数量:" prop="quantity">
                            <el-input v-model="form.quantity" placeholder="请输入" clearable disabled/>
                        </el-form-item>
                    </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="总数量:" prop="quantity">
              <el-input v-model="form.quantity" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
                        <el-form-item label="待排产数量:" prop="pendingQuantity">
                            <el-input v-model="form.pendingQuantity" placeholder="请输入" clearable disabled/>
                        </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
                    <el-col :span="12">
                        <el-form-item label="本次排产数量:" prop="schedulingNum">
                            <el-input-number
                                v-model="form.schedulingNum"
@@ -45,7 +43,7 @@
                                style="width: 100%"
                            />
                        </el-form-item>
          </el-col>
                    </el-col>
        </el-row>
        <el-row :gutter="30">
                    <el-col :span="12">
@@ -145,6 +143,7 @@
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
            form.value.salesLedgerProductId = form.value.id
            productionDispatch(form.value).then(res => {
                proxy.$modal.msgSuccess("提交成功");
                closeDia();
src/views/productionManagement/productionDispatching/index.vue
@@ -50,7 +50,6 @@
<script setup>
import {onMounted, ref} from "vue";
import FormDia from "@/views/productionManagement/productionDispatching/components/formDia.vue";
import dayjs from "dayjs";
import {schedulingListPage} from "@/api/productionManagement/productionOrder.js";
import { ElMessageBox } from "element-plus";
@@ -80,7 +79,7 @@
    },
    {
        label: "录入日期",
        prop: "entryDate",
        prop: "registerDate",
    },
    {
        label: "数量",
@@ -135,11 +134,11 @@
    schedulingListPage(params).then((res) => {
        tableLoading.value = false;
        // 处理每条数据,增加pendingQuantity字段
        tableData.value = res.data.records.map(item => ({
        tableData.value = res.data.data.records.map(item => ({
            ...item,
            pendingQuantity: (Number(item.quantity) || 0) - (Number(item.schedulingNum) || 0)
        }));
        page.total = res.data.total;
        page.total = res.data.data.total;
    }).catch(() => {
        tableLoading.value = false;
    })
@@ -172,7 +171,7 @@
        type: "warning",
    })
        .then(() => {
            proxy.download("/salesLedger/scheduling/exportOne", {}, "生产派工.xlsx");
            proxy.download("/productionOrder/exportOne", {}, "生产派工.xlsx");
        })
        .catch(() => {
            proxy.$modal.msg("已取消");
src/views/productionManagement/productionOrder/index.vue
@@ -431,7 +431,7 @@
        type: "warning",
    })
        .then(() => {
            proxy.download("/salesLedger/scheduling/export", {}, "生产订单.xlsx");
            proxy.download("/productionOrder/export", {}, "生产订单.xlsx");
        })
        .catch(() => {
            proxy.$modal.msg("已取消");