spring
10 天以前 6e0b58813ae5a88526d30597b931eab9de5e015b
fix: 合并pro代码
已修改11个文件
1136 ■■■■■ 文件已修改
src/api/login.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/viewIndex.js 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/user.js 236 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/index.vue 592 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/processRoute/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/processRoute/processRouteItem/index.vue 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productStructure/Detail/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/login.js
@@ -1,4 +1,5 @@
import request from '@/utils/request'
import request from '@/utils/request'
import { getToken } from '@/utils/auth'
// 登录方法
export function login(username, password, code, uuid) {
@@ -32,12 +33,14 @@
}
// 获取用户详细信息
export function getInfo() {
  return request({
    url: '/getInfo',
    method: 'get'
  })
}
export function getInfo() {
  const token = getToken()
  return request({
    url: '/getInfo',
    headers: token ? { Authorization: `Bearer ${token}` } : {},
    method: 'get'
  })
}
// 退出方法
export function logout() {
src/api/viewIndex.js
@@ -326,3 +326,59 @@
    method: "get",
  });
};
export const productionOverview = () => {
  return request({
    url: "/home/productionOverview",
    method: "get",
    headers: {
      handleAuthError: false,
    },
  });
};
export const productionRealtimeBoard = () => {
  return request({
    url: "/home/productionRealtimeBoard",
    method: "get",
    headers: {
      handleAuthError: false,
    },
  });
};
export const productionOrderProgress = (params = {}) => {
  const safePageNum = Math.max(1, Number(params.pageNum || 1));
  const safePageSize = Math.min(50, Math.max(1, Number(params.pageSize || 10)));
  const safeTab = ["all", "inProgress", "completed", "paused"].includes(params.tab)
    ? params.tab
    : "all";
  return request({
    url: "/home/productionOrderProgress",
    method: "get",
    params: {
      ...params,
      tab: safeTab,
      pageNum: safePageNum,
      pageSize: safePageSize,
    },
    headers: {
      handleAuthError: false,
    },
  });
};
export const todayProductionPlan = (params = {}) => {
  const safeLimit = Math.min(20, Math.max(1, Number(params.limit || 4)));
  return request({
    url: "/home/todayProductionPlan",
    method: "get",
    params: {
      ...params,
      limit: safeLimit,
    },
    headers: {
      handleAuthError: false,
    },
  });
};
src/router/index.js
@@ -125,13 +125,9 @@
    children: [
      {
        path: ":id",
        component: () =>
          import("@/views/projectManagement/Management/projectDetail.vue"),
        component: () => import("@/views/projectManagement/Management/projectDetail.vue"),
        name: "ProjectManagementDetail",
        meta: {
          title: "项目详情",
          activeMenu: "/projectManagement/Management",
        },
        meta: { title: "项目详情", activeMenu: "/projectManagement/Management" },
      },
    ],
  },
src/store/modules/user.js
@@ -1,12 +1,12 @@
import {login, logout, getInfo, loginCheck, loginCheckFactory,tideLogin} from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { isHttp, isEmpty } from "@/utils/validate"
import defAva from '@/assets/images/profile.jpg'
import { defineStore } from 'pinia'
const useUserStore = defineStore(
  'user',
  {
import {login, logout, getInfo, loginCheck, loginCheckFactory,tideLogin} from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { isHttp, isEmpty } from "@/utils/validate"
import defAva from '@/assets/images/profile.jpg'
import { defineStore } from 'pinia'
const useUserStore = defineStore(
  'user',
  {
    state: () => ({
      token: getToken(),
      id: '',
@@ -15,54 +15,60 @@
      roles: [],
      permissions: [],
      aiEnabled: 0
    }),
    actions: {
      // 登录
      login(userInfo) {
        const username = userInfo.username.trim()
        const password = userInfo.password
        const code = userInfo.code
        const uuid = userInfo.uuid
        return new Promise((resolve, reject) => {
          login(username, password, code, uuid).then(res => {
            setToken(res.token)
            this.token = res.token
            resolve()
          }).catch(error => {
            reject(error)
          })
        })
      },
      getCurrentTime() {
        const now = new Date();
        const year = now.getFullYear();       // 获取年份
        const month = String(now.getMonth() + 1).padStart(2, '0');  // 月份从0开始,要+1,并补零
        const day = String(now.getDate()).padStart(2, '0');         // 日期补零
        const hours = String(now.getHours()).padStart(2, '0');      // 小时补零
        const minutes = String(now.getMinutes()).padStart(2, '0');  // 分钟补零
        const seconds = String(now.getSeconds()).padStart(2, '0');  // 秒数补零
        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
      },
      // 获取用户信息
      getInfo() {
        return new Promise((resolve, reject) => {
          getInfo().then(res => {
            const user = res.user
            let avatar = user.avatar || ""
            avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar
            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
              this.roles = res.roles
              this.permissions = res.permissions
            } else {
              this.roles = ['ROLE_DEFAULT']
            }
            this.id = user.userId
            this.name = user.userName
            this.avatar = avatar
            this.currentFactoryName = user.currentFactoryName
            this.nickName = user.nickName
            this.roleName = user.roles[0].roleName
            this.currentDeptId = user.tenantId
    }),
    actions: {
      // 登录
      login(userInfo) {
        const username = userInfo.username.trim()
        const password = userInfo.password
        const code = userInfo.code
        const uuid = userInfo.uuid
        return new Promise((resolve, reject) => {
          login(username, password, code, uuid).then(res => {
            const token = res?.token || res?.data?.token
            if (!token) {
              reject(new Error('未获取到登录令牌'))
              return
            }
            setToken(token)
            this.token = token
            resolve()
          }).catch(error => {
            reject(error)
          })
        })
      },
      getCurrentTime() {
        const now = new Date();
        const year = now.getFullYear();       // 获取年份
        const month = String(now.getMonth() + 1).padStart(2, '0');  // 月份从0开始,要+1,并补零
        const day = String(now.getDate()).padStart(2, '0');         // 日期补零
        const hours = String(now.getHours()).padStart(2, '0');      // 小时补零
        const minutes = String(now.getMinutes()).padStart(2, '0');  // 分钟补零
        const seconds = String(now.getSeconds()).padStart(2, '0');  // 秒数补零
        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
      },
      // 获取用户信息
      getInfo() {
        return new Promise((resolve, reject) => {
          getInfo().then(res => {
            res  = res.data
            const user = res.user || {}
            let avatar = user.avatar || ""
            avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar
            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
              this.roles = res.roles
              this.permissions = res.permissions
            } else {
              this.roles = ['ROLE_DEFAULT']
            }
            this.id = user.userId || ''
            this.name = user.userName || ''
            this.avatar = avatar
            this.currentFactoryName = user.currentFactoryName || ''
            this.nickName = user.nickName || ''
            this.roleName = Array.isArray(user.roles) && user.roles.length > 0 ? (user.roles[0].roleName || '') : ''
            this.currentDeptId = user.tenantId || ''
            this.currentLoginTime = this.getCurrentTime()
            this.aiEnabled = Number(res.aiEnabled) === 1 ? 1 : 0
            resolve(res)
@@ -70,11 +76,11 @@
            reject(error)
          })
        })
      },
      // 退出系统
      logOut() {
        return new Promise((resolve, reject) => {
          logout(this.token).then(() => {
      },
      // 退出系统
      logOut() {
        return new Promise((resolve, reject) => {
          logout(this.token).then(() => {
            this.token = ''
            this.roles = []
            this.permissions = []
@@ -84,51 +90,61 @@
          }).catch(error => {
            reject(error)
          })
        })
      },
      // 登录校验
      loginCheck(userInfo) {
        const username = userInfo.username.trim()
        const password = userInfo.password
        return new Promise((resolve, reject) => {
          loginCheck(username, password).then(res => {
            resolve(res)
          }).catch(error => {
            reject(error)
          })
        })
      },
      // 部门登录
      loginCheckFactory(userInfo) {
        const username = userInfo.username.trim()
        const password = userInfo.password
        return new Promise((resolve, reject) => {
          loginCheckFactory(username, password).then(res => {
            setToken(res.token)
            this.token = res.token
            resolve()
          }).catch(error => {
            reject(error)
          })
        })
      },
      TideLogin(code) {
        return new Promise((resolve, reject) => {
          tideLogin(code)
              .then((res) => {
                setToken(res.token);
                this.token = res.token
                Vue.prototype.uploadHeader = {
                  Authorization: "Bearer " + res.token,
                };
                resolve();
              })
              .catch((error) => {
                reject(error);
              });
        });
      },
    }
  })
export default useUserStore
        })
      },
      // 登录校验
      loginCheck(userInfo) {
        const username = userInfo.username.trim()
        const password = userInfo.password
        return new Promise((resolve, reject) => {
          loginCheck(username, password).then(res => {
            resolve(res)
          }).catch(error => {
            reject(error)
          })
        })
      },
      // 部门登录
      loginCheckFactory(userInfo) {
        const username = userInfo.username.trim()
        const password = userInfo.password
        return new Promise((resolve, reject) => {
          loginCheckFactory(username, password).then(res => {
            const token = res?.token || res?.data?.token
            if (!token) {
              reject(new Error('未获取到登录令牌'))
              return
            }
            setToken(token)
            this.token = token
            resolve()
          }).catch(error => {
            reject(error)
          })
        })
      },
      TideLogin(code) {
        return new Promise((resolve, reject) => {
          tideLogin(code)
              .then((res) => {
                const token = res?.token || res?.data?.token
                if (!token) {
                  reject(new Error('未获取到登录令牌'))
                  return
                }
                setToken(token);
                this.token = token
                Vue.prototype.uploadHeader = {
                  Authorization: "Bearer " + token,
                };
                resolve();
              })
              .catch((error) => {
                reject(error);
              });
        });
      },
    }
  })
export default useUserStore
src/utils/request.js
@@ -21,11 +21,12 @@
})
// request拦截器
service.interceptors.request.use(config => {
service.interceptors.request.use(config => {
  config.headers = config.headers || {}
  // 是否需要设置 token
  const isToken = (config.headers || {}).isToken === false
  const isToken = config.headers.isToken === false
  // 是否需要防止数据重复提交
  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
  const isRepeatSubmit = config.headers.repeatSubmit === false
  if (getToken() && !isToken) {
    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
  }
@@ -66,23 +67,27 @@
    }
  }
  return config
}, error => {
    console.log(error)
    Promise.reject(error)
})
}, error => {
    console.log(error)
    return Promise.reject(error)
})
// 响应拦截器
service.interceptors.response.use(res => {
    // 未设置状态码则默认成功状态
    const code = res.data.code || 200
    const code = res.data.code || 200
    const handleAuthError = (res.config && res.config.headers && res.config.headers.handleAuthError) !== false
    // 获取错误信息
    const msg = errorCode[code] || res.data.msg || errorCode['default']
    // 二进制数据则直接返回
    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
      return res.data
    }
    if (code === 401) {
      if (!isRelogin.show) {
    if (code === 401) {
      if (!handleAuthError) {
        return Promise.reject(new Error(msg))
      }
      if (!isRelogin.show) {
        isRelogin.show = true
        ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
          isRelogin.show = false
src/views/index.vue
@@ -21,10 +21,10 @@
    <section v-if="dashboardCards.length > 0" class="top-row">
      <div class="stats-grid">
        <article
          v-for="card in dashboardCards"
          :key="card.key"
          class="stat-card"
          :class="card.key"
            v-for="card in dashboardCards"
            :key="card.key"
            class="stat-card"
            :class="card.key"
        >
          <div class="stat-header">
            <div class="stat-title-wrap">
@@ -66,15 +66,15 @@
          <div class="process-body">
            <div class="process-chart" :class="{ empty: !hasProcessData }">
              <Echarts
                :options="chartBaseOptions"
                :chartStyle="{ width: '100%', height: '100%' }"
                :grid="processGrid"
                :series="processSeries"
                :tooltip="processTooltip"
                :xAxis="processXAxis"
                :yAxis="processYAxis"
                :style="{ height: hasProcessData ? '340px' : '280px' }"
                @click="handleChartClick"
                  :options="chartBaseOptions"
                  :chartStyle="{ width: '100%', height: '100%' }"
                  :grid="processGrid"
                  :series="processSeries"
                  :tooltip="processTooltip"
                  :xAxis="processXAxis"
                  :yAxis="processYAxis"
                  :style="{ height: hasProcessData ? '340px' : '280px' }"
                  @click="handleChartClick"
              />
              <div v-if="!hasProcessData" class="chart-empty">
                <el-icon><DataAnalysis /></el-icon>
@@ -113,10 +113,10 @@
          <div class="panel-title-row">
            <div class="panel-title">生产订单进度</div>
            <el-radio-group v-model="orderFilter" size="small">
              <el-radio-button label="all">全部</el-radio-button>
              <el-radio-button label="in_progress">进行中</el-radio-button>
              <el-radio-button label="completed">已完成</el-radio-button>
              <el-radio-button label="paused">已暂停</el-radio-button>
              <el-radio-button label="all">全部({{ orderProgressMeta.total }})</el-radio-button>
              <el-radio-button label="inProgress">进行中({{ orderProgressMeta.inProgressCount }})</el-radio-button>
              <el-radio-button label="completed">已完成({{ orderProgressMeta.completedCount }})</el-radio-button>
              <el-radio-button label="paused">已暂停({{ orderProgressMeta.pausedCount }})</el-radio-button>
            </el-radio-group>
          </div>
          <el-table :data="filteredOrders" stripe>
@@ -128,10 +128,10 @@
              <template #default="{ row }">
                <div class="table-progress">
                  <el-progress
                    :stroke-width="8"
                    :percentage="row.completionRate"
                    :show-text="false"
                    status="success"
                      :stroke-width="8"
                      :percentage="row.completionRate"
                      :show-text="false"
                      status="success"
                  />
                  <span>{{ row.completionRate }}%</span>
                </div>
@@ -141,7 +141,7 @@
            <el-table-column label="状态" min-width="90">
              <template #default="{ row }">
                <el-tag :type="getOrderStatusType(row.status)" effect="light">
                  {{ getOrderStatusText(row.status) }}
                  {{ row.statusLabel || getOrderStatusText(row.status) }}
                </el-tag>
              </template>
            </el-table-column>
@@ -149,53 +149,53 @@
        </div>
        <div v-if="visiblePanels.contract" class="cockpit-panel contract-panel">
            <div class="panel-title">客户合同金额分析</div>
            <div class="contract-summary">
              <div class="contract-card">
                <div class="contract-name">总合同金额(元)</div>
                <div class="contract-main digital-number">{{ formatNumber(sum) }}</div>
                <div class="contract-compare">
                  同比
                  <span class="rise">{{ trendText(yny) }}</span>
                  环比
                  <span class="rise">{{ trendText(chain) }}</span>
                </div>
          <div class="panel-title">客户合同金额分析</div>
          <div class="contract-summary">
            <div class="contract-card">
              <div class="contract-name">总合同金额(元)</div>
              <div class="contract-main digital-number">{{ formatNumber(sum) }}</div>
              <div class="contract-compare">
                同比
                <span class="rise">{{ trendText(yny) }}</span>
                环比
                <span class="rise">{{ trendText(chain) }}</span>
              </div>
              <div class="contract-chart-wrap">
                <Echarts
            </div>
            <div class="contract-chart-wrap">
              <Echarts
                  :options="chartBaseOptions"
                  :legend="pieLegend"
                  :chartStyle="chartStylePie"
                  :series="materialPieSeries"
                  :tooltip="pieTooltip"
                />
              </div>
              />
            </div>
            <ul class="contract-list">
              <li v-for="item in materialPieSeries[0].data" :key="item.name">
                <span class="legend-dot" :style="{ backgroundColor: item.itemStyle?.color }"></span>
                <span class="contract-item-name">{{ item.name }}</span>
                <span class="contract-item-rate">{{ item.rate }}%</span>
                <span class="contract-item-value digital-number">¥{{ formatNumber(item.value) }}</span>
              </li>
            </ul>
          </div>
          <ul class="contract-list">
            <li v-for="item in materialPieSeries[0].data" :key="item.name">
              <span class="legend-dot" :style="{ backgroundColor: item.itemStyle?.color }"></span>
              <span class="contract-item-name">{{ item.name }}</span>
              <span class="contract-item-rate">{{ item.rate }}%</span>
              <span class="contract-item-value digital-number">¥{{ formatNumber(item.value) }}</span>
            </li>
          </ul>
        </div>
        <div v-if="visiblePanels.quality" class="cockpit-panel quality-panel">
            <div class="panel-title-row">
              <div class="panel-title">质量统计</div>
              <el-radio-group v-model="qualityRange" size="small" @change="qualityStatisticsInfo">
                <el-radio-button :value="1">周</el-radio-button>
                <el-radio-button :value="2">月</el-radio-button>
                <el-radio-button :value="3">季度</el-radio-button>
              </el-radio-group>
            </div>
            <div class="quality-cards">
              <div class="quality-card one">原材料已检数量 <span>{{ qualityStatisticsObject.supplierNum }}件</span></div>
              <div class="quality-card two">过程检验数量 <span>{{ qualityStatisticsObject.processNum }}件</span></div>
              <div class="quality-card three">出厂已检数量 <span>{{ qualityStatisticsObject.factoryNum }}件</span></div>
            </div>
            <Echarts
          <div class="panel-title-row">
            <div class="panel-title">质量统计</div>
            <el-radio-group v-model="qualityRange" size="small" @change="qualityStatisticsInfo">
              <el-radio-button :value="1">周</el-radio-button>
              <el-radio-button :value="2">月</el-radio-button>
              <el-radio-button :value="3">季度</el-radio-button>
            </el-radio-group>
          </div>
          <div class="quality-cards">
            <div class="quality-card one">原材料已检数量 <span>{{ qualityStatisticsObject.supplierNum }}件</span></div>
            <div class="quality-card two">过程检验数量 <span>{{ qualityStatisticsObject.processNum }}件</span></div>
            <div class="quality-card three">出厂已检数量 <span>{{ qualityStatisticsObject.factoryNum }}件</span></div>
          </div>
          <Echarts
              :options="chartBaseOptions"
              :chartStyle="chartStyle"
              :grid="grid"
@@ -205,8 +205,8 @@
              :xAxis="xAxis1"
              :yAxis="yAxis1"
              style="height: 270px"
            />
          </div>
          />
        </div>
      </div>
      <div v-if="hasRightPanels" class="right-column">
@@ -236,11 +236,11 @@
          <div class="realtime-grid">
            <div class="realtime-item" v-for="item in realtimeBoard" :key="item.key">
              <el-progress
                type="circle"
                :percentage="item.percent"
                :stroke-width="10"
                :width="94"
                :color="item.color"
                  type="circle"
                  :percentage="item.percent"
                  :stroke-width="10"
                  :width="94"
                  :color="item.color"
              >
                <template #default>
                  <div class="realtime-value digital-number">{{ item.display }}</div>
@@ -258,11 +258,11 @@
          </div>
          <div class="quick-grid">
            <button
              v-for="item in quickEntries"
              :key="item.label"
              class="quick-item"
              type="button"
              @click="goToQuick(item.path)"
                v-for="item in quickEntries"
                :key="item.label"
                class="quick-item"
                type="button"
                @click="goToQuick(item.path)"
            >
              <span class="quick-icon">
                <el-icon>
@@ -277,7 +277,7 @@
        <div v-if="visiblePanels.plan" class="cockpit-panel plan-panel">
          <div class="panel-title-row">
            <div class="panel-title">今日生产计划</div>
            <span class="panel-more">{{ todayPlanList.length }}项</span>
            <span class="panel-more">{{ todayPlanTotal }}项</span>
          </div>
          <ul class="plan-list">
            <li v-for="item in todayPlanList" :key="item.orderNo" class="plan-item">
@@ -296,15 +296,15 @@
        <div v-if="visiblePanels.receipt" class="cockpit-panel receipt-panel">
          <div class="panel-title">回款与开票分析</div>
          <Echarts
            :options="chartBaseOptions"
            :chartStyle="chartStyle"
            :grid="grid"
            :legend="lineLegend"
            :series="lineSeries"
            :tooltip="tooltipLine"
            :xAxis="xAxis2"
            :yAxis="yAxis2"
            style="height: 300px"
              :options="chartBaseOptions"
              :chartStyle="chartStyle"
              :grid="grid"
              :legend="lineLegend"
              :series="lineSeries"
              :tooltip="tooltipLine"
              :xAxis="xAxis2"
              :yAxis="yAxis2"
              style="height: 300px"
          />
        </div>
@@ -363,8 +363,12 @@
  getBusiness,
  homeTodos,
  processDataProductionStatistics,
  productionOrderProgress,
  productionOverview,
  productionRealtimeBoard,
  qualityInspectionStatistics,
  statisticsReceivablePayable,
  todayProductionPlan,
} from "@/api/viewIndex.js";
import { list } from "@/api/productionManagement/productionProcess";
@@ -391,7 +395,7 @@
});
const welcomeAvatar = computed(() =>
  welcomeAvatarLoadFailed.value || !userStore.avatar ? defaultWelcomeAvatar : userStore.avatar
    welcomeAvatarLoadFailed.value || !userStore.avatar ? defaultWelcomeAvatar : userStore.avatar
);
const handleWelcomeAvatarError = () => {
@@ -401,10 +405,10 @@
};
watch(
  () => userStore.avatar,
  () => {
    welcomeAvatarLoadFailed.value = false;
  }
    () => userStore.avatar,
    () => {
      welcomeAvatarLoadFailed.value = false;
    }
);
const axisTextColor = "#5f6f86";
@@ -436,6 +440,31 @@
  processNum: 0,
  factoryNum: 0,
});
const productionOverviewData = ref({
  totalOutput: 0,
  totalScrap: 0,
  yieldRate: 0,
});
const realtimeBoardData = ref({
  deviceOee: { value: 0, compareYesterday: 0 },
  orderAchievementRate: { value: 0, compareYesterday: 0 },
  defectRate: { value: 0, compareYesterday: 0 },
});
const orderProgressMeta = ref({
  tab: "all",
  total: 0,
  pageNum: 1,
  pageSize: 10,
  inProgressCount: 0,
  completedCount: 0,
  pausedCount: 0,
});
const todayPlanList = ref([]);
const todayPlanTotal = ref(0);
const sum = ref(0);
const yny = ref(0);
@@ -677,11 +706,11 @@
    const name = params?.[0]?.name ?? "";
    const list = Array.isArray(params) ? params : [];
    const lines = list
      .map((p) => {
        const colorBox = `<span style="display:inline-block;margin-right:6px;border-radius:2px;width:10px;height:10px;background:${p.color}"></span>`;
        return `${colorBox}${p.seriesName}<b style="float:right;">${Number(p.value || 0).toFixed(2)}</b>`;
      })
      .join("<br/>");
        .map((p) => {
          const colorBox = `<span style="display:inline-block;margin-right:6px;border-radius:2px;width:10px;height:10px;background:${p.color}"></span>`;
          return `${colorBox}${p.seriesName}<b style="float:right;">${Number(p.value || 0).toFixed(2)}</b>`;
        })
        .join("<br/>");
    return `<div style="min-width:140px;"><div style="font-weight:700;margin-bottom:6px;">${name}</div>${lines}</div>`;
  },
});
@@ -730,15 +759,15 @@
});
const processTotals = computed(() =>
  processChartData.value.reduce(
    (acc, cur) => {
      acc.input += Number(cur.input || 0);
      acc.scrap += Number(cur.scrap || 0);
      acc.output += Number(cur.output || 0);
      return acc;
    },
    { input: 0, scrap: 0, output: 0 }
  )
    processChartData.value.reduce(
        (acc, cur) => {
          acc.input += Number(cur.input || 0);
          acc.scrap += Number(cur.scrap || 0);
          acc.output += Number(cur.output || 0);
          return acc;
        },
        { input: 0, scrap: 0, output: 0 }
    )
);
const hasProcessData = computed(() => {
@@ -771,8 +800,8 @@
    subLabel: "待付款金额",
    subValue: formatNumber(businessInfo.value.monthPurchaseHaveMoney),
    trend: `占比 ${ratioText(
      businessInfo.value.monthPurchaseHaveMoney,
      businessInfo.value.monthPurchaseMoney
        businessInfo.value.monthPurchaseHaveMoney,
        businessInfo.value.monthPurchaseMoney
    )}`,
    icon: ShoppingCartFull,
    visible: visibleModules.value.procurement,
@@ -792,102 +821,68 @@
    key: "production",
    title: "生产总览",
    desc: "累计产出(件)",
    value: formatNumber(processTotals.value.output),
    value: formatNumber(productionOverviewData.value.totalOutput),
    subLabel: "累计报废",
    subValue: formatNumber(processTotals.value.scrap),
    trend: `良率 ${ratioText(processTotals.value.output, processTotals.value.input)}`,
    subValue: formatNumber(productionOverviewData.value.totalScrap),
    trend: `良率 ${Number(productionOverviewData.value.yieldRate || 0).toFixed(2)}%`,
    icon: Operation,
    visible: visibleModules.value.production,
  },
].filter((item) => item.visible));
const productionOrders = ref([
  {
    orderNo: "MO-20260518-001",
    productName: "智能控制器",
    planQty: 1000,
    completedQty: 860,
    completionRate: 86,
    deliveryDate: "2026-05-20",
    status: "in_progress",
  },
  {
    orderNo: "MO-20260518-002",
    productName: "电源模块",
    planQty: 800,
    completedQty: 640,
    completionRate: 80,
    deliveryDate: "2026-05-22",
    status: "in_progress",
  },
  {
    orderNo: "MO-20260518-003",
    productName: "传感器组件",
    planQty: 500,
    completedQty: 150,
    completionRate: 30,
    deliveryDate: "2026-05-25",
    status: "paused",
  },
  {
    orderNo: "MO-20260518-004",
    productName: "结构件A",
    planQty: 1200,
    completedQty: 1200,
    completionRate: 100,
    deliveryDate: "2026-05-15",
    status: "completed",
  },
]);
const productionOrders = ref([]);
const orderFilter = ref("all");
const filteredOrders = computed(() => {
  if (orderFilter.value === "all") return productionOrders.value;
  return productionOrders.value.filter((item) => item.status === orderFilter.value);
});
const filteredOrders = computed(() => productionOrders.value);
const todayPlanList = computed(() =>
  productionOrders.value
    .slice()
    .sort((a, b) => dayjs(a.deliveryDate).valueOf() - dayjs(b.deliveryDate).valueOf())
    .slice(0, 5)
);
const getCompareTrend = (value) => {
  const num = Number(value || 0);
  if (num > 0) return "up";
  if (num < 0) return "down";
  return "flat";
};
const avgCompletionRate = computed(() => {
  if (!productionOrders.value.length) return 0;
  const total = productionOrders.value.reduce((acc, cur) => acc + Number(cur.completionRate || 0), 0);
  return Number((total / productionOrders.value.length).toFixed(1));
});
const getCompareText = (value) => {
  const num = Number(value || 0);
  const abs = Math.abs(num).toFixed(2);
  if (num > 0) return `较昨日 ↑ ${abs}%`;
  if (num < 0) return `较昨日 ↓ ${abs}%`;
  return "较昨日 持平";
};
const realtimeBoard = computed(() => {
  const oee = ratioNumber(processTotals.value.output, processTotals.value.input);
  const defectRate = ratioNumber(processTotals.value.scrap, processTotals.value.input);
  const oee = Number(realtimeBoardData.value.deviceOee?.value || 0);
  const orderAchievement = Number(realtimeBoardData.value.orderAchievementRate?.value || 0);
  const defectRate = Number(realtimeBoardData.value.defectRate?.value || 0);
  const oeeCompare = Number(realtimeBoardData.value.deviceOee?.compareYesterday || 0);
  const orderCompare = Number(realtimeBoardData.value.orderAchievementRate?.compareYesterday || 0);
  const defectCompare = Number(realtimeBoardData.value.defectRate?.compareYesterday || 0);
  return [
    {
      key: "oee",
      label: "设备 OEE",
      percent: clampPercent(oee),
      display: `${oee.toFixed(1)}%`,
      delta: "较昨日 ↑ 4.0%",
      trend: "up",
      display: `${oee.toFixed(2)}%`,
      delta: getCompareText(oeeCompare),
      trend: getCompareTrend(oeeCompare),
      color: "#2d8cff",
    },
    {
      key: "order",
      label: "订单达成率",
      percent: clampPercent(avgCompletionRate.value),
      display: `${avgCompletionRate.value.toFixed(1)}%`,
      delta: "较昨日 ↑ 2.6%",
      trend: "up",
      percent: clampPercent(orderAchievement),
      display: `${orderAchievement.toFixed(2)}%`,
      delta: getCompareText(orderCompare),
      trend: getCompareTrend(orderCompare),
      color: "#31d2ff",
    },
    {
      key: "defect",
      label: "不良率",
      percent: clampPercent(defectRate),
      display: `${defectRate.toFixed(1)}%`,
      delta: "较昨日 ↓ 0.5%",
      trend: "down",
      display: `${defectRate.toFixed(2)}%`,
      delta: getCompareText(defectCompare),
      trend: getCompareTrend(defectCompare),
      color: "#f6a23f",
    },
  ];
@@ -930,11 +925,11 @@
const normalizeMenuTitle = (title) => String(title || "").replace(/\s+/g, "").trim();
const normalizeRoutePath = (path) =>
  String(path || "")
    .trim()
    .replace(/\/+/g, "/")
    .replace(/\/$/, "")
    .toLowerCase();
    String(path || "")
        .trim()
        .replace(/\/+/g, "/")
        .replace(/\/$/, "")
        .toLowerCase();
const resolveRoutePath = (route, parentPath = "") => {
  const currentPath = String(route?.path || "").trim();
@@ -966,11 +961,11 @@
const accessibleMenuRoutes = computed(() => {
  const routePool =
    permissionStore.defaultRoutes?.length > 0
      ? permissionStore.defaultRoutes
      : permissionStore.sidebarRouters?.length > 0
        ? permissionStore.sidebarRouters
        : permissionStore.routes;
      permissionStore.defaultRoutes?.length > 0
          ? permissionStore.defaultRoutes
          : permissionStore.sidebarRouters?.length > 0
              ? permissionStore.sidebarRouters
              : permissionStore.routes;
  return collectAccessibleRoutes(routePool || []);
});
@@ -1014,13 +1009,13 @@
};
const hasModuleAccess = (config) =>
  accessibleMenuRoutes.value.some((route) => {
    const matchedTitle = (config.titles || []).some((title) => route.title === normalizeMenuTitle(title));
    const matchedPath = (config.pathPrefixes || []).some(
      (prefix) => route.path === prefix || route.path.startsWith(`${prefix}/`)
    );
    return matchedTitle || matchedPath;
  });
    accessibleMenuRoutes.value.some((route) => {
      const matchedTitle = (config.titles || []).some((title) => route.title === normalizeMenuTitle(title));
      const matchedPath = (config.pathPrefixes || []).some(
          (prefix) => route.path === prefix || route.path.startsWith(`${prefix}/`)
      );
      return matchedTitle || matchedPath;
    });
const visibleModules = computed(() => ({
  sales: hasModuleAccess(moduleAccessConfig.sales),
@@ -1047,29 +1042,29 @@
}));
const hasLeftPanels = computed(
  () => visiblePanels.value.process || visiblePanels.value.order || visiblePanels.value.contract || visiblePanels.value.quality
    () => visiblePanels.value.process || visiblePanels.value.order || visiblePanels.value.contract || visiblePanels.value.quality
);
const hasRightPanels = computed(
  () => visiblePanels.value.todo || visiblePanels.value.realtime || visiblePanels.value.quick || visiblePanels.value.plan || visiblePanels.value.receipt
    () => visiblePanels.value.todo || visiblePanels.value.realtime || visiblePanels.value.quick || visiblePanels.value.plan || visiblePanels.value.receipt
);
const hasVisiblePanels = computed(() => hasLeftPanels.value || hasRightPanels.value);
const quickEntries = computed(() =>
  quickEntryConfigs
    .map((item) => {
      const targetRoute = accessibleMenuRoutes.value.find((route) =>
        item.titles.some((title) => route.title === normalizeMenuTitle(title))
      );
      const resolvedPath = targetRoute?.path || "";
      return resolvedPath
        ? {
            label: item.label,
            icon: item.icon,
            path: resolvedPath,
          }
        : null;
    })
    .filter(Boolean)
    quickEntryConfigs
        .map((item) => {
          const targetRoute = accessibleMenuRoutes.value.find((route) =>
              item.titles.some((title) => route.title === normalizeMenuTitle(title))
          );
          const resolvedPath = targetRoute?.path || "";
          return resolvedPath
              ? {
                label: item.label,
                icon: item.icon,
                path: resolvedPath,
              }
              : null;
        })
        .filter(Boolean)
);
const updateNowTime = () => {
@@ -1111,20 +1106,137 @@
const getOrderStatusText = (status) => {
  const mapping = {
    in_progress: "进行中",
    completed: "已完成",
    paused: "暂停",
    1: "待开始",
    2: "进行中",
    3: "已完成",
    4: "已暂停",
  };
  return mapping[status] || "未知";
};
const getOrderStatusType = (status) => {
  const mapping = {
    in_progress: "success",
    completed: "primary",
    paused: "warning",
    1: "info",
    2: "success",
    3: "primary",
    4: "warning",
  };
  return mapping[status] || "info";
};
const formatDueDate = (value) => {
  if (!value) return "--";
  const date = dayjs(value);
  return date.isValid() ? date.format("YYYY-MM-DD") : "--";
};
const mapOrderProgressRecord = (item = {}) => ({
  orderNo: item.orderNo || "--",
  productName: item.productName || "--",
  planQty: Number(item.plannedQuantity || 0),
  completedQty: Number(item.completedQuantity || 0),
  completionRate: clampPercent(Number(item.completionRate || 0)),
  deliveryDate: formatDueDate(item.dueDate),
  status: Number(item.status || 0),
  statusLabel: item.statusLabel || "",
});
const mapTodayPlanRecord = (item = {}) => ({
  orderNo: item.orderNo || "--",
  productName: item.productName || "--",
  planQty: Number(item.plannedQuantity || 0),
  deliveryDate: formatDueDate(item.dueDate),
  status: Number(item.status || 0),
  statusLabel: item.statusLabel || "",
});
const refreshProductionOverview = async () => {
  try {
    const res = await productionOverview();
    const data = res?.data || {};
    productionOverviewData.value = {
      totalOutput: Number(data.totalOutput || 0),
      totalScrap: Number(data.totalScrap || 0),
      yieldRate: Number(data.yieldRate || 0),
    };
  } catch {
    productionOverviewData.value = {
      totalOutput: 0,
      totalScrap: 0,
      yieldRate: 0,
    };
  }
};
const refreshProductionRealtimeBoard = async () => {
  try {
    const res = await productionRealtimeBoard();
    const data = res?.data || {};
    realtimeBoardData.value = {
      deviceOee: {
        value: Number(data.deviceOee?.value || 0),
        compareYesterday: Number(data.deviceOee?.compareYesterday || 0),
      },
      orderAchievementRate: {
        value: Number(data.orderAchievementRate?.value || 0),
        compareYesterday: Number(data.orderAchievementRate?.compareYesterday || 0),
      },
      defectRate: {
        value: Number(data.defectRate?.value || 0),
        compareYesterday: Number(data.defectRate?.compareYesterday || 0),
      },
    };
  } catch {
    realtimeBoardData.value = {
      deviceOee: { value: 0, compareYesterday: 0 },
      orderAchievementRate: { value: 0, compareYesterday: 0 },
      defectRate: { value: 0, compareYesterday: 0 },
    };
  }
};
const refreshProductionOrderProgress = async () => {
  try {
    const res = await productionOrderProgress({
      tab: orderFilter.value,
      pageNum: 1,
      pageSize: 10,
    });
    const data = res?.data || {};
    orderProgressMeta.value = {
      tab: data.tab || orderFilter.value,
      total: Number(data.total || 0),
      pageNum: Number(data.pageNum || 1),
      pageSize: Number(data.pageSize || 10),
      inProgressCount: Number(data.inProgressCount || 0),
      completedCount: Number(data.completedCount || 0),
      pausedCount: Number(data.pausedCount || 0),
    };
    productionOrders.value = (data.records || []).map(mapOrderProgressRecord);
  } catch {
    orderProgressMeta.value = {
      tab: orderFilter.value,
      total: 0,
      pageNum: 1,
      pageSize: 10,
      inProgressCount: 0,
      completedCount: 0,
      pausedCount: 0,
    };
    productionOrders.value = [];
  }
};
const refreshTodayProductionPlan = async () => {
  try {
    const res = await todayProductionPlan({ limit: 4 });
    const data = res?.data || {};
    todayPlanTotal.value = Number(data.total || 0);
    todayPlanList.value = (data.records || []).map(mapTodayPlanRecord);
  } catch {
    todayPlanTotal.value = 0;
    todayPlanList.value = [];
  }
};
const getBusinessData = async () => {
@@ -1238,11 +1350,20 @@
  router.push(path).catch(() => {});
};
watch(orderFilter, () => {
  if (visiblePanels.value.order) {
    refreshProductionOrderProgress();
  }
});
onMounted(() => {
  updateNowTime();
  clockTimer = setInterval(updateNowTime, 1000);
  if (dashboardCards.value.length > 0) {
    getBusinessData();
  }
  if (visibleModules.value.production) {
    refreshProductionOverview();
  }
  if (visiblePanels.value.contract) {
    analysisCustomer();
@@ -1260,6 +1381,15 @@
  if (visiblePanels.value.process) {
    getProcessList();
    refreshProcessStats();
  }
  if (visiblePanels.value.order) {
    refreshProductionOrderProgress();
  }
  if (visiblePanels.value.realtime) {
    refreshProductionRealtimeBoard();
  }
  if (visiblePanels.value.plan) {
    refreshTodayProductionPlan();
  }
});
@@ -1280,7 +1410,7 @@
  flex-direction: column;
  gap: 16px;
  overflow-x: clip;
    margin-top: 10px;
  margin-top: 10px;
}
.digital-number {
@@ -1305,8 +1435,8 @@
  min-height: 92px;
  padding: 18px 22px;
  background:
    radial-gradient(circle at 8% 20%, rgba(59, 130, 246, 0.12), transparent 32%),
    linear-gradient(135deg, rgba(255, 255, 255, 0.94), rgba(239, 246, 255, 0.88));
      radial-gradient(circle at 8% 20%, rgba(59, 130, 246, 0.12), transparent 32%),
      linear-gradient(135deg, rgba(255, 255, 255, 0.94), rgba(239, 246, 255, 0.88));
}
.welcome-user {
@@ -1522,7 +1652,7 @@
  z-index: 1;
  pointer-events: none;
  background:
    url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 340 40' preserveAspectRatio='none'%3E%3Cpath d='M0 31C20 16 44 36 66 24C87 12 107 31 129 18C148 8 169 28 193 16C214 5 237 25 259 14C280 3 306 19 340 8' fill='none' stroke='%236ea4ee' stroke-width='1.5'/%3E%3C/svg%3E")
      url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 340 40' preserveAspectRatio='none'%3E%3Cpath d='M0 31C20 16 44 36 66 24C87 12 107 31 129 18C148 8 169 28 193 16C214 5 237 25 259 14C280 3 306 19 340 8' fill='none' stroke='%236ea4ee' stroke-width='1.5'/%3E%3C/svg%3E")
      center / 100% 100% no-repeat;
}
@@ -1658,21 +1788,21 @@
  border: 1px solid rgba(148, 163, 184, 0.24);
  border-radius: 14px;
  background:
    linear-gradient(180deg, rgba(255, 255, 255, 0.92), rgba(244, 249, 255, 0.9)),
    repeating-linear-gradient(
      to right,
      rgba(148, 163, 184, 0.07) 0,
      rgba(148, 163, 184, 0.07) 1px,
      transparent 1px,
      transparent 48px
    ),
    repeating-linear-gradient(
      to bottom,
      rgba(148, 163, 184, 0.06) 0,
      rgba(148, 163, 184, 0.06) 1px,
      transparent 1px,
      transparent 34px
    );
      linear-gradient(180deg, rgba(255, 255, 255, 0.92), rgba(244, 249, 255, 0.9)),
      repeating-linear-gradient(
          to right,
          rgba(148, 163, 184, 0.07) 0,
          rgba(148, 163, 184, 0.07) 1px,
          transparent 1px,
          transparent 48px
      ),
      repeating-linear-gradient(
          to bottom,
          rgba(148, 163, 184, 0.06) 0,
          rgba(148, 163, 184, 0.06) 1px,
          transparent 1px,
          transparent 34px
      );
  overflow: hidden;
  padding: 10px;
}
@@ -1953,6 +2083,10 @@
  color: #f59e0b;
}
.realtime-delta.flat {
  color: #64748b;
}
.warning-list {
  margin-top: 10px;
  display: flex;
src/views/productionManagement/processRoute/index.vue
@@ -61,7 +61,9 @@
  import EditProcess from "@/views/productionManagement/processRoute/Edit.vue";
  import RouteItemForm from "@/views/productionManagement/processRoute/ItemsForm.vue";
  import { listPage, del } from "@/api/productionManagement/processRoute.js";
  const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
  const FileList = defineAsyncComponent(() =>
    import("@/components/Dialog/FileList.vue")
  );
  import { useRouter } from "vue-router";
  import { ElMessage, ElMessageBox } from "element-plus";
src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -47,16 +47,45 @@
            <span class="info-value">{{ routeInfo.quantity || '-' }}</span>
          </div>
        </div>
        <div class="info-item full-width"
             v-if="routeInfo.description">
        <div class="info-item">
          <div class="info-label-wrapper">
            <span class="info-label">描述</span>
            <span class="info-label">备注</span>
          </div>
          <div class="info-value-wrapper">
            <span class="info-value">{{ routeInfo.description }}</span>
          </div>
        </div>
      </div>
    </el-card>
    <!-- 附件模块 -->
    <div v-if="pageType === 'order'"
         class="section-header">
      <div class="section-title">附件</div>
    </div>
    <el-card v-if="pageType === 'order'"
             class="attachment-card"
             shadow="hover"
             style="margin-top: 10px; margin-bottom: 20px;">
      <el-table :data="attachmentTableData"
                border
                class="attachment-table">
        <el-table-column label="附件名称"
                         prop="originalFilename"
                         show-overflow-tooltip />
        <el-table-column fixed="right"
                         label="操作"
                         width="200"
                         align="center">
          <template #default="scope">
            <el-button link
                       type="primary"
                       size="small"
                       @click="downloadAttachmentFile(scope.row.downloadURL)">
              下载
            </el-button>
          </template>
        </el-table-column>
      </el-table>
    </el-card>
    <!-- 表格视图 -->
    <div v-if="viewMode === 'table'"
@@ -382,6 +411,18 @@
                         v-model="bomDataValue.showProductDialog"
                         :single="true"
                         @confirm="handleBomProduct" />
    <!-- 上传组件弹窗 -->
    <el-dialog v-model="uploadDialogVisible"
               title="上传附件"
               width="50%"
               @close="closeAttachmentUpload">
      <AttachmentUpload v-model:file-list="newFileList" />
      <template #footer>
        <el-button @click="saveAttachmentUpload"
                   type="primary">保存</el-button>
        <el-button @click="closeAttachmentUpload">关闭</el-button>
      </template>
    </el-dialog>
    <!-- 新增/编辑弹窗 -->
    <el-dialog v-model="dialogVisible"
               :title="operationType === 'add' ? '新增工艺路线项目' : '编辑工艺路线项目'"
@@ -518,6 +559,12 @@
    queryList2,
    add2,
  } from "@/api/productionManagement/productStructure.js";
  import AttachmentUpload from "@/components/AttachmentUpload/file/index.vue";
  import {
    attachmentList,
    deleteAttachment,
    createAttachment,
  } from "@/api/basicData/storageAttachment.js";
  import { useRoute } from "vue-router";
  import { ElMessageBox, ElMessage } from "element-plus";
@@ -530,6 +577,7 @@
  const orderId = computed(() => route.query.orderId);
  const pageType = computed(() => route.query.type);
  const editable = computed(() => route.query.editable !== "false");
  const technologyRoutingId = computed(() => route.query.technologyRoutingId);
  const tableLoading = ref(false);
  const tableData = ref([]);
@@ -548,7 +596,66 @@
    bomNo: "",
    description: "",
    quantity: 0,
    technologyRoutingId: "",
  });
  // 附件相关
  const attachmentTableData = ref([]);
  const uploadDialogVisible = ref(false);
  const newFileList = ref([]);
  const getAttachmentList = () => {
    if (!technologyRoutingId.value) return;
    attachmentList({
      recordType: "technology_routing",
      recordId: technologyRoutingId.value,
    }).then(res => {
      attachmentTableData.value = (res && res.data) || [];
    });
  };
  const handleUploadAttachment = () => {
    uploadDialogVisible.value = true;
  };
  const saveAttachmentUpload = async () => {
    if (newFileList.value.length > 0) {
      createAttachment({
        application: "file",
        recordType: "technology_routing",
        recordId: technologyRoutingId.value,
        storageBlobDTOs: [...newFileList.value, ...attachmentTableData.value],
      })
        .then(res => {
          if (res && res.code === 200) {
            proxy?.$modal?.msgSuccess("上传成功");
            newFileList.value = [];
            getAttachmentList();
          }
        })
        .finally(() => {
          uploadDialogVisible.value = false;
        });
    }
  };
  const closeAttachmentUpload = () => {
    newFileList.value = [];
    uploadDialogVisible.value = false;
  };
  const handleDeleteAttachment = async row => {
    deleteAttachment([row.storageAttachmentId]).then(res => {
      if (res && res.code === 200) {
        proxy?.$modal?.msgSuccess("删除成功");
        getAttachmentList();
      }
    });
  };
  const downloadAttachmentFile = url => {
    window.open(url, "_blank");
  };
  const processOptions = ref([]);
  const showProductSelectDialog = ref(false);
@@ -680,6 +787,7 @@
      bomId: route.query.bomId || "",
      description: route.query.description || "",
      quantity: route.query.quantity || 0,
      technologyRoutingId: route.query.technologyRoutingId || "",
      status: !(route.query.status == 1 || route.query.status === "false"),
    };
    bomTableData.value[0].productName = routeInfo.value.productName;
@@ -1165,16 +1273,20 @@
  const handleBomProcessChange = (row, value) => {
    row.processId = value || "";
    syncProcessOperationFields(row);
    // 同一层级只能选一样的工序
    // 检查同一层级是否已经有其他不同的工序被选中
    const siblings = findSiblings(bomDataValue.value.dataList, row.tempId);
    if (siblings && value) {
      siblings.forEach(sibling => {
        if (sibling.tempId !== row.tempId) {
          sibling.processId = value;
          syncProcessOperationFields(sibling);
        }
      const hasDifferentProcess = siblings.some(sibling => {
        return (
          sibling.tempId !== row.tempId &&
          sibling.processId &&
          sibling.processId !== value
        );
      });
      if (hasDifferentProcess) {
        ElMessage.warning("同一层级已存在不同的工序,请先统一工序后再进行修改");
      }
    }
  };
@@ -1391,9 +1503,36 @@
      }
    };
    // 校验同一层级的工序是否一致
    const validateProcessConsistency = items => {
      if (!items || items.length === 0) return;
      // 检查当前层级
      const processes = items
        .filter(item => item.processId)
        .map(item => item.processId);
      if (processes.length > 1) {
        const uniqueProcesses = [...new Set(processes)];
        if (uniqueProcesses.length > 1) {
          ElMessage.error("同一层级的工序必须一致");
          isValid = false;
          return;
        }
      }
      // 递归检查子级
      items.forEach(item => {
        if (item.children && item.children.length > 0) {
          validateProcessConsistency(item.children);
        }
      });
    };
    bomDataValue.value.dataList.forEach(item => {
      validateItem(item, true);
    });
    validateProcessConsistency(bomDataValue.value.dataList);
    return isValid;
  };
@@ -1449,6 +1588,9 @@
    getList();
    getProcessList();
    fetchBomData();
    if (pageType.value === "order") {
      getAttachmentList();
    }
  };
  onMounted(() => {
src/views/productionManagement/productStructure/Detail/index.vue
@@ -336,15 +336,15 @@
    row.processId = value || "";
    syncProcessOperationFields(row);
    
    // 同一层级只能选一样的工序
    // 检查同一层级是否已经有其他不同的工序被选中
    const siblings = findSiblings(dataValue.dataList, row.tempId);
    if (siblings && value) {
      siblings.forEach(sibling => {
        if (sibling.tempId !== row.tempId) {
          sibling.processId = value;
          syncProcessOperationFields(sibling);
        }
      const hasDifferentProcess = siblings.some(sibling => {
        return sibling.tempId !== row.tempId && sibling.processId && sibling.processId !== value;
      });
      if (hasDifferentProcess) {
        ElMessage.warning("同一层级已存在不同的工序,请先统一工序后再进行修改");
      }
    }
  };
src/views/productionManagement/productionOrder/index.vue
@@ -723,6 +723,7 @@
          bomNo: row.bomNo || "",
          description: data.description || "",
          quantity: row.quantity || 0,
          technologyRoutingId: data.technologyRoutingId,
          orderId,
          type: "order",
          editable: !row.endOrder,
src/views/salesManagement/salesLedger/index.vue
@@ -284,10 +284,15 @@
          <el-col :span="12">
            <el-form-item label="销售合同号:"
                          prop="salesContractNo">
              <el-input v-model="form.salesContractNo"
                        placeholder="自动生成"
                        clearable
                        disabled />
              <div style="display: flex; align-items: center; gap: 12px;width: 100%;">
                <el-checkbox v-model="form.autoGenerateContractNo" v-if="operationType === 'add'">自动生成
                </el-checkbox>
                <el-input v-model="form.salesContractNo"
                          :placeholder="form.autoGenerateContractNo ? '自动生成' : '请输入'"
                          clearable
                          :disabled="form.autoGenerateContractNo" />
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -1069,6 +1074,7 @@
    },
    form: {
      salesContractNo: "",
      autoGenerateContractNo: true,
      salesman: "",
      customerId: "",
      entryPerson: "",
@@ -1587,6 +1593,8 @@
      form.value.entryDate = getCurrentDate();
      // 签订日期默认为当天
      form.value.executionDate = getCurrentDate();
      // 默认自动生成销售合同号
      form.value.autoGenerateContractNo = true;
    } else {
      currentId.value = row.id;
      getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
@@ -1594,6 +1602,8 @@
        form.value.entryPerson = Number(res.entryPerson);
        productData.value = form.value.productData;
        fileList.value = form.value.storageBlobVOs;
        // 编辑时设置自动生成为false,允许手动修改
        form.value.autoGenerateContractNo = false;
      });
    }
    // let userAll = await userStore.getInfo()
@@ -1730,6 +1740,9 @@
        }
        form.value.storageBlobDTOs = fileList;
        form.value.type = 1;
        if (form.value.autoGenerateContractNo) {
          form.value.salesContractNo = '';
        }
        addOrUpdateSalesLedger(form.value).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
@@ -3007,4 +3020,4 @@
      page-break-after: avoid;
    }
  }
</style>
</style>