huminmin
10 小时以前 3b28a3183baf6c4d864405dcfd5d8e7a52a3f046
生产管控相关页面增加图纸编号
已修改13个文件
73 ■■■■■ 文件已修改
src/views/basicData/product/ProductSelectDialog.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/processRoute/ItemsForm.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/processRoute/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/processRoute/processRouteItem/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productStructure/Detail/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productStructure/StructureEdit.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productStructure/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionCosting/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/New.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionReporting/Input.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionReporting/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/workOrder/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/ProductSelectDialog.vue
@@ -21,6 +21,7 @@
      <el-table-column type="selection" width="55" />
      <el-table-column type="index" label="序号" width="60" />
      <el-table-column prop="productName" label="产品大类" min-width="160" />
      <el-table-column prop="drawingNumber" label="图纸编号" min-width="160" />
      <el-table-column prop="model" label="型号名称" min-width="200" />
      <el-table-column prop="unit" label="单位" min-width="160" />
    </el-table>
src/views/productionManagement/processRoute/ItemsForm.vue
@@ -190,6 +190,7 @@
const tableColumn = ref([
  { label: "产品名称", prop: "productName", width: 180 },
  { label: "产品图纸编号", prop: "drawingNumber", width: 150 },
  { label: "规格名称", prop: "model", width: 150 },
  { label: "单位", prop: "unit", width: 80 },
  { label: "工序名称", prop: "processId", width: 180 },
src/views/productionManagement/processRoute/index.vue
@@ -76,6 +76,10 @@
    prop: "productName",
  },
  {
    label: "产品图纸编号",
    prop: "drawingNumber",
  },
  {
    label: "规格名称",
    prop: "model",
  },
@@ -172,6 +176,7 @@
    query: {
      id: row.id,
      processRouteCode: row.processRouteCode || '',
      drawingNumber: row.drawingNumber || "",
      productName: row.productName || '',
      model: row.model || '',
      bomNo: row.bomNo || '',
src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -23,6 +23,14 @@
        </div>
        <div class="info-item">
          <div class="info-label-wrapper">
            <span class="info-label">产品图纸编号</span>
          </div>
          <div class="info-value-wrapper">
            <span class="info-value">{{ routeInfo.drawingNumber || '-' }}</span>
          </div>
        </div>
        <div class="info-item">
          <div class="info-label-wrapper">
            <span class="info-label">规格名称</span>
          </div>
          <div class="info-value-wrapper">
@@ -80,6 +88,7 @@
        </template>
      </el-table-column>
      <el-table-column label="产品名称" prop="productName" min-width="160" />
      <el-table-column label="图纸编号" prop="drawingNumber" min-width="160" />
      <el-table-column label="规格名称" prop="model" min-width="140" />
      <el-table-column label="单位" prop="unit" width="100" />
      <el-table-column label="是否质检" prop="isQuality" width="100">
@@ -131,6 +140,7 @@
          <div class="card-content">
            <div v-if="item.productName" class="product-info">
              <div class="product-name">{{ item.productName }}</div>
              <div class="product-model">{{ item.drawingNumber || '-' }}</div>
              <div v-if="item.model" class="product-model">
                {{ item.model }}
                <!-- <span v-if="item.unit" class="product-unit">{{ item.unit }}</span> -->
@@ -245,6 +255,7 @@
const routeInfo = ref({
  processRouteCode: '',
  productName: '',
  drawingNumber: '',
  model: '',
  bomNo: '',
  description: ''
@@ -299,6 +310,7 @@
    .then(res => {
      tableData.value = res.data || [];
      tableLoading.value = false;
      routeInfo.value = tableData.value[0] || {}
      // 列表加载完成后初始化拖拽排序
      nextTick(() => {
        initSortable();
@@ -327,6 +339,7 @@
  routeInfo.value = {
    processRouteCode: route.query.processRouteCode || '',
    productName: route.query.productName || '',
    drawingNumber: route.query.drawingNumber || '',
    model: route.query.model || '',
    bomNo: route.query.bomNo || '',
    description: route.query.description || ''
src/views/productionManagement/productStructure/Detail/index.vue
@@ -34,6 +34,8 @@
                      style="width: 100%">
              <el-table-column prop="productName"
                               label="产品" />
              <el-table-column prop="drawingNumber"
                               label="产品图纸编号" />
              <el-table-column prop="model"
                               label="规格">
                <template #default="{ row, $index }">
@@ -143,6 +145,8 @@
                       prop="bomNo" />
      <el-table-column label="产品名称"
                       prop="productName" />
      <el-table-column label="产品图纸编号"
                       prop="drawingNumber" />
      <el-table-column label="规格型号"
                       prop="model" />
    </el-table>
@@ -192,6 +196,7 @@
  // 从路由参数获取产品信息
  const routeBomNo = computed(() => route.query.bomNo || "");
  const routeProductName = computed(() => route.query.productName || "");
  const routeDrawingNumber = computed(() => route.query.drawingNumber || "");
  const routeProductModelName = computed(
    () => route.query.productModelName || ""
  );
@@ -215,6 +220,7 @@
  const tableData = reactive([
    {
      productName: "",
      drawingNumber: "",
      model: "",
      bomNo: "",
    },
@@ -293,6 +299,7 @@
    dataValue.dataList.map(item => {
      if (item.tempId === dataValue.currentRowName) {
        item.productName = productData.productName;
        item.drawingNumber = productData.drawingNumber || "";
        item.model = productData.model;
        item.productModelId = productData.id;
        item.unit = productData.unit || "";
@@ -305,6 +312,7 @@
  const childItem = (item: any, tempId: any, productData: any) => {
    if (item.tempId === tempId) {
      item.productName = productData.productName;
      item.drawingNumber = productData.drawingNumber || "";
      item.model = productData.model;
      item.productModelId = productData.id;
      item.unit = productData.unit || "";
@@ -506,6 +514,7 @@
  onMounted(async () => {
    // 从路由参数回显数据
    tableData[0].productName = routeProductName.value as string;
    tableData[0].drawingNumber = routeDrawingNumber.value as string;
    tableData[0].model = routeProductModelName.value as string;
    tableData[0].bomNo = routeBomNo.value as string;
src/views/productionManagement/productStructure/StructureEdit.vue
@@ -35,6 +35,9 @@
              <el-table-column prop="productName"
                               label="产品"
                               width="150" />
              <el-table-column prop="drawingNumber"
                               label="图纸编号"
                               width="150" />
              <el-table-column prop="model"
                               label="规格"
                               width="150">
src/views/productionManagement/productStructure/index.vue
@@ -78,6 +78,11 @@
    minWidth: 160
  },
  {
    label: "产品图纸编号",
    prop: "drawingNumber",
    minWidth: 160
  },
  {
    label: "规格型号",
    prop: "productModelName",
    minWidth: 140
@@ -420,6 +425,7 @@
    path: '/productionManagement/productStructureDetail',
    query: {
      id: row.id,
      drawingNumber: row.drawingNumber || "",
      bomNo: row.bomNo || '',
      productName: row.productName || '',
      productModelName: row.productModelName || ''
src/views/productionManagement/productionCosting/index.vue
@@ -97,6 +97,11 @@
        prop: "productName",
    minWidth: 100,
    },
    {
        label: "产品图纸编号",
        prop: "drawingNumber",
    minWidth: 100,
    },
    {
        label: "规格型号",
        prop: "productModelName",
src/views/productionManagement/productionOrder/New.vue
@@ -24,6 +24,13 @@
        </el-form-item>
        <el-form-item
            label="图纸编号"
            prop="drawingNumber"
        >
          <el-input v-model="formState.drawingNumber"  disabled />
        </el-form-item>
        <el-form-item
            label="规格"
            prop="productModelName"
        >
@@ -101,6 +108,7 @@
  productName: "",
  productModelName: "",
  unit: "",
  drawingNumber: "",
  quantity: 0,
});
@@ -124,6 +132,7 @@
    productModelId: undefined,
    routeId: undefined,
    productName: "",
    drawingNumber: "",
    productModelName: "",
    quantity: '',
  };
@@ -136,6 +145,7 @@
    const product = products[0];
    formState.value.productId = product.productId;
    formState.value.productName = product.productName;
    formState.value.drawingNumber = product.drawingNumber;
    formState.value.productModelName = product.model;
    formState.value.productModelId = product.id;
    formState.value.unit = product.unit;
src/views/productionManagement/productionOrder/index.vue
@@ -140,6 +140,11 @@
      width: '120px',
    },
    {
      label: "图纸编号",
      prop: "drawingNumber",
      width: '160px',
    },
    {
      label: "规格",
      prop: "specificationModel",
      width: '120px',
@@ -374,6 +379,7 @@
          id: data.id,
          processRouteCode: data.processRouteCode || "",
          productName: data.productName || "",
          drawingNumber: data.drawingNumber || "",
          model: data.model || "",
          bomNo: data.bomNo || "",
          description: data.description || "",
@@ -393,6 +399,7 @@
      query: {
        id: row.id,
        bomNo: row.bomNo || "",
        drawingNumber: row.drawingNumber || "",
        productName: row.productCategory || "",
        productModelName: row.specificationModel || "",
        orderId: row.id,
src/views/productionManagement/productionReporting/Input.vue
@@ -63,6 +63,10 @@
    prop: 'productName',
  },
  {
    label: '投入产品图纸编号',
    prop: 'drawingNumber',
  },
  {
    label: '投入产品型号',
    prop: 'model',
  },
src/views/productionManagement/productionReporting/index.vue
@@ -178,6 +178,11 @@
      width: 120,
    },
    {
      label: "产品图纸编号",
      prop: "drawingNumber",
      width: 160,
    },
    {
      label: "产品规格型号",
      prop: "productModelName",
      width: 120,
src/views/productionManagement/workOrder/index.vue
@@ -251,6 +251,10 @@
      width: "140",
    },
    {
      label: "图纸编号",
      prop: "drawingNumber",
    },
    {
      label: "规格",
      prop: "model",
    },