README.md

@@ -31,6 +31,9 @@
# å¯åŠ¨æœåŠ¡

yarn dev



#打包命令

yarn build:prod -- --company="JCCK"



# æž„建测试环境 yarn build:stage

# æž„建生产环境 yarn build:prod

# æž„建生产环境 yarn build:prod -- --company="AAA"


 src/api/productionManagement/productionOrder.js

@@ -145,4 +145,29 @@
    method: "patch",
    data: data,
  });
}

//根据订单的bomId查询库存原材料
export function getByBomId(query) {
  return request({
    url: "/productOrder/getByBomId",
    method: "get",
    params: query,
  });
}

//保存生产订单领料
export function drawMaterials(data) {
  return request({
    url: "/productOrder/drawMaterials",
    method: "post",
    data: data,
  });
}

export function getProductOrderBatchNoOptions() {
  return request({
    url: "/productOrder/getProductOrderBatchNo",
    method: "get",
  });
}

 src/api/salesManagement/salesLedger.js

@@ -116,4 +116,14 @@
        method: "get",
        params: query,
    });
}

// å¯¼å‡º
export function saleOutboundExport(query) {
  return request({
    url: '/sales/ledger/exportSaleOutbound',
    method: 'post',
    data: query,
    responseType: 'blob'
  })
}

 src/utils/request.js

@@ -72,7 +72,24 @@
})



// å“åº”拦截器

service.interceptors.response.use(res => {

service.interceptors.response.use(async res => {

      const isBlob = res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'



      if (isBlob) {

        const contentType = res.headers['content-type']



        if (contentType && contentType.includes('application/json')) {

          const text = await new Response(res.data).text()

          const data = JSON.parse(text)



          const msg = data.msg || '导出失败'

          ElMessage.error(msg)



          return Promise.reject(new Error(msg))

        }



        return res.data

      }

    // æœªè®¾ç½®çŠ¶æ€ç åˆ™é»˜è®¤æˆåŠŸçŠ¶æ€

    const code = res.data.code || 200

    // èŽ·å–错误信息


 src/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,226 @@
<template>
  <el-dialog
    v-model="visible"
    title="领料"
    width="1000px"
    top="3vh"
    :close-on-click-modal="false"
    destroy-on-close
    class="material-requisition-dialog"
  >
    <div class="material-requisition-form">
      <!-- åŽŸææ–™åˆ—表 -->
      <el-table :data="materialList" border style="width: 100%" height="65vh">
        <el-table-column type="index" label="序号" width="60" align="center" />
        <el-table-column prop="productName" label="产品名称" min-width="150" />
        <el-table-column prop="model" label="型号" min-width="150" />
        <!-- <el-table-column prop="batchNo" label="批号" min-width="150">
          <template #default="{ row }">
            <el-select
              v-model="row.batchNo"
              placeholder="请选择批号"
              clearable
              style="width: 100%"
            >
              <el-option
                v-for="item in row.batchOptions || []"
                :key="item.batchNo"
                :label="item.batchNo"
                :value="item.batchNo"
              />
            </el-select>
          </template>
        </el-table-column> -->
        <el-table-column prop="unit" label="单位" width="80" align="center" />
        <el-table-column prop="qualitity" label="数量" width="100" align="center">
          <template #default="{ row }">
            {{ row.qualitity || 0 }}
          </template>
        </el-table-column>
        <el-table-column prop="requisitionQty" label="领用数量" width="120" align="center">
          <template #default="{ row }">
            <el-input-number
              v-model="row.requisitionQty"
              :min="0"
              :precision="2"
              :controls="false"
              :disabled="!row.qualitity || hasDrawMaterials"
              style="width: 100%"
            />
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="备注" min-width="150">
        </el-table-column>
      </el-table>
    </div>

    <template #footer>
      <span class="dialog-footer">
        <el-button type="primary" :loading="saving" @click="handleConfirm">ç¡® è®¤</el-button>
        <el-button @click="handleCancel">取 æ¶ˆ</el-button>
      </span>
    </template>
  </el-dialog>
</template>

<script setup>
import { ref, reactive, computed, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { getByBomId, drawMaterials } from '@/api/productionManagement/productionOrder.js';

const props = defineProps({
  modelValue: {
    type: Boolean,
    default: false
  },
  orderData: {
    type: Object,
    default: () => ({})
  }
});

const emit = defineEmits(['update:modelValue', 'confirm']);

const visible = computed({
  get: () => props.modelValue,
  set: (val) => emit('update:modelValue', val)
});

const loading = ref(false);
const saving = ref(false);
const materialList = ref([]);
const hasDrawMaterials = ref(false);

// ç›‘听弹框打开，加载数据
watch(() => props.modelValue, (val) => {
  if (val && props.orderData) {
    loadMaterialList();
  }
});

const loadMaterialList = async () => {
  const order = props.orderData;
  const drawMaterialsData = order.drawMaterials;

  // å¦‚果已有领料数据，直接使用
  if (drawMaterialsData) {
    hasDrawMaterials.value = true;
    try {
      const list = typeof drawMaterialsData === 'string'
        ? JSON.parse(drawMaterialsData)
        : drawMaterialsData;
      materialList.value = list.map(item => ({
        ...item,
        requisitionQty: item.requisitionQty || 0
      }));
      return;
    } catch (e) {
      console.error('解析领料数据失败:', e);
    }
  }

  // æ²¡æœ‰é¢†æ–™æ•°æ®ï¼Œè°ƒç”¨æŽ¥å£æŸ¥è¯¢
  hasDrawMaterials.value = false;
  const bomId = order?.bomId;
  if (!bomId) {
    ElMessage.warning('当前订单缺少BOM信息');
    return;
  }

  loading.value = true;
  try {
    const res = await getByBomId({ bomId });
    const data = res.data || [];
    // å¤„理数据，添加领用数量字段和批号选项
    materialList.value = data.map(item => ({
      ...item,
      requisitionQty: item.qualitity ? 0 : 0,
      batchNo: item.batchNo || '',
      remark: item.remark || '',
      // æ‰¹å·é€‰é¡¹ï¼Œä»Žåº“存原材料信息中获取
      batchOptions: item.inventoryList || []
    }));
  } catch (error) {
    console.error('查询原材料列表失败:', error);
    ElMessage.error('查询原材料列表失败');
    materialList.value = [];
  } finally {
    loading.value = false;
  }
};

const handleCancel = () => {
  visible.value = false;
  materialList.value = [];
  hasDrawMaterials.value = false;
};

const handleConfirm = async () => {
  const orderId = props.orderData?.id;
  if (!orderId) {
    ElMessage.error('订单ID不存在');
    return;
  }

  const drawMaterialsList = materialList.value.map(item => ({
    ...item,
    requisitionQty: item.requisitionQty || 0
  }));

  const postData = {
    id: orderId,
    drawMaterials: JSON.stringify(drawMaterialsList)
  };

  saving.value = true;
  try {
    await drawMaterials(postData);
    ElMessage.success('领料保存成功');
    visible.value = false;
    materialList.value = [];
    hasDrawMaterials.value = false;
  } catch (error) {
    console.error('保存领料失败:', error);
    ElMessage.error('保存领料失败');
  } finally {
    saving.value = false;
  }
};
</script>

<style scoped lang="scss">
.material-requisition-form {
  .el-table {
    margin-top: 10px;
  }
}

.dialog-footer {
  display: flex;
  justify-content: flex-end;
  gap: 10px;
}

:deep(.el-dialog) {
  height: 85vh;
  margin-top: 3vh !important;
  display: flex;
  flex-direction: column;
}

:deep(.el-dialog__body) {
  flex: 1;
  overflow-y: auto;
  padding: 15px 20px;
}

:deep(.el-dialog__header) {
  padding: 15px 20px;
  border-bottom: 1px solid #e4e7ed;
}

:deep(.el-dialog__footer) {
  padding: 15px 20px;
  border-top: 1px solid #e4e7ed;
}
</style>

 src/views/productionManagement/productionOrder/index.vue

@@ -102,6 +102,12 @@
      :order-data="currentOrderData"
      @save="handleSaveClearanceRecord"
    />

    <!-- é¢†æ–™å¼¹æ¡† -->
    <material-requisition-dialog
      v-model="materialRequisitionVisible"
      :order-data="currentOrderData"
    />
  </div>
</template>

@@ -123,6 +129,7 @@

const NewProductOrder = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/New.vue"));
const ClearanceRecordDialog = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/ClearanceRecordDialog.vue"));
const MaterialRequisitionDialog = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue"));

const {proxy} = getCurrentInstance();

@@ -244,6 +251,14 @@
          handleClearanceRecord(row);
        },
      },
      {
        name: "领料",
        type: "text",
        showHide: row => !row.isEnd,
        clickFun: row => {
          handleMaterialRequisition(row);
        },
      },
    ],
  },
]);
@@ -310,6 +325,9 @@
// æ¸…场记录弹框
const clearanceDialogVisible = ref(false);
const currentOrderData = ref({});

// é¢†æ–™å¼¹æ¡†
const materialRequisitionVisible = ref(false);
const bindForm = reactive({
  orderId: null,
  routeId: null,
@@ -525,6 +543,13 @@
    proxy.$modal.msgError("清场记录保存失败");
  }
};

// æ‰“开领料弹框
const handleMaterialRequisition = (row) => {
  currentOrderData.value = row;
  materialRequisitionVisible.value = true;
};

onMounted(() => {
  getList();
});

 src/views/salesManagement/salesLedger/index.vue

@@ -46,6 +46,7 @@
              <el-table-column align="center" label="序号" type="index"/>
              <el-table-column label="产品大类" prop="productCategory" />
              <el-table-column label="规格型号" prop="specificationModel" />
              <el-table-column label="批号" prop="batchNo" />
              <el-table-column label="单位" prop="unit" />
                            <el-table-column label="产品状态"
                                                             width="100px"
@@ -124,6 +125,7 @@
            <el-button link type="primary" size="small" @click="openForm('edit', scope.row)" :disabled="!scope.row.isEdit">编辑</el-button>
<!--            <el-button link type="primary" size="small" @click="openForm('view', scope.row)">详情</el-button>-->
            <el-button link type="primary" size="small" @click="downLoadFile(scope.row)">附件</el-button>
            <el-button link type="primary" size="small" @click="exportSaleOutbound(scope.row)">打印销售出库单</el-button>
<!--            <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">发货</el-button>-->
          </template>
        </el-table-column>
@@ -228,6 +230,7 @@
                    <el-table-column label="产品大类" prop="productCategory" />
                    <el-table-column label="规格型号" prop="specificationModel" />
                    <el-table-column label="UID码" prop="uidNo" />
                    <el-table-column label="批号" prop="batchNo" />
                    <el-table-column label="单位" prop="unit" />
                    <el-table-column label="数量" prop="quantity" />
                    <el-table-column label="税率(%)" prop="taxRate" />
@@ -362,6 +365,15 @@
                        </el-form-item>
                    </el-col>
                </el-row>
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="批号：" prop="batchNo">
              <el-select v-model="productForm.batchNo" placeholder="请选择" clearable filterable>
                <el-option v-for="item in batchNoOptions" :key="item.value" :label="item.label" :value="item.value" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
                <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="单位：" prop="unit">
@@ -667,20 +679,22 @@
import FormDialog from '@/components/Dialog/FormDialog.vue';
import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
import {
    ledgerListPage,
    productList,
    customerList,
    addOrUpdateSalesLedger,
    getSalesLedgerWithProducts,
    delLedger,
    addOrUpdateSalesLedgerProduct,
    delProduct,
    delLedgerFile, getProductInventory,
  ledgerListPage,
  productList,
  customerList,
  addOrUpdateSalesLedger,
  getSalesLedgerWithProducts,
  delLedger,
  addOrUpdateSalesLedgerProduct,
  delProduct,
  delLedgerFile, getProductInventory, saleOutboundExport,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
import dayjs from "dayjs";
import { getCurrentDate } from "@/utils/index.js";
import {getProductOrderBatchNoOptions} from "@/api/productionManagement/productionOrder.js";
import {safeTrainingExport} from "@/api/safeProduction/safetyTrainingAssessment.js";

const userStore = useUserStore();
const { proxy } = getCurrentInstance();
@@ -748,10 +762,12 @@
        taxInclusiveTotalPrice: "",
        taxExclusiveTotalPrice: "",
        invoiceType: "",
    batchNo: "",
    },
    productRules: {
        productCategory: [{ required: true, message: "请选择", trigger: "change" }],
        productModelId: [{ required: true, message: "请选择", trigger: "change" }],
    batchNo: [{ required: true, message: "请选择", trigger: "change" }],
        specificationModel: [
            { required: true, message: "请选择", trigger: "change" },
        ],
@@ -1245,6 +1261,12 @@
            });
        }
    });
};

const batchNoOptions = ref([]);
const fetchBatchNoOptions = async () => {
    const res = await getProductOrderBatchNoOptions();
    batchNoOptions.value = res.data;
};
// å…³é—­å¼¹æ¡†
const closeDia = () => {
@@ -2183,8 +2205,41 @@
    let res = await userStore.getInfo();
    currentFactoryName.value = res.user.currentFactoryName;
};

const exportSaleOutbound = row => {
  saleOutboundExport({id: row.id})
      .then(res => {
        // åˆ›å»ºBlob对象
        const blob = new Blob([res], {
          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
        });
        // åˆ›å»ºä¸‹è½½é“¾æŽ¥
        const url = window.URL.createObjectURL(blob);
        const link = document.createElement("a");
        link.href = url;
        link.download = `销售出库单.docx`;

        // æ¨¡æ‹Ÿç‚¹å‡»ä¸‹è½½
        document.body.appendChild(link);
        link.click();

        // æ¸…理临时对象
        setTimeout(() => {
          document.body.removeChild(link);
          window.URL.revokeObjectURL(url);
        }, 100);

        ElMessage.success("导出成功");
      })
      .catch(err => {
        console.error("导出失败:", err);
        ElMessage.error("导出失败，请重试");
      });
};

onMounted(() => {
    getList();
  fetchBatchNoOptions();
    userListNoPage().then(res => {
        userList.value = res.data;
    })