diff --git a/src/api/system/proPlan.js b/src/api/system/proPlan.js
index 957a7f7..86f8dee 100644
--- a/src/api/system/proPlan.js
+++ b/src/api/system/proPlan.js
@@ -65,3 +65,11 @@ export function delProPlan(id) {
     method: 'delete'
   })
 }
+
+// 设计人项目汇总（周/月/年）
+export function getDesignerSummary() {
+  return request({
+    url: '/system/proPlan/summary/designer',
+    method: 'get'
+  })
+}
diff --git a/src/api/system/route.js b/src/api/system/route.js
index aeeb355..1294fd9 100644
--- a/src/api/system/route.js
+++ b/src/api/system/route.js
@@ -148,6 +148,23 @@ export function generatePDFs(rooteProdet) {
   });
 }
 
+// 更新生产订单仓库字段（推送工序计划单入库）
+export function updateProductionOrders(rooteProdet, cangKuNum) {
+  return request({
+    url: '/system/route/updateProductionOrders',
+    method: 'post',
+    params: { rooteProdet, cangKuNum },
+  });
+}
+
+export function updateCgOrders(rooteProdet, cangKuNum) {
+  return request({
+    url: '/system/route/updateCgOrders',
+    method: 'post',
+    params: { rooteProdet, cangKuNum },
+  });
+}
+
 
 // 获取物料BOM信息，后端返回物料BOM信息集合
 export function getBomInfo(materialCode, materialName, productionOrderNo) {
diff --git a/src/api/system/safetyStock.js b/src/api/system/safetyStock.js
index 09e36cb..89105d6 100644
--- a/src/api/system/safetyStock.js
+++ b/src/api/system/safetyStock.js
@@ -37,8 +37,16 @@ export function updateSafetyStock(data) {
 
 // 删除安全库存
 export function delSafetyStock(id) {
+  const ids = Array.isArray(id) ? id.join(',') : id
+  // 优先尝试 REST 风格 DELETE，不支持则回退到 POST /remove
   return request({
-    url: '/system/safetyStock/' + id,
+    url: '/system/safetyStock/' + ids,
     method: 'delete'
+  }).catch(() => {
+    return request({
+      url: '/system/safetyStock/remove',
+      method: 'post',
+      data: { ids }
+    })
   })
 }
diff --git a/src/views/index.vue b/src/views/index.vue
index 93e0e77..5422468 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -65,12 +65,14 @@
     </el-form>
 
 
-    <el-table v-loading="loading" :data="materialList" >
+    <el-table v-loading="loading" :data="materialList" class="material-table">
 <!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="ID" width="60" align="center" prop="id" v-if="true"/>
       <el-table-column label="物料编号" align="center" prop="materialCode">
         <template slot-scope="scope">
-          <span @click="handleClick(scope.row)"> {{ scope.row.materialCode }} </span>
+          <el-link type="primary" :underline="true" class="material-code-link" @click="handleClick(scope.row)">
+            {{ scope.row.materialCode }}
+          </el-link>
         </template>
       </el-table-column>
       <el-table-column label="物料名称" align="center" prop="materialName">
@@ -111,20 +113,32 @@
       @pagination="getList"
     />
     <transition name="fade">
-      <el-dialog :visible="dialogVisible" @close="dialogVisible = false" width="30%">
+      <el-dialog :visible="dialogVisible" @close="dialogVisible = false" width="36%">
         <el-card class="box-card" v-loading="dialogLoading" element-loading-text="加载中..." element-loading-background="rgba(255, 255, 255, 0.8)">
-
-        <div slot="header" class="clearfix">
+          <div slot="header" class="clearfix header-bar">
             <span class="dialog-title">库存信息</span>
+            <span class="material-title">{{ inventoryData.materialCode }}</span>
           </div>
-          <div class="dialog-body">
-            <p class="dialog-item"><strong>物料编号：</strong>{{ inventoryData.materialCode }}</p>
-            <p class="dialog-item"><strong>库存：</strong>{{ inventoryData.kucun }}</p>
-            <p class="dialog-item"><strong>子项未领料量：</strong>{{ inventoryData.inventory }}</p>
-            <p class="dialog-item"><strong>生产订单未入库：</strong>{{ inventoryData.stockName }}</p>
-            <p class="dialog-item"><strong>采购订单未入库：</strong>{{ inventoryData.materialName }}</p>
-            <p class="dialog-item"><strong>预计可用库存：</strong>{{ inventoryData.stockUnit }}</p>
-          </div>
+          <el-descriptions :column="2" border class="inventory-desc" size="small">
+            <el-descriptions-item label="库存">
+              <span :class="['val', inventoryData.kucun > 0 ? 'val-pos' : (inventoryData.kucun < 0 ? 'val-neg' : 'val-zero')]">{{ inventoryData.kucun }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="子项未领料量">
+              <span class="val">{{ inventoryData.inventory }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="生产订单未入库">
+              <span class="val">{{ inventoryData.stockName }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="采购订单未入库">
+              <span class="val">{{ inventoryData.materialName }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="销售订单未出库">
+              <span class="val">{{ inventoryData.salesOrder }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="预计可用库存">
+              <span :class="['val', inventoryData.stockUnit > 0 ? 'val-pos' : (inventoryData.stockUnit < 0 ? 'val-neg' : 'val-zero')]">{{ inventoryData.stockUnit }}</span>
+            </el-descriptions-item>
+          </el-descriptions>
         </el-card>
       </el-dialog>
     </transition>
@@ -186,6 +200,7 @@ export default {
         unitPrice: undefined,
         unit: undefined,
         flag: undefined,
+        salesOrder:undefined
       },
       // 表单参数
       form: {},
@@ -210,6 +225,7 @@ export default {
         this.inventoryData.stockName = response.data.stockName;
         this.inventoryData.stockUnit = response.data.stockUnit;
         this.inventoryData.kucun = response.data.kucun;
+         this.inventoryData.salesOrder = response.data.salesOrder;
         this.dialogVisible = true;
       })
         .catch(error => {
@@ -342,4 +358,52 @@ export default {
   text-align: center;
   margin-bottom: 10px;
 }
+.header-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.material-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #409EFF;
+}
+.material-table .el-table__header .cell {
+  font-size: 16px;
+  font-weight: 700;
+  color: #303133;
+}
+.material-table .el-table__body .cell {
+  font-size: 14px;
+  font-weight: 600;
+}
+.material-code-link {
+  font-size: 16px;
+  font-weight: 700;
+}
+.inventory-desc {
+  --label-bg: linear-gradient(135deg, #f0f9ff 0%, #e0f2fe 100%);
+  --label-color: #409EFF;
+}
+.inventory-desc .el-descriptions__label {
+  background: var(--label-bg);
+  color: var(--label-color);
+  font-weight: 600;
+}
+.inventory-desc .el-descriptions__content {
+  color: #303133;
+  font-size: 13px;
+}
+.val {
+  font-weight: 600;
+}
+.val-pos {
+  color: #67C23A;
+}
+.val-neg {
+  color: #F56C6C;
+}
+.val-zero {
+  color: #909399;
+}
 </style>
diff --git a/src/views/indexDaping.vue b/src/views/indexDaping.vue
index 62ebf78..dade775 100644
--- a/src/views/indexDaping.vue
+++ b/src/views/indexDaping.vue
@@ -194,7 +194,7 @@
 </template>
 
 <script>
-import { listProPlan2, listProPlanOverdue ,listProPlanExpirys} from '@/api/system/proPlan'
+import { listProPlan2, listProPlanOverdue ,listProPlanExpirys, getDesignerSummary } from '@/api/system/proPlan'
 import dayjs from 'dayjs';
 export default {
   data () {
@@ -222,7 +222,8 @@ export default {
         hoverPause: false
       }
 ,
-      timeGranularity: 'month'
+      timeGranularity: 'month',
+      designerSummary: []
     }
   },
   async created() {
@@ -232,8 +233,10 @@ export default {
     await this.fetchOverdue();
     // 再拉取临期项目数据
     await this.ExpiryOverdue();
-    // 最后拉取方案列表填充滚动表格（此时超期和临期数据已准备好）
+    // 拉取方案列表填充滚动表格（此时超期和临期数据已准备好）
     this.fetchProPlanList();
+    // 拉取设计人汇总数据（用于胶囊图）
+    await this.fetchDesignerSummary();
   },
   mounted() {
     // 每分钟完全刷新一次数据
@@ -242,6 +245,7 @@ export default {
       await this.ExpiryOverdue();
       this.fetchProPlanList();
       this.initProjects();
+      await this.fetchDesignerSummary();
     }, 60 * 1000); // 1分钟
 
     // 启动轮播（当项目超过3条时）
@@ -374,29 +378,19 @@ export default {
       };
     },
     capsuleConfig() {
-      const designers = this.getUniqueDesigners();
-      const timeLabels = this.getTimeLabels(this.timeGranularity);
-      const latestLabel = timeLabels[timeLabels.length - 1];
-
-      const countsByDesigner = new Map();
-      designers.forEach(d => countsByDesigner.set(d, 0));
-
-      (this.tableConfig.data || []).forEach(row => {
-        // 清理HTML标签
-        const designer = row[1] ? row[1].replace(/<[^>]*>/g, '') : '';
-        const dateStr = row[4] ? row[4].replace(/<[^>]*>/g, '') : '';
-
-        if (!designer || !dateStr || designer === '-') return;
-        const label = this.formatTimeLabel(dateStr, this.timeGranularity);
-        if (label === latestLabel && countsByDesigner.has(designer)) {
-          countsByDesigner.set(designer, countsByDesigner.get(designer) + 1);
-        }
-      });
-
-      const data = Array.from(countsByDesigner.entries())
-        .map(([name, value]) => ({ name, value }))
+      const list = Array.isArray(this.designerSummary) ? this.designerSummary : [];
+      const key =
+        this.timeGranularity === 'week'
+          ? 'weeklyCount'
+          : this.timeGranularity === 'year'
+          ? 'yearlyCount'
+          : 'monthlyCount';
+      const data = list
+        .map(item => ({
+          name: item.designer || item.name || '-',
+          value: Number(item[key] ?? 0)
+        }))
         .sort((a, b) => b.value - a.value);
-
       return {
         data,
         colors: ['#ef4444', '#f59e0b', '#22c55e', '#3b82f6', '#8b5cf6', '#06b6d4', '#ea580c'],
@@ -676,6 +670,17 @@ export default {
         console.error('fetchProPlanList error:', e);
       }
     },
+    // 拉取设计人汇总数据
+    async fetchDesignerSummary() {
+      try {
+        const res = await getDesignerSummary();
+        const rows = res?.rows || res?.data || res || [];
+        this.designerSummary = Array.isArray(rows) ? rows : [];
+      } catch (e) {
+        console.error('fetchDesignerSummary error:', e);
+        this.designerSummary = [];
+      }
+    },
     getUniqueDesigners() {
       const set = new Set();
 
diff --git a/src/views/system/details/index.vue b/src/views/system/details/index.vue
index 1021ed1..86c1204 100644
--- a/src/views/system/details/index.vue
+++ b/src/views/system/details/index.vue
@@ -228,6 +228,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :pageSizes="[50, 100, 1000, 5000]"
       @pagination="getList"
     />
 
@@ -362,7 +363,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 100,
+        pageSize: 1000,
         partNumber: undefined,
         fname: undefined,
         fnumber: undefined,
diff --git a/src/views/system/orderPro/index.vue b/src/views/system/orderPro/index.vue
index 1b08e20..3cfb274 100644
--- a/src/views/system/orderPro/index.vue
+++ b/src/views/system/orderPro/index.vue
@@ -2,61 +2,35 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="生产令号" prop="productionOrderNo">
-        <el-input
-          v-model="queryParams.productionOrderNo"
-          placeholder="请输入生产令号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.productionOrderNo" placeholder="请输入生产令号" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="项目名称" prop="productionName">
-        <el-input
-          v-model="queryParams.productionName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.productionName" placeholder="请输入项目名称" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="图号" prop="drawingNo">
-        <el-input
-          v-model="queryParams.drawingNo"
-          placeholder="请输入图号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.drawingNo" placeholder="请输入图号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="名称" prop="drawingName">
-        <el-input
-          v-model="queryParams.drawingName"
-          placeholder="请输入名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.drawingName" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <!-- <el-form-item label="创建人" prop="createdBy">
-        <el-input
-          v-model="queryParams.createdBy"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="是否延期" prop="whetherDelay">
+        <el-select v-model="queryParams.whetherDelay" placeholder="请选择" clearable>
+          <el-option label="是" :value="1" />
+          <el-option label="否" :value="0" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="修改人" prop="updatedBy">
-        <el-input
-          v-model="queryParams.updatedBy"
-          placeholder="请输入修改人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="项目类型" prop="isEnterpriseStandard">
-        <el-select
-          v-model="queryParams.isEnterpriseStandard"
-          placeholder="请选择"
-          clearable>
-          <el-option label="非标单" :value="0"/>
-          <el-option label="企标单" :value="1"/>
-          <el-option label="变更单" :value="2"/>
+      <el-form-item label="项目类型" prop="isEnterpriseStandardList">
+        <el-select v-model="queryParams.isEnterpriseStandardList" placeholder="请选择" clearable multiple collapse-tags>
+          <el-option label="产品 (CP)" value="产品" />
+          <el-option label="非标 (FB)" value="非标" />
+          <el-option label="变更 (BG)" value="变更" />
+          <el-option label="研发 (EY)" value="研发" />
+          <el-option label="企标 (QB)" value="企标" />
+          <el-option label="库存 (KC)" value="库存" />
+          <el-option label="固资 (GZ)" value="固资" />
+          <el-option label="展品 (ZP)" value="展品" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -67,56 +41,31 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:orderPro:add']"
-        >新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['system:orderPro:add']">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:orderPro:edit']"
-        >修改
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:orderPro:edit']">修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:orderPro:remove']"
-        >删除
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:orderPro:remove']">删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:orderPro:export']"
-        >导出
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['system:orderPro:export']">导出
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="orderProList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+    <el-table v-loading="loading" :data="orderProList" ref="orderTable" row-key="id"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" v-if="true"/> -->
       <el-table-column label="生产令号" align="center" prop="productionOrderNo">
         <template slot-scope="scope">
@@ -125,149 +74,214 @@
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column label="项目名称" align="center" prop="productionName"/>
+
       <el-table-column label="执行单图" align="center" min-width="100">
         <template slot-scope="scope">
-          <el-image
-            v-if="scope.row.drawingPathUrl || scope.row.drawingPath"
-            :src="getFullImageUrl(scope.row)"
-            style="width:80px; height:80px; object-fit:cover; border-radius:4px;"
-            :preview-src-list="[getFullImageUrl(scope.row)]"
-            fit="cover"
-          />
-          <span v-else style="color: #909399; font-size: 12px;">暂无执行单图</span>
+          <div v-if="getImageList(scope.row).length" style="display:flex; flex-wrap:wrap; gap:6px; justify-content:center">
+            <el-image
+              v-for="(img,idx) in getImageList(scope.row)"
+              :key="idx"
+              :src="img"
+              :preview-src-list="getImageList(scope.row)"
+              fit="cover"
+              style="width: 80px; height: 80px; object-fit: cover; border-radius: 4px"
+            />
+          </div>
+          <span v-else style="color: #909399; font-size: 12px">暂无执行单图</span>
         </template>
       </el-table-column>
 
       <el-table-column label="项目状态" align="center" prop="imCategory">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.bomStatus"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.bomStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center" prop="productionName" />
+      <el-table-column label="是否延期" align="center" prop="whetherDelay">
+        <template slot-scope="scope">
+          <el-tag size="mini" :type="Number(scope.row.whetherDelay) === 1 ? 'danger' : 'success'">
+            {{ Number(scope.row.whetherDelay) === 1 ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="延期天数" align="center" prop="delayDay">
+        <template slot-scope="scope">
+          <span style="color:#ff4757; font-weight:600;">
+            {{ scope.row.delayDay != null ? scope.row.delayDay : '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计量单位" align="center" prop="unit" />
+      <el-table-column label="DWG" align="center" prop="quantity">
+        <template slot-scope="scope">
+          <el-tag size="mini" :type="Number(scope.row.quantity) === 1 ? 'success' : 'info'">
+            {{ Number(scope.row.quantity) === 1 ? '允许' : '不允许' }}
+          </el-tag>
         </template>
       </el-table-column>
-
-
-      <el-table-column label="计量单位" align="center" prop="unit"/>
       <!-- <el-table-column label="产品数量" align="center" prop="quantity"/>-->
       <el-table-column label="项目类型" align="center" prop="isEnterpriseStandard">
-        <template v-slot="scope">
-        <span>
-          {{
-            scope.row.isEnterpriseStandard === 0
-              ? '非标单'
-              : scope.row.isEnterpriseStandard === 1
-                ? '企标单'
-                : scope.row.isEnterpriseStandard === 2
-                  ? '变更单'
-                  : ''
-          }}
-        </span>
+        <template slot-scope="scope">
+          <span>{{ getProjectTypeLabel(scope.row.isEnterpriseStandard) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy"/>
+      <el-table-column label="出图时间" align="center" prop="drawingTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ drawingTime(scope.row, 'drawingTime', '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="项目完成时间" align="center" prop="projectEndTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectEndTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ formatStepTime(scope.row, 'projectEndTime', '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="生产开始时间" align="center" prop="planStartTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planStartTime, '{y}年{m}月{d}日') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="生产结束时间" align="center" prop="planEndTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planEndTime, '{y}年{m}月{d}日') }}</span>
+          <span>{{ formatStepTime(scope.row, 'createTime', '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="工艺上传更新时间" align="center" prop="routeUptime" width="180">
         <template slot-scope="scope">
-          <el-dropdown :split-button="true" size="small" type="primary" @click="handleBOM(scope.row.productionOrderNo)"
-                       @command="(command)=>handleCommand(command, scope.row)">
-            查看BOM
+          <span>{{ formatStepTime(scope.row, 'routeUptime', '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="排产计划更新时间" align="center" prop="planUptime" width="180">
+        <template slot-scope="scope">
+          <span>{{ formatStepTime(scope.row, 'planUptime', '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="BOM/物料更新时间" align="center" prop="bomUptime" width="180">
+        <template slot-scope="scope">
+          <span>{{ formatStepTime(scope.row, 'bomUptime', '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>-->
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
+        <template slot-scope="scope">
+          <el-dropdown :split-button="true" size="small" type="primary" @click="handleDetail(scope.row.productionOrderNo)"
+            v-hasPermi="['system:orderPro:remove']"
+            @command="(command) => handleCommand(command, scope.row)">
+            查看工艺
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="工艺" v-hasPermi="['system:orderPro:remove']">查看工艺</el-dropdown-item>
+              <el-dropdown-item command="BOM" v-hasPermi="['system:orderPro:remove']">查看BOM</el-dropdown-item>
               <el-dropdown-item :divided="true" command="修改" v-hasPermi="['system:orderPro:edit']">修改
               </el-dropdown-item>
               <el-dropdown-item :divided="true" command="删除" v-hasPermi="['system:orderPro:remove']">删除
               </el-dropdown-item>
+              <el-dropdown-item :divided="true" command="清空项目" v-hasPermi="['system:orderPro:clear']">清空项目
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-
-
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <el-drawer
-      :title="getDrawerTitle()"
-      :visible.sync="drawer"
-      :direction="direction"
-      :before-close="handleClose"
-      :size="1500"
-    >
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <el-drawer :title="getDrawerTitle()" :visible.sync="drawer" :direction="direction" :before-close="handleClose"
+      :size="1500">
       <el-divider content-position="center">
-          <span style="color: #67C23A; font-weight: 600; font-size: 14px;">
-            <i class="el-icon-picture" style="margin-right: 6px;"></i>
-            选择产品
-          </span>
+        <span style="color: #67c23a; font-weight: 600; font-size: 14px">
+          <i class="el-icon-picture" style="margin-right: 6px"></i>
+          选择产品
+        </span>
       </el-divider>
-      <div style="padding: 20px;">
+      <div style="padding: 20px">
         <!-- 第一部分：销齿链型号表格管理 -->
-        <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 10px;">
-          <el-button type="primary" @click="openAddChainDialog" size="mini" v-hasPermi="['system:save:add']">新增</el-button>
-          <el-upload
-            :action="dwgUploadUrl"
-            :headers="uploadHeaders"
-            :show-file-list="false"
-            accept=".dwg"
-            :http-request="batchUploadDwg"
-            :before-upload="beforeBatchDwgUpload"
-          >
-            <el-button type="success" size="mini" :disabled="!selectedChainIds.length" v-hasPermi="['system:orderPro:uploadDwg']">
+        <div style="
+            display: flex;
+            align-items: center;
+            gap: 8px;
+            margin-bottom: 10px;
+          ">
+          <el-button type="primary" @click="openAddChainDialog" size="mini"
+            v-hasPermi="['system:save:add']">新增</el-button>
+          <el-upload :action="dwgUploadUrl" :headers="uploadHeaders" :show-file-list="false" accept=".dwg"
+            :http-request="batchUploadDwg" :before-upload="beforeBatchDwgUpload">
+            <el-button type="success" size="mini" :disabled="!selectedChainIds.length"
+              v-hasPermi="['system:orderPro:uploadDwg']">
               <i class="el-icon-upload2"></i> 上传图纸
             </el-button>
           </el-upload>
+          <el-button
+            type="primary"
+            size="mini"
+            :disabled="!selectedChainIds.length"
+            @click="downloadSelectedDwgZip"
+            v-hasPermi="['system:orderPro:downloadZip']"
+          >
+            <i class="el-icon-download"></i> 下载图纸ZIP
+          </el-button>
+          <el-button
+            type="warning"
+            size="mini"
+            @click="pushDingTalkCard"
+            v-hasPermi="['system:orderPro:pushDingTalkCard']"
+          >
+            <i class="el-icon-message"></i> 推送钉钉
+          </el-button>
+          <el-upload
+            :show-file-list="false"
+            :http-request="importProducts"
+            :before-upload="beforeElectricalBomUpload"
+            accept=".xls,.xlsx"
+          >
+            <el-button
+              type="info"
+              size="mini"
+              v-hasPermi="['system:save:import']"
+            >
+              <i class="el-icon-upload"></i> 导入产品
+            </el-button>
+          </el-upload>
         </div>
-        <el-table
-          :data="chainTable"
-          border
-          stripe
-          size="small"
-          style="width: 100%; margin-bottom: 10px;"
-          highlight-current-row
-          :header-cell-style="{ fontWeight: 'bold', background: '#f5f7fa' }"
-          @selection-change="handleChainSelectionChange"
-        >
+        <el-table :data="chainTable" border stripe size="small" style="width: 100%; margin-bottom: 10px"
+          highlight-current-row :header-cell-style="{ fontWeight: 'bold', background: '#f5f7fa' }"
+          @selection-change="handleChainSelectionChange">
           <el-table-column type="selection" width="55" />
-          <el-table-column prop="figureNumber" label="产品型号" min-width="100"/>
-          <el-table-column prop="figureName" label="产品名称" min-width="140"/>
-          <el-table-column prop="jdInventory" label="行程" min-width="80"/>
-          <el-table-column prop="figureNum" label="数量" min-width="60"/>
-          <el-table-column prop="drawPath" label="文件路径" min-width="120" :show-overflow-tooltip="true"/>
-          <el-table-column prop="productType" label="产品类型" min-width="100"/>
+          <el-table-column prop="figureNumber" label="产品型号" min-width="100" />
+          <el-table-column prop="figureName" label="产品名称" min-width="140" />
+          <el-table-column prop="jdInventory" label="行程" min-width="80" />
+          <el-table-column prop="figureNum" label="数量" min-width="60" />
+          <el-table-column prop="drawPath" label="文件路径" min-width="120" :show-overflow-tooltip="true" />
+          <el-table-column prop="productType" label="产品类型" min-width="100" />
+          <el-table-column prop="fileType" label="文件类型" min-width="100" />
+          <el-table-column label="出图人" prop="drawBy" min-width="100">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.plan_proer" :value="scope.row.drawBy" />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否延期" prop="whetherDelay" min-width="90" align="center">
+            <template slot-scope="scope">
+              <el-tag size="mini" :type="Number(scope.row.whetherDelay) === 1 ? 'danger' : 'success'">
+                {{ Number(scope.row.whetherDelay) === 1 ? '是' : '否' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="delayDay" label="延期天数" min-width="90" align="right" />
+          <el-table-column label="出图时间" prop="drawTime" min-width="160">
+            <template slot-scope="scope">
+              <span>{{ formatStepTime(scope.row, 'drawTime', '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上传图纸时间" prop="uploadTime" min-width="160">
+            <template slot-scope="scope">
+              <span>{{ formatStepTime(scope.row, 'uploadTime', '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="200">
             <template slot-scope="scope">
-              <div style="display: flex; align-items: center; gap: 8px;">
-                
-                <el-button type="text" size="mini" @click="editChain(scope.$index, scope.row)" v-hasPermi="['system:save:edit']">
+              <div style="display: flex; align-items: center; gap: 8px">
+                <el-button type="text" size="mini" @click="editChain(scope.$index, scope.row)"
+                  v-hasPermi="['system:save:edit']">
                   <i class="el-icon-edit"></i> 修改
                 </el-button>
 
-                <el-button type="text" size="mini" @click="removeChain(scope.$index)" v-hasPermi="['system:save:remove']">
+                <el-button type="text" size="mini" @click="removeChain(scope.$index)"
+                  v-hasPermi="['system:save:remove']">
                   <i class="el-icon-delete"></i> 删除
                 </el-button>
               </div>
@@ -275,15 +289,21 @@
           </el-table-column>
         </el-table>
         <el-divider content-position="center">
-          <span style="color: #67C23A; font-weight: 600; font-size: 14px;">
-            <i class="el-icon-picture" style="margin-right: 6px;"></i>
+          <span style="color: #67c23a; font-weight: 600; font-size: 14px">
+            <i class="el-icon-picture" style="margin-right: 6px"></i>
             执行出图
           </span>
         </el-divider>
         <!-- 第二部分：执行出图命令及日志展示 -->
-        <div style="margin-bottom: 20px;">
-          <div style="display: flex; align-items: center; gap: 10px; margin-bottom: 10px;">
-            <el-button type="success" :loading="drawLoading" @click="executeDrawCommand" v-hasPermi="['system:orderPro:executDrawing']">
+        <div style="margin-bottom: 20px">
+          <div style="
+              display: flex;
+              align-items: center;
+              gap: 10px;
+              margin-bottom: 10px;
+            ">
+            <el-button type="success" :loading="drawLoading" @click="executeDrawCommand"
+              v-hasPermi="['system:orderPro:executDrawing']">
               执行出图
             </el-button>
             <el-button type="primary" @click="downloadPDF" v-hasPermi="['system:orderPro:uploadPDF']">
@@ -295,85 +315,77 @@
             <el-button type="primary" @click="downloadRoute3" v-hasPermi="['system:orderPro:exportRoute3']">
               导出工艺计划表
             </el-button>
-            <el-upload
-              :show-file-list="false"
-              :http-request="uploadElectricalBom"
-              :before-upload="beforeElectricalBomUpload"
-              accept=".xls,.xlsx"
-              style="display: inline-block;"
-            >
+            <el-button type="danger" @click="pushProcessInbound" v-hasPermi="['system:route:updateProductionOrders']">
+              推送工序计划单入库
+            </el-button>
+            <el-button type="success" @click="pushPurchaseInbound" v-hasPermi="['system:route:updateProductionOrders']">
+              推送入库采购申请
+            </el-button>
+            <el-upload :show-file-list="false" :http-request="uploadElectricalBom"
+              :before-upload="beforeElectricalBomUpload" accept=".xls,.xlsx" style="display: inline-block">
               <el-button type="info" v-hasPermi="['system:details:importElectricalBom']">
                 导入电气BOM
               </el-button>
             </el-upload>
           </div>
           <el-progress :text-inside="true" :stroke-width="26" :percentage="percentage"></el-progress>
-          <el-card shadow="never" style="background: #f9f9f9; min-height: 120px; max-height: 220px; overflow-y: auto;">
-            <div style="font-size: 13px; color: #333; white-space: pre-line;">
+          <el-card shadow="never" style="
+              background: #f9f9f9;
+              min-height: 120px;
+              max-height: 220px;
+              overflow-y: auto;
+            ">
+            <div style="font-size: 13px; color: #333; white-space: pre-line">
               <template v-if="drawLog">{{ drawLog }}</template>
               <template v-else>暂无日志</template>
             </div>
           </el-card>
         </div>
         <el-divider content-position="center">
-          <span style="color: #409EFF; font-weight: 600; font-size: 14px;">
-            <i class="el-icon-more" style="margin-right: 6px;"></i>
+          <span style="color: #409eff; font-weight: 600; font-size: 14px">
+            <i class="el-icon-more" style="margin-right: 6px"></i>
             MRP运算结果复查
           </span>
         </el-divider>
         <!-- 第三部分：预留 -->
-        <div style="color: #aaa; font-size: 13px;"></div>
+        <div style="color: #aaa; font-size: 13px"></div>
         <!-- 第三部分：MRP运算结果复查表格 -->
-        <el-card class="box-card mrp-result-card" style="margin-bottom: 20px;">
+        <el-card class="box-card mrp-result-card" style="margin-bottom: 20px">
           <div slot="header" class="clearfix">
-            <span style="font-weight: 600; color: #303133;">
-              <i class="el-icon-data-analysis" style="margin-right: 8px; color: #409EFF;"></i>
+            <span style="font-weight: 600; color: #303133">
+              <i class="el-icon-data-analysis" style="margin-right: 8px; color: #409eff"></i>
               MRP运算结果复查
             </span>
-            <div style="float: right; display: flex; align-items: center; gap: 12px;">
+            <div style="
+                float: right;
+                display: flex;
+                align-items: center;
+                gap: 12px;
+              ">
               <!-- 运算状态显示 -->
               <div v-if="loadingMRP" class="mrp-status-indicator">
-                <i class="el-icon-loading" style="margin-right: 6px;"></i>
-                <span>{{ mrpOperationStatus || 'MRP运算进行中...' }}</span>
+                <i class="el-icon-loading" style="margin-right: 6px"></i>
+                <span>{{ mrpOperationStatus || "MRP运算进行中..." }}</span>
               </div>
 
               <!-- 运算结果按钮 -->
-              <el-button
-                type="primary"
-                size="medium"
-                :loading="loadingMRP"
-                :disabled="loadingMRP"
-                @click="getMRPResults()"
-                class="mrp-calculate-btn"
-              >
-                {{ loadingMRP ? '核算中...' : '开始核算' }}
+              <el-button type="primary" size="medium" :loading="loadingMRP" :disabled="loadingMRP"
+                @click="getMRPResults()" class="mrp-calculate-btn">
+                {{ loadingMRP ? "核算中..." : "开始核算" }}
               </el-button>
 
               <!-- 搜索输入框 -->
-              <el-input
-                v-model="mrpSearchKeyword"
-                placeholder="搜索物料名称或编码"
-                style="width: 220px;"
-                size="small"
-                clearable
-                @input="handleMrpSearch"
-                @clear="clearMrpSearch"
-                class="mrp-search-input"
-              >
+              <el-input v-model="mrpSearchKeyword" placeholder="搜索物料名称或编码" style="width: 220px" size="small" clearable
+                @input="handleMrpSearch" @clear="clearMrpSearch" class="mrp-search-input">
                 <i slot="prefix" class="el-input__icon el-icon-search"></i>
               </el-input>
 
               <!-- 导出按钮 -->
-              <el-button
-                type="success"
-                size="small"
-                icon="el-icon-download"
-                @click="handleExportMrp"
-                :loading="exportLoading"
-                :disabled="!productionObj || !productionObj.id"
-                class="mrp-export-btn"
-                :title="productionObj && productionObj.id ? `导出${productionObj.productionOrderNo}的MRP数据` : '请先选择生产令号'"
-              >
+              <el-button type="success" size="small" icon="el-icon-download" @click="handleExportMrp"
+                :loading="exportLoading" :disabled="!productionObj || !productionObj.id" class="mrp-export-btn" :title="productionObj && productionObj.id
+                    ? `导出${productionObj.productionOrderNo}的MRP数据`
+                    : '请先选择生产令号'
+                  ">
                 导出Excel
               </el-button>
 
@@ -383,83 +395,99 @@
             </div>
           </div>
           <!-- 统计信息 -->
-          <div
-            style="margin-bottom: 15px; padding: 15px; background: linear-gradient(135deg, #f0f9ff 0%, #e0f2fe 100%); border-radius: 8px; border-left: 4px solid #409EFF;">
+          <div style="
+              margin-bottom: 15px;
+              padding: 15px;
+              background: linear-gradient(135deg, #f0f9ff 0%, #e0f2fe 100%);
+              border-radius: 8px;
+              border-left: 4px solid #409eff;
+            ">
             <el-row :gutter="20">
               <el-col :span="6">
-                <div style="text-align: center;">
-                  <div style="font-size: 24px; font-weight: bold; color: #409EFF;">{{ mrpStats.totalMaterials }}</div>
-                  <div style="font-size: 12px; color: #606266;">总物料数</div>
+                <div style="text-align: center">
+                  <div style="font-size: 24px; font-weight: bold; color: #409eff">
+                    {{ mrpStats.totalMaterials }}
+                  </div>
+                  <div style="font-size: 12px; color: #606266">总物料数</div>
                 </div>
               </el-col>
               <el-col :span="6">
-                <div style="text-align: center;">
-                  <div style="font-size: 24px; font-weight: bold; color: #67c23a;">{{ mrpStats.positiveStock }}</div>
-                  <div style="font-size: 12px; color: #606266;">正库存</div>
+                <div style="text-align: center">
+                  <div style="font-size: 24px; font-weight: bold; color: #67c23a">
+                    {{ mrpStats.positiveStock }}
+                  </div>
+                  <div style="font-size: 12px; color: #606266">正库存</div>
                 </div>
               </el-col>
               <el-col :span="6">
-                <div style="text-align: center;">
-                  <div style="font-size: 24px; font-weight: bold; color: #f56c6c;">{{ mrpStats.negativeStock }}</div>
-                  <div style="font-size: 12px; color: #606266;">负库存</div>
+                <div style="text-align: center">
+                  <div style="font-size: 24px; font-weight: bold; color: #f56c6c">
+                    {{ mrpStats.negativeStock }}
+                  </div>
+                  <div style="font-size: 12px; color: #606266">负库存</div>
                 </div>
               </el-col>
               <el-col :span="6">
-                <div style="text-align: center;">
-                  <div style="font-size: 24px; font-weight: bold; color: #e6a23c;">{{ mrpStats.zeroStock }}</div>
-                  <div style="font-size: 12px; color: #606266;">零库存</div>
+                <div style="text-align: center">
+                  <div style="font-size: 24px; font-weight: bold; color: #e6a23c">
+                    {{ mrpStats.zeroStock }}
+                  </div>
+                  <div style="font-size: 12px; color: #606266">零库存</div>
                 </div>
               </el-col>
             </el-row>
           </div>
-          <el-table
-            :data="mrpResultData"
-            style="width: 100%"
-            :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
-            :row-class-name="getMrpRowClass"
-            border
-            stripe
-            size="small"
-            v-loading="mrpLoading"
-          >
-            <el-table-column prop="materialCode" label="物料编码" min-width="120" show-overflow-tooltip/>
-            <el-table-column prop="materialName" label="物料名称" min-width="100" show-overflow-tooltip/>
+          <el-table :data="mrpResultData" style="width: 100%"
+            :header-cell-style="{ background: '#f5f7fa', color: '#606266' }" :row-class-name="getMrpRowClass" border
+            stripe size="small" v-loading="mrpLoading">
+            <el-table-column prop="materialCode" label="物料编码" min-width="120" show-overflow-tooltip />
+            <el-table-column prop="materialName" label="物料名称" min-width="100" show-overflow-tooltip />
             <el-table-column label="项目本批数" width="130" align="right">
               <template slot-scope="scope">
-            <span style="color: #e6a23c">
-              {{ formatFraction(scope.row.purchaseNotInStock) }}
-            </span>
+                <span style="color: #e6a23c">
+                  {{ formatFraction(scope.row.purchaseNotInStock) }}
+                </span>
               </template>
             </el-table-column>
 
             <el-table-column prop="availableStock" label="本项目可用库存" width="120" align="right">
               <template slot-scope="scope">
-                <span :style="{ color: scope.row.availableStock < 0 ? '#f56c6c' : '#67c23a' }">
+                <span :style="{
+                  color: scope.row.availableStock < 0 ? '#f56c6c' : '#67c23a',
+                }">
                   {{ scope.row.availableStock.toFixed(3) }}
                 </span>
               </template>
             </el-table-column>
             <el-table-column prop="realTimeStock" label="当前可用库存" width="100" align="right">
               <template slot-scope="scope">
-                <span :style="{ color: scope.row.realTimeStock < 0 ? '#f56c6c' : '#67c23a' }">
+                <span :style="{
+                  color: scope.row.realTimeStock < 0 ? '#f56c6c' : '#67c23a',
+                }">
                   {{ scope.row.realTimeStock.toFixed(3) }}
                 </span>
               </template>
             </el-table-column>
             <el-table-column prop="prodNotInStock" label="本次生产未入库" width="130" align="right">
               <template slot-scope="scope">
-                <span style="color: #e6a23c">{{ scope.row.prodNotInStock.toFixed(3) }}</span>
+                <span style="color: #e6a23c">{{
+                  scope.row.prodNotInStock.toFixed(3)
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="purchaseRequestQty" label="本项目采购申请" width="130" align="right">
               <template slot-scope="scope">
-                <span style="color: #409eff">{{ scope.row.purchaseRequestQty.toFixed(3) }}</span>
+                <span style="color: #409eff">{{
+                  scope.row.purchaseRequestQty.toFixed(3)
+                }}</span>
               </template>
             </el-table-column>
 
             <el-table-column prop="childNotPickedQty" label="子项未领料数量" width="130" align="right">
               <template slot-scope="scope">
-                <span style="color: #f56c6c">{{ scope.row.childNotPickedQty.toFixed(3) }}</span>
+                <span style="color: #f56c6c">{{
+                  scope.row.childNotPickedQty.toFixed(3)
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="createTime" label="创建时间" width="160" align="center">
@@ -475,306 +503,332 @@
           </el-table>
 
           <!-- 分页 -->
-          <el-pagination
-            @size-change="handleMrpSizeChange"
-            @current-change="handleMrpCurrentChange"
-            :current-page="mrpQueryParams.pageNum"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="mrpQueryParams.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="mrpTotal"
-            style="margin-top: 20px; text-align: right;"
-          />
+          <el-pagination @size-change="handleMrpSizeChange" @current-change="handleMrpCurrentChange"
+            :current-page="mrpQueryParams.pageNum" :page-sizes="[10, 20, 50, 100]" :page-size="mrpQueryParams.pageSize"
+            layout="total, sizes, prev, pager, next, jumper" :total="mrpTotal"
+            style="margin-top: 20px; text-align: right" />
         </el-card>
         <!-- 第四部分 工艺上传日志 -->
-        <el-card shadow="never" style="margin-top: 20px;">
+        <el-card shadow="never" style="margin-top: 20px">
           <div slot="header" class="clearfix">
-            <span style="font-weight: 600; font-size: 16px;">工艺上传日志</span>
+            <span style="font-weight: 600; font-size: 16px">工艺上传日志</span>
           </div>
 
           <!-- 概览统计 -->
-          <div style="margin-bottom: 16px; padding: 12px; background: #f5f7fa; border-radius: 4px; display:flex; gap:24px; align-items:center; flex-wrap: wrap;">
-            <div style="display:flex; align-items:center; gap:8px;">
+          <div style="
+              margin-bottom: 16px;
+              padding: 12px;
+              background: #f5f7fa;
+              border-radius: 4px;
+              display: flex;
+              gap: 24px;
+              align-items: center;
+              flex-wrap: wrap;
+            ">
+            <div style="display: flex; align-items: center; gap: 8px">
               <el-tag type="success" size="small">成功</el-tag>
-              <span style="font-weight: 600; color: #67C23A;">{{ processLogCounts.success }}</span>
+              <span style="font-weight: 600; color: #67c23a">{{
+                processLogCounts.success
+              }}</span>
             </div>
-            <div style="display:flex; align-items:center; gap:8px;">
+            <div style="display: flex; align-items: center; gap: 8px">
               <el-tag type="warning" size="small">重复</el-tag>
-              <span style="font-weight: 600; color: #E6A23C;">{{ processLogCounts.duplicate }}</span>
+              <span style="font-weight: 600; color: #e6a23c">{{
+                processLogCounts.duplicate
+              }}</span>
             </div>
-            <div style="display:flex; align-items:center; gap:8px;">
+            <div style="display: flex; align-items: center; gap: 8px">
               <el-tag type="danger" size="small">失败</el-tag>
-              <span style="font-weight: 600; color: #F56C6C;">{{ processLogCounts.failed }}</span>
+              <span style="font-weight: 600; color: #f56c6c">{{
+                processLogCounts.failed
+              }}</span>
             </div>
-            <div style="margin-left:auto; color:#606266; font-size:13px;">
-              <i class="el-icon-time" style="margin-right: 4px;"></i>
-              <span v-if="processUploadLog.time">{{ processUploadLog.time }}</span>
-              <span v-else style="color: #909399;">暂无时间信息</span>
+            <div style="margin-left: auto; color: #606266; font-size: 13px">
+              <i class="el-icon-time" style="margin-right: 4px"></i>
+              <span v-if="processUploadLog.time">{{
+                processUploadLog.time
+              }}</span>
+              <span v-else style="color: #909399">暂无时间信息</span>
             </div>
           </div>
 
           <!-- 拉取按钮 -->
-          <div style="margin-bottom: 16px;">
-            <el-button type="primary" size="small" @click="fetchProcessLog" :loading="processLogLoading" :disabled="!productionObj || !productionObj.id" icon="el-icon-refresh">
+          <div style="margin-bottom: 16px">
+            <el-button type="primary" size="small" @click="fetchProcessLog" :loading="processLogLoading"
+              :disabled="!productionObj || !productionObj.id" icon="el-icon-refresh">
               拉取最新日志
             </el-button>
-            <el-button size="small" @click="clearProcessLog" icon="el-icon-delete" style="margin-left: 8px;">清空</el-button>
+            <el-button size="small" @click="clearProcessLog" icon="el-icon-delete"
+              style="margin-left: 8px">清空</el-button>
           </div>
 
           <!-- 成功上传（结构化显示） -->
-          <div v-if="processUploadLog.successfulRoutes && processUploadLog.successfulRoutes.length" style="margin-bottom: 20px;">
-            <div style="margin-bottom: 12px; padding: 8px 12px; background: #f0f9ff; border-left: 4px solid #67C23A; border-radius: 4px;">
-              <span style="font-weight: 600; color:#67C23A; font-size: 14px;">
-                <i class="el-icon-success" style="margin-right: 6px;"></i>
+          <div v-if="
+            processUploadLog.successfulRoutes &&
+            processUploadLog.successfulRoutes.length
+          " style="margin-bottom: 20px">
+            <div style="
+                margin-bottom: 12px;
+                padding: 8px 12px;
+                background: #f0f9ff;
+                border-left: 4px solid #67c23a;
+                border-radius: 4px;
+              ">
+              <span style="font-weight: 600; color: #67c23a; font-size: 14px">
+                <i class="el-icon-success" style="margin-right: 6px"></i>
                 成功上传（{{ processUploadLog.successfulRoutes.length }}）
               </span>
-              <span style="margin-left:12px; color:#909399; font-size:12px;">工序行数：{{ successFlatRows.length }}</span>
+              <span style="margin-left: 12px; color: #909399; font-size: 12px">工序行数：{{ successFlatRows.length }}</span>
             </div>
-            <el-table :data="successFlatPagedRows" size="small" border stripe style="width: 100%;">
-              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip/>
-              <el-table-column prop="materialName" label="物料名称" width="180" show-overflow-tooltip/>
-              <el-table-column prop="processNo" label="工序号" width="90" align="center"/>
-              <el-table-column prop="workCenter" label="工作中心" width="120" show-overflow-tooltip/>
-              <el-table-column prop="processName" label="工序名称" width="120" show-overflow-tooltip/>
-              <el-table-column prop="activityUnit" label="工序单位" width="80" align="center"/>
-              <el-table-column prop="processControl" label="工序控制" width="120" show-overflow-tooltip/>
-              <el-table-column prop="activityDuration" label="工序时长" width="100" align="center"/>
-              <el-table-column prop="processDescription" label="工序描述" min-width="150" show-overflow-tooltip/>
-              <el-table-column prop="processNameDescription" label="材质/备注" width="140" show-overflow-tooltip/>
+            <el-table :data="successFlatPagedRows" size="small" border stripe style="width: 100%">
+              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip />
+              <el-table-column prop="materialName" label="物料名称" width="180" show-overflow-tooltip />
+              <el-table-column prop="processNo" label="工序号" width="90" align="center" />
+              <el-table-column prop="workCenter" label="工作中心" width="120" show-overflow-tooltip />
+              <el-table-column prop="processName" label="工序名称" width="120" show-overflow-tooltip />
+              <el-table-column prop="activityUnit" label="工序单位" width="80" align="center" />
+              <el-table-column prop="processControl" label="工序控制" width="120" show-overflow-tooltip />
+              <el-table-column prop="activityDuration" label="工序时长" width="100" align="center" />
+              <el-table-column prop="processDescription" label="工序描述" min-width="150" show-overflow-tooltip />
+              <el-table-column prop="processNameDescription" label="材质/备注" width="140" show-overflow-tooltip />
             </el-table>
-            <pagination
-              v-show="successFlatRows.length > 0"
-              :total="successFlatRows.length"
-              :page.sync="processSuccessPage.pageNum"
-              :limit.sync="processSuccessPage.pageSize"
-              @pagination="() => {}"
-              style="margin-top: 12px;"
-            />
+            <pagination v-show="successFlatRows.length > 0" :total="successFlatRows.length"
+              :page.sync="processSuccessPage.pageNum" :limit.sync="processSuccessPage.pageSize" @pagination="() => { }"
+              style="margin-top: 12px" />
           </div>
 
           <!-- 重复 -->
-          <div v-if="processUploadLog.duplicateRoutes && processUploadLog.duplicateRoutes.length" style="margin-bottom: 20px;">
-            <div style="margin-bottom: 12px; padding: 8px 12px; background: #fdf6ec; border-left: 4px solid #E6A23C; border-radius: 4px;">
-              <span style="font-weight: 600; color:#E6A23C; font-size: 14px;">
-                <i class="el-icon-warning" style="margin-right: 6px;"></i>
+          <div v-if="
+            processUploadLog.duplicateRoutes &&
+            processUploadLog.duplicateRoutes.length
+          " style="margin-bottom: 20px">
+            <div style="
+                margin-bottom: 12px;
+                padding: 8px 12px;
+                background: #fdf6ec;
+                border-left: 4px solid #e6a23c;
+                border-radius: 4px;
+              ">
+              <span style="font-weight: 600; color: #e6a23c; font-size: 14px">
+                <i class="el-icon-warning" style="margin-right: 6px"></i>
                 重复（{{ processUploadLog.duplicateRoutes.length }}）
               </span>
             </div>
-            <div style="padding: 12px; background: #fafafa; border-radius: 4px;">
-              <el-tag 
-                v-for="(dup, idx) in processUploadLog.duplicateRoutes" 
-                :key="idx" 
-                type="warning" 
-                size="small"
-                style="margin-right:8px; margin-bottom:8px; padding: 4px 12px;">
+            <div style="padding: 12px; background: #fafafa; border-radius: 4px">
+              <el-tag v-for="(dup, idx) in processUploadLog.duplicateRoutes" :key="idx" type="warning" size="small"
+                style="margin-right: 8px; margin-bottom: 8px; padding: 4px 12px">
                 {{ dup }}
               </el-tag>
             </div>
           </div>
 
           <!-- 失败 -->
-          <div v-if="processUploadLog.failedRoutes && processUploadLog.failedRoutes.length">
-            <div style="margin-bottom: 12px; padding: 8px 12px; background: #fef0f0; border-left: 4px solid #F56C6C; border-radius: 4px;">
-              <span style="font-weight: 600; color:#F56C6C; font-size: 14px;">
-                <i class="el-icon-error" style="margin-right: 6px;"></i>
+          <div v-if="
+            processUploadLog.failedRoutes &&
+            processUploadLog.failedRoutes.length
+          ">
+            <div style="
+                margin-bottom: 12px;
+                padding: 8px 12px;
+                background: #fef0f0;
+                border-left: 4px solid #f56c6c;
+                border-radius: 4px;
+              ">
+              <span style="font-weight: 600; color: #f56c6c; font-size: 14px">
+                <i class="el-icon-error" style="margin-right: 6px"></i>
                 失败（{{ processUploadLog.failedRoutes.length }}）
               </span>
             </div>
-            <el-table :data="processFailedPagedItems" size="small" border stripe style="width: 100%;">
-              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip/>
+            <el-table :data="processFailedPagedItems" size="small" border stripe style="width: 100%">
+              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip />
               <el-table-column prop="errorMessage" label="错误信息" min-width="200" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <span style="color: #F56C6C;">{{ scope.row.errorMessage }}</span>
+                  <span style="color: #f56c6c">{{
+                    scope.row.errorMessage
+                  }}</span>
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              v-show="processUploadLog.failedRoutes && processUploadLog.failedRoutes.length > 0"
-              :total="processUploadLog.failedRoutes.length"
-              :page.sync="processFailedPage.pageNum"
-              :limit.sync="processFailedPage.pageSize"
-              @pagination="() => {}"
-              style="margin-top: 12px;"
-            />
+            <pagination v-show="processUploadLog.failedRoutes &&
+              processUploadLog.failedRoutes.length > 0
+              " :total="processUploadLog.failedRoutes.length" :page.sync="processFailedPage.pageNum"
+              :limit.sync="processFailedPage.pageSize" @pagination="() => { }" style="margin-top: 12px" />
           </div>
 
           <!-- 空状态 -->
-          <el-empty 
-            v-if="(!processUploadLog.successfulRoutes || processUploadLog.successfulRoutes.length === 0) && (!processUploadLog.duplicateRoutes || processUploadLog.duplicateRoutes.length === 0) && (!processUploadLog.failedRoutes || processUploadLog.failedRoutes.length === 0)"
-            description="暂无工艺上传日志数据"
-            :image-size="100"
-            style="padding: 40px 0;">
+          <el-empty v-if="
+            (!processUploadLog.successfulRoutes ||
+              processUploadLog.successfulRoutes.length === 0) &&
+            (!processUploadLog.duplicateRoutes ||
+              processUploadLog.duplicateRoutes.length === 0) &&
+            (!processUploadLog.failedRoutes ||
+              processUploadLog.failedRoutes.length === 0)
+          " description="暂无工艺上传日志数据" :image-size="100" style="padding: 40px 0">
           </el-empty>
         </el-card>
 
         <!-- 第五部分 BOM上传日志 -->
-        <el-card shadow="never" style="margin-top: 20px;">
+        <el-card shadow="never" style="margin-top: 20px">
           <div slot="header" class="clearfix">
-            <span style="font-weight: 600; font-size: 16px;">BOM上传日志</span>
+            <span style="font-weight: 600; font-size: 16px">BOM上传日志</span>
           </div>
 
           <!-- 概览统计 -->
-          <div style="margin-bottom: 16px; padding: 12px; background: #f5f7fa; border-radius: 4px; display:flex; gap:24px; align-items:center; flex-wrap: wrap;">
-            <div style="display:flex; align-items:center; gap:8px;">
+          <div style="
+              margin-bottom: 16px;
+              padding: 12px;
+              background: #f5f7fa;
+              border-radius: 4px;
+              display: flex;
+              gap: 24px;
+              align-items: center;
+              flex-wrap: wrap;
+            ">
+            <div style="display: flex; align-items: center; gap: 8px">
               <el-tag type="success" size="small">成功</el-tag>
-              <span style="font-weight: 600; color: #67C23A;">{{ bomLogCounts.success }}</span>
+              <span style="font-weight: 600; color: #67c23a">{{
+                bomLogCounts.success
+              }}</span>
             </div>
-            <div style="display:flex; align-items:center; gap:8px;">
+            <div style="display: flex; align-items: center; gap: 8px">
               <el-tag type="info" size="small">已存在</el-tag>
-              <span style="font-weight: 600; color: #909399;">{{ bomLogCounts.exists }}</span>
+              <span style="font-weight: 600; color: #909399">{{
+                bomLogCounts.exists
+              }}</span>
             </div>
-            <div style="display:flex; align-items:center; gap:8px;">
+            <div style="display: flex; align-items: center; gap: 8px">
               <el-tag type="danger" size="small">失败</el-tag>
-              <span style="font-weight: 600; color: #F56C6C;">{{ bomLogCounts.failed }}</span>
+              <span style="font-weight: 600; color: #f56c6c">{{
+                bomLogCounts.failed
+              }}</span>
             </div>
-            <div style="margin-left:auto; color:#606266; font-size:13px;">
+            <div style="margin-left: auto; color: #606266; font-size: 13px">
               <span>总计：{{ bomLogCounts.total }}</span>
             </div>
           </div>
 
           <!-- 拉取按钮 -->
-          <div style="margin-bottom: 16px;">
-            <el-button type="primary" size="small" @click="fetchBomLog" :loading="bomLogLoading" :disabled="!productionObj || !productionObj.productionOrderNo" icon="el-icon-refresh">
+          <div style="margin-bottom: 16px">
+            <el-button type="primary" size="small" @click="fetchBomLog" :loading="bomLogLoading"
+              :disabled="!productionObj || !productionObj.productionOrderNo" icon="el-icon-refresh">
               拉取最新日志
             </el-button>
-            <el-button size="small" @click="clearBomLog" icon="el-icon-delete" style="margin-left: 8px;">清空</el-button>
+            <el-button size="small" @click="clearBomLog" icon="el-icon-delete" style="margin-left: 8px">清空</el-button>
           </div>
 
           <!-- 成功上传 -->
-          <div v-if="bomLogCounts.success > 0" style="margin-bottom: 20px;">
-            <div style="margin-bottom: 12px; padding: 8px 12px; background: #f0f9ff; border-left: 4px solid #67C23A; border-radius: 4px;">
-              <span style="font-weight: 600; color:#67C23A; font-size: 14px;">
-                <i class="el-icon-success" style="margin-right: 6px;"></i>
+          <div v-if="bomLogCounts.success > 0" style="margin-bottom: 20px">
+            <div style="
+                margin-bottom: 12px;
+                padding: 8px 12px;
+                background: #f0f9ff;
+                border-left: 4px solid #67c23a;
+                border-radius: 4px;
+              ">
+              <span style="font-weight: 600; color: #67c23a; font-size: 14px">
+                <i class="el-icon-success" style="margin-right: 6px"></i>
                 成功上传（{{ bomLogCounts.success }}）
               </span>
             </div>
-            <el-table 
-              :data="bomSuccessPagedItems" 
-              size="small" 
-              border 
-              stripe 
-              style="width: 100%;">
-              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip/>
+            <el-table :data="bomSuccessPagedItems" size="small" border stripe style="width: 100%">
+              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip />
               <el-table-column prop="reason" label="说明" min-width="200" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <span style="color: #67C23A;">{{ scope.row.reason }}</span>
+                  <span style="color: #67c23a">{{ scope.row.reason }}</span>
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              v-show="bomLogCounts.success > 0"
-              :total="bomLogCounts.success"
-              :page.sync="bomSuccessPage.pageNum"
-              :limit.sync="bomSuccessPage.pageSize"
-              @pagination="() => {}"
-              style="margin-top: 12px;"
-            />
+            <pagination v-show="bomLogCounts.success > 0" :total="bomLogCounts.success"
+              :page.sync="bomSuccessPage.pageNum" :limit.sync="bomSuccessPage.pageSize" @pagination="() => { }"
+              style="margin-top: 12px" />
           </div>
 
           <!-- 已存在 -->
-          <div v-if="bomLogCounts.exists > 0" style="margin-bottom: 20px;">
-            <div style="margin-bottom: 12px; padding: 8px 12px; background: #f4f4f5; border-left: 4px solid #909399; border-radius: 4px;">
-              <span style="font-weight: 600; color:#909399; font-size: 14px;">
-                <i class="el-icon-info" style="margin-right: 6px;"></i>
+          <div v-if="bomLogCounts.exists > 0" style="margin-bottom: 20px">
+            <div style="
+                margin-bottom: 12px;
+                padding: 8px 12px;
+                background: #f4f4f5;
+                border-left: 4px solid #909399;
+                border-radius: 4px;
+              ">
+              <span style="font-weight: 600; color: #909399; font-size: 14px">
+                <i class="el-icon-info" style="margin-right: 6px"></i>
                 已存在且一致（{{ bomLogCounts.exists }}）
               </span>
             </div>
-            <el-table 
-              :data="bomExistsPagedItems" 
-              size="small" 
-              border 
-              stripe 
-              style="width: 100%;">
-              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip/>
+            <el-table :data="bomExistsPagedItems" size="small" border stripe style="width: 100%">
+              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip />
               <el-table-column prop="reason" label="说明" min-width="200" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <span style="color: #909399;">{{ scope.row.reason }}</span>
+                  <span style="color: #909399">{{ scope.row.reason }}</span>
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              v-show="bomLogCounts.exists > 0"
-              :total="bomLogCounts.exists"
-              :page.sync="bomExistsPage.pageNum"
-              :limit.sync="bomExistsPage.pageSize"
-              @pagination="() => {}"
-              style="margin-top: 12px;"
-            />
+            <pagination v-show="bomLogCounts.exists > 0" :total="bomLogCounts.exists" :page.sync="bomExistsPage.pageNum"
+              :limit.sync="bomExistsPage.pageSize" @pagination="() => { }" style="margin-top: 12px" />
           </div>
 
           <!-- 失败 -->
-          <div v-if="bomLogCounts.failed > 0" style="margin-bottom: 20px;">
-            <div style="margin-bottom: 12px; padding: 8px 12px; background: #fef0f0; border-left: 4px solid #F56C6C; border-radius: 4px;">
-              <span style="font-weight: 600; color:#F56C6C; font-size: 14px;">
-                <i class="el-icon-error" style="margin-right: 6px;"></i>
+          <div v-if="bomLogCounts.failed > 0" style="margin-bottom: 20px">
+            <div style="
+                margin-bottom: 12px;
+                padding: 8px 12px;
+                background: #fef0f0;
+                border-left: 4px solid #f56c6c;
+                border-radius: 4px;
+              ">
+              <span style="font-weight: 600; color: #f56c6c; font-size: 14px">
+                <i class="el-icon-error" style="margin-right: 6px"></i>
                 失败（{{ bomLogCounts.failed }}）
               </span>
             </div>
-            <el-table 
-              :data="bomFailedPagedItems" 
-              size="small" 
-              border 
-              stripe 
-              style="width: 100%;">
-              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip/>
+            <el-table :data="bomFailedPagedItems" size="small" border stripe style="width: 100%">
+              <el-table-column prop="materialCode" label="物料编码" width="160" show-overflow-tooltip />
               <el-table-column prop="reason" label="错误信息" min-width="200" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <span style="color: #F56C6C;">{{ formatBomErrorReason(scope.row.reason) }}</span>
+                  <span style="color: #f56c6c">{{
+                    formatBomErrorReason(scope.row.reason)
+                  }}</span>
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              v-show="bomLogCounts.failed > 0"
-              :total="bomLogCounts.failed"
-              :page.sync="bomFailedPage.pageNum"
-              :limit.sync="bomFailedPage.pageSize"
-              @pagination="() => {}"
-              style="margin-top: 12px;"
-            />
+            <pagination v-show="bomLogCounts.failed > 0" :total="bomLogCounts.failed" :page.sync="bomFailedPage.pageNum"
+              :limit.sync="bomFailedPage.pageSize" @pagination="() => { }" style="margin-top: 12px" />
           </div>
 
           <!-- 空状态 -->
-          <el-empty 
-            v-if="bomLogCounts.total === 0"
-            description="暂无BOM上传日志数据"
-            :image-size="100"
-            style="padding: 40px 0;">
+          <el-empty v-if="bomLogCounts.total === 0" description="暂无BOM上传日志数据" :image-size="100" style="padding: 40px 0">
           </el-empty>
         </el-card>
-        
+
         <!-- 新增/编辑弹窗 -->
-        <el-dialog :title="isEditChain ? '编辑销齿链型号' : '新增销齿链型号'" :visible.sync="chainDialogVisible"
-          width="420px"  append-to-body >
+        <el-dialog :title="isEditChain ? '编辑销齿链型号' : '新增销齿链型号'" :visible.sync="chainDialogVisible" width="420px"
+          append-to-body>
           <el-form :model="chainForm" label-width="100px">
-            <div
-              style="margin-bottom: 16px; padding: 12px; background-color: #f0f9ff; border: 1px solid #b3d8ff; border-radius: 4px; color: #409eff; font-size: 13px;">
-              <i class="el-icon-info" style="margin-right: 6px;"></i>
+            <div style="
+                margin-bottom: 16px;
+                padding: 12px;
+                background-color: #f0f9ff;
+                border: 1px solid #b3d8ff;
+                border-radius: 4px;
+                color: #409eff;
+                font-size: 13px;
+              ">
+              <i class="el-icon-info" style="margin-right: 6px"></i>
               <strong>操作说明：</strong>可以先搜索选择已有型号自动填充，或直接手动填写所有必填字段（带*号）
             </div>
             <el-form-item label="销齿链型号">
-              <div style="margin-bottom: 8px; color: #909399; font-size: 12px;">
+              <div style="margin-bottom: 8px; color: #909399; font-size: 12px">
                 可选择已有型号或手动填写所有信息
               </div>
-              <el-select
-                v-model="chainForm.id"
-                filterable
-                remote
-                reserve-keyword
-                :placeholder="isEditChain ? '编辑模式不使用此项' : '请输入行程/类型/名称/产品名（可选）'"
-                :remote-method="searchRigidChain"
-                :loading="chainLoading"
-                @change="onRigidChainSelect"
-                popper-class="chain-autocomplete-dropdown"
-                :default-first-option="false"
-                :disabled="isEditChain"
-                clearable
-              >
-                <el-option
-                  v-for="item in rigidChainOptions"
-                  :key="item.id"
-                  :label="item.productName"
-                  :value="item.id"
-                >
+              <el-select v-model="chainForm.id" filterable remote reserve-keyword :placeholder="isEditChain
+                  ? '编辑模式不使用此项'
+                  : '请输入行程/类型/名称/产品名（可选）'
+                " :remote-method="searchRigidChain" :loading="chainLoading" @change="onRigidChainSelect"
+                popper-class="chain-autocomplete-dropdown" :default-first-option="false" :disabled="isEditChain"
+                clearable>
+                <el-option v-for="item in rigidChainOptions" :key="item.id" :label="item.productName" :value="item.id">
                   <div class="chain-suggestion-item">
                     <div class="chain-name">{{ item.figureNumber }}</div>
                     <div class="chain-info">
@@ -788,7 +842,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="生产令号">
-              <el-input v-model="chainForm.productionCode" placeholder="请输入生产令号" disabled/>
+              <el-input v-model="chainForm.productionCode" placeholder="请输入生产令号" disabled />
             </el-form-item>
             <el-form-item label="物料类型">
               <el-select v-model="chainForm.productType" placeholder="请选择类型" clearable>
@@ -805,39 +859,55 @@
               </el-select>
             </el-form-item>
             <el-form-item label="物料编码" required>
-              <el-input v-model="chainForm.figureNumber" placeholder="请输入图号"/>
+              <el-input v-model="chainForm.figureNumber" placeholder="请输入图号" />
             </el-form-item>
             <el-form-item label="物料名称" required>
-              <el-input v-model="chainForm.figureName" placeholder="请输入名称"/>
+              <el-input v-model="chainForm.figureName" placeholder="请输入名称" />
             </el-form-item>
             <el-form-item label="物料数量" required>
-              <el-input v-model="chainForm.figureNum" placeholder="请输入数量" type="number" min="1"/>
+              <el-input v-model="chainForm.figureNum" placeholder="请输入数量" type="number" min="1" />
             </el-form-item>
             <!-- 文件路径和DWG上传，企标可编辑，非企标只读+可上传 -->
             <el-form-item label="文件路径">
               <div>
-                <el-select
-                  v-model="chainForm.selectedFileType"
-                  placeholder="请选择文件类型"
-                  @change="onConfigIniSelect"
-                  filterable
-                  clearable
-                >
-                  <el-option
-                    v-for="item in configIniOptions"
-                    :key="item.fileType"
-                    :label="item.fileType"
-                    :value="item.fileType"
-                  />
+                <el-select v-model="chainForm.selectedFileType" placeholder="请选择文件类型" @change="onConfigIniSelect"
+                  filterable clearable>
+                  <el-option v-for="item in configIniOptions" :key="item.fileType" :label="item.fileType"
+                    :value="item.fileType" />
                 </el-select>
               </div>
               <div>
-                <el-input v-model="chainForm.drawPath" placeholder="请输入文件路径"/>
+                <el-input v-model="chainForm.drawPath" placeholder="请输入文件路径" />
               </div>
             </el-form-item>
-            
+            <el-form-item label="文件类型">
+              <el-select v-model="chainForm.fileType" placeholder="请选择文件类型" clearable>
+                <el-option label="二维" value="二维" />
+                <el-option label="三维" value="三维" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="出图人">
+              <el-select v-model="chainForm.drawBy" placeholder="请选择出图人" clearable>
+                <el-option
+                  v-for="d in dict.type.plan_proer || []"
+                  :key="d.value"
+                  :label="d.label"
+                  :value="d.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="出图时间">
+              <el-date-picker
+                clearable
+                v-model="chainForm.drawTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="'09:00:00'"
+                placeholder="请选择出图时间"
+              />
+            </el-form-item>
           </el-form>
-          <div slot="footer" class="dialog-footer" style="text-align: right;">
+          <div slot="footer" class="dialog-footer" style="text-align: right">
             <el-button @click="chainDialogVisible = false">取 消</el-button>
             <el-button type="primary" @click="saveChainForm">确 定</el-button>
           </div>
@@ -845,18 +915,15 @@
       </div>
     </el-drawer>
 
-
-    <el-drawer
-      title="BOM明细 " :visible.sync="bomDrawer" direction="rtl" :size="1500">
-      <div style="padding: 20px;">
-        <bomInfo v-if="bomDrawer" :params="bomParams"/>
+    <el-drawer title="BOM明细 " :visible.sync="bomDrawer" direction="rtl" :size="1500">
+      <div style="padding: 20px">
+        <bomInfo v-if="bomDrawer" :params="bomParams" />
       </div>
     </el-drawer>
 
-    <el-drawer
-      title="工艺路线 " :visible.sync="processDrawer" direction="rtl" :size="1500">
-      <div style="padding: 20px;">
-        <processInfo v-if="processDrawer" :params="processParams"/>
+    <el-drawer title="工艺路线 " :visible.sync="processDrawer" direction="rtl" :size="1500">
+      <div style="padding: 20px">
+        <processInfo v-if="processDrawer" :params="processParams" />
       </div>
     </el-drawer>
 
@@ -864,32 +931,45 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="生产令号" prop="productionOrderNo">
-          <el-input v-model="form.productionOrderNo" placeholder="请输入生产令号"/>
+          <el-input v-model="form.productionOrderNo" placeholder="请输入生产令号" />
         </el-form-item>
         <el-form-item label="项目名称" prop="productionName">
-          <el-input v-model="form.productionName" placeholder="请输入项目名称"/>
+          <el-input v-model="form.productionName" placeholder="请输入项目名称" />
         </el-form-item>
         <!-- 新增：产品图片上传功能 -->
-        <el-form-item label="产品图片">
-          <image-upload v-model="form.drawingPath" :limit="1" :file-size="5"/>
+        <el-form-item label="执行单图">
+          <image-upload v-model="form.drawingPath" :limit="9" :file-size="5" />
         </el-form-item>
+        <el-form-item label="DWG" prop="quantity">
+          <el-switch
+            v-model="form.quantity"
+            :active-value="1"
+            :inactive-value="0"
+            active-text="允许下载"
+            inactive-text="不允许下载"
+          />
+        </el-form-item>
+
         <el-form-item label="完成时间" prop="projectEndTime">
-          <el-date-picker clearable
-                          v-model="form.projectEndTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择项目完成时间">
+          <el-date-picker clearable v-model="form.projectEndTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择项目完成时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="计量单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入计量单位"/>
+          <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
-        <el-form-item label="是否企标" prop="isEnterpriseStandard">
-          <el-select v-model="form.isEnterpriseStandard" placeholder="请选择是否企标" clearable>
-            <el-option label="非标单" :value="0"/>
-            <el-option label="变更单" :value="2"/>
-            <el-option label="企标单" :value="1"/>
-          </el-select>
+
+        <el-form-item label="工艺上传更新时间" prop="routeUptime" label-width="140px">
+          <el-date-picker clearable v-model="form.routeUptime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择时间" />
+        </el-form-item>
+        <el-form-item label="排产计划更新时间" prop="planUptime" label-width="140px">
+          <el-date-picker clearable v-model="form.planUptime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择时间" />
+        </el-form-item>
+        <el-form-item label="BOM/物料更新时间" prop="bomUptime" label-width="140px">
+          <el-date-picker clearable v-model="form.bomUptime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择时间" />
         </el-form-item>
         <!--        &lt;!&ndash; 文件路径输入框，非企标时只读 &ndash;&gt;
                 <el-form-item label="文件路径" prop="drawingPath">
@@ -910,7 +990,7 @@
   vertical-align: top;
 }
 
-.el-dropdown + .el-dropdown {
+.el-dropdown+.el-dropdown {
   margin-left: 15px;
 }
 
@@ -935,25 +1015,26 @@ import {
   exportRoute3,
   getMRPResults,
   getRouteLog,
-  getBomUploadStatus
+  getBomUploadStatus,
 } from "@/api/system/orderPro";
-import {processList} from "../../../api/system/orderPro";
-import {listRigidChain} from '@/api/system/pcRigidChain';
-import {addProduct, updateProduct} from '@/api/system/orderPro';
-import {getstate} from '@/utils/external-api';
-import {listConfigIni} from '@/api/system/configIni';
-import ImageUpload from '@/components/ImageUpload';
-import {getToken} from '@/utils/auth';
-import axios from 'axios';
-import bomInfo from '@/views/system/details/index.vue'; //bom明细
-import processInfo from '@/views/system/route/index.vue'; //工艺信息
-import {listMrp, exportMrp} from '@/api/system/mrp';
-import {importElectricalBom} from '@/api/system/details';
+import { processList } from "../../../api/system/orderPro";
+import { listRigidChain } from "@/api/system/pcRigidChain";
+import { addProduct, updateProduct } from "@/api/system/orderPro";
+import { getstate } from "@/utils/external-api";
+import { listConfigIni } from "@/api/system/configIni";
+import ImageUpload from "@/components/ImageUpload";
+import { getToken } from "@/utils/auth";
+import axios from "axios";
+import bomInfo from "@/views/system/details/index.vue"; //bom明细
+import processInfo from "@/views/system/route/index.vue"; //工艺信息
+import { listMrp, exportMrp } from "@/api/system/mrp";
+import { importElectricalBom } from "@/api/system/details";
+import { updateProductionOrders, updateCgOrders } from "@/api/system/route";
 import dayjs from "dayjs";
 
 export default {
   name: "OrderPro",
-  dicts: ['process_status'],
+  dicts: ["process_status", "plan_proer"],
   components: {
     ImageUpload,
     bomInfo,
@@ -966,7 +1047,7 @@ export default {
       // 进度
       percentage: 0,
       drawer: false,
-      direction: 'rtl',
+      direction: "rtl",
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -1005,7 +1086,17 @@ export default {
         unit: undefined,
         quantity: undefined,
         isEnterpriseStandard: undefined,
-        drawingPath: undefined
+        isEnterpriseStandardList: undefined,
+        whetherDelay: undefined,
+        drawingPath: undefined,
+        routeUptime: undefined,
+        planUptime: undefined,
+        bomUptime: undefined,
+        drawingTime: undefined,
+        bomCount: undefined,
+        materialCount: undefined,
+        routeCount: undefined,
+        drawingBy: undefined,
       },
       // 表单参数
       form: {},
@@ -1022,62 +1113,65 @@ export default {
       mrpResultData: [],
       mrpLoading: false,
       mrpTotal: 0,
-      mrpSearchKeyword: '',
+      mrpSearchKeyword: "",
       mrpQueryParams: {
         pageNum: 1,
         pageSize: 10,
-        materialName: '',
-        materialCode: '',
-        orderProId: null
+        materialName: "",
+        materialCode: "",
+        orderProId: null,
       },
       loadingMRP: false,
-      mrpOperationStatus: '', // MRP运算状态
+      mrpOperationStatus: "", // MRP运算状态
       exportLoading: false, // 导出加载状态
       mrpStats: {
         totalMaterials: 0,
         positiveStock: 0,
         negativeStock: 0,
-        zeroStock: 0
+        zeroStock: 0,
       },
       // 表单校验
       rules: {
-
         productionOrderNo: [
-          {required: true, message: "生产令号不能为空", trigger: "blur"}
+          { required: true, message: "生产令号不能为空", trigger: "blur" },
         ],
         productionName: [
-          {required: true, message: "项目名称不能为空", trigger: "blur"}
+          { required: true, message: "项目名称不能为空", trigger: "blur" },
         ],
         drawingNo: [
-          {required: true, message: "图号不能为空", trigger: "blur"}
+          { required: true, message: "图号不能为空", trigger: "blur" },
         ],
         drawingName: [
-          {required: true, message: "名称不能为空", trigger: "blur"}
+          { required: true, message: "名称不能为空", trigger: "blur" },
         ],
 
         drawingType: [
           {
             validator: (rule, value, callback) => {
               if (this.form.isEnterpriseStandard === 1 && !value) {
-                callback(new Error('图纸类型不能为空'));
+                callback(new Error("图纸类型不能为空"));
               } else {
                 callback();
               }
             },
-            trigger: "change"
-          }
+            trigger: "change",
+          },
         ],
         projectEndTime: [
-          {required: true, message: "项目完成时间不能为空", trigger: "blur"}
+          { required: true, message: "项目完成时间不能为空", trigger: "blur" },
         ],
         unit: [
-          {required: true, message: "计量单位不能为空", trigger: "blur"}
+          { required: true, message: "计量单位不能为空", trigger: "blur" },
         ],
         quantity: [
-          {required: true, message: "数量不能为空", trigger: "blur"}
+          { required: true, message: "数量不能为空", trigger: "blur" },
         ],
         isEnterpriseStandard: [
-          {required: true, message: "是否企标 (0-否, 1-是)不能为空", trigger: "blur"}
+          {
+            required: true,
+            message: "是否企标 (0-否, 1-是)不能为空",
+            trigger: "blur",
+          },
         ],
         /*  drawingPath: [
             {
@@ -1093,21 +1187,24 @@ export default {
           ]*/
       },
       productionObj: null,
-      id: '',
+      id: "",
       // 销齿链型号表单
       chainTable: [], // 销齿链型号表格数据
       chainForm: {
-        pid: '',
-        productionCode: '',
-        productType: '',
-        figureNumber: '',
-        figureName: '',
-        figureNum: '',
-        jdInventory: '',
-        axialType: '',
-        boxType: '',
-        selectedFileType: '',
-        drawPath: '',
+        pid: "",
+        productionCode: "",
+        productType: "",
+        figureNumber: "",
+        figureName: "",
+        figureNum: "",
+        jdInventory: "",
+        axialType: "",
+        boxType: "",
+        selectedFileType: "",
+        drawPath: "",
+        fileType: "",
+        drawBy: "",
+        drawTime: "",
         id: undefined,
       },
       chainDialogVisible: false, // 控制新增/编辑弹窗
@@ -1118,13 +1215,13 @@ export default {
       journeyOptions: [],
       chainLoading: false,
       selectedChainIds: [],
-      drawLog: '', // 出图日志内容
+      drawLog: "", // 出图日志内容
       drawLoading: false, // 出图按钮 loading
       currentPid: null, // 当前项目id
       configIniOptions: [], // 文件类型下拉选项
-      dwgUploadUrl: process.env.VUE_APP_BASE_API + '/system/orderPro/uploadDwg',
+      dwgUploadUrl: process.env.VUE_APP_BASE_API + "/system/orderPro/uploadDwg",
       uploadHeaders: {
-        Authorization: 'Bearer ' + getToken()
+        Authorization: "Bearer " + getToken(),
       },
       // DWG 上传大小阈值（MB），用于前端预校验与提示
       dwgMaxSizeMB: 100,
@@ -1133,7 +1230,7 @@ export default {
         time: null,
         successfulRoutes: [],
         duplicateRoutes: [],
-        failedRoutes: []
+        failedRoutes: [],
       },
       processLogLoading: false,
       // 工艺日志分页
@@ -1141,13 +1238,13 @@ export default {
       processFailedPage: { pageNum: 1, pageSize: 10 },
       // BOM上传日志
       bomUploadLog: {
-        items: []
+        items: [],
       },
       bomLogLoading: false,
       // BOM日志分页
       bomSuccessPage: { pageNum: 1, pageSize: 10 },
       bomExistsPage: { pageNum: 1, pageSize: 10 },
-      bomFailedPage: { pageNum: 1, pageSize: 10 }
+      bomFailedPage: { pageNum: 1, pageSize: 10 },
     };
   },
   created() {
@@ -1155,55 +1252,63 @@ export default {
     this.getDrawingTypeOptions();
     this.getConfigIniOptions(); // 新增
 
-    this.$api = {addProduct, updateProduct};
+    this.$api = { addProduct, updateProduct };
   },
   watch: {
-    'form.isEnterpriseStandard': function (newVal) {
-      if (newVal !== 1) {
-        this.form.drawingType = undefined;
-        this.form.drawingPath = undefined;
-      }
-    },
-    'form.drawingType': function (newVal) {
-      if (this.form.isEnterpriseStandard === 1) {
-        if (newVal) {
-          const option = this.drawingTypeOptions.find(item => item.fileType === newVal);
-          this.form.drawingPath = option ? option.fileUrl : '';
-        } else {
-          this.form.drawingPath = '';
-        }
-      }
-      // 不是企标时，drawingPath 保持手填内容
-    }
   },
   computed: {
     processLogCounts() {
-      const success = Array.isArray(this.processUploadLog?.successfulRoutes) ? this.processUploadLog.successfulRoutes.length : 0;
-      const duplicate = Array.isArray(this.processUploadLog?.duplicateRoutes) ? this.processUploadLog.duplicateRoutes.length : 0;
-      const failed = Array.isArray(this.processUploadLog?.failedRoutes) ? this.processUploadLog.failedRoutes.length : 0;
-      return {success, duplicate, failed};
+      const success = Array.isArray(this.processUploadLog?.successfulRoutes)
+        ? this.processUploadLog.successfulRoutes.length
+        : 0;
+      const duplicate = Array.isArray(this.processUploadLog?.duplicateRoutes)
+        ? this.processUploadLog.duplicateRoutes.length
+        : 0;
+      const failed = Array.isArray(this.processUploadLog?.failedRoutes)
+        ? this.processUploadLog.failedRoutes.length
+        : 0;
+      return { success, duplicate, failed };
     },
     successFlatRows() {
       const rows = [];
       const list = this.processUploadLog?.successfulRoutes || [];
-      list.forEach(item => {
+      list.forEach((item) => {
         const base = {
-          materialCode: item.materialCode || '',
-          materialName: item.materialName || ''
+          materialCode: item.materialCode || "",
+          materialName: item.materialName || "",
         };
-        const details = Array.isArray(item.processRouteDT) ? item.processRouteDT : [];
-        details.forEach(dt => {
+        const details = Array.isArray(item.processRouteDT)
+          ? item.processRouteDT
+          : [];
+        details.forEach((dt) => {
           // 兼容两种字段命名：
           // 1) 我们的前端命名：processNo / workCenter / processName / activityUnit / processControl / activityDuration / processDescription / processNameDescription
           // 2) 后端K3字段命名：FOperNumber / FWorkCenterId.FName / FProcessId.FName / FActivity1UnitID.FName / FOptCtrlCodeId.FName / FActivity1Qty / FOperDescription / FNumber
-          const processNo = dt.processNo ?? dt.FOperNumber ?? dt['FOperNumber'];
-          const workCenter = dt.workCenter ?? (dt.FWorkCenterId && dt.FWorkCenterId.FName) ?? dt['FWorkCenterId.FName'];
-          const processName = dt.processName ?? (dt.FProcessId && dt.FProcessId.FName) ?? dt['FProcessId.FName'];
-          const activityUnit = dt.activityUnit ?? (dt.FActivity1UnitID && dt.FActivity1UnitID.FName) ?? dt['FActivity1UnitID.FName'];
-          const processControl = dt.processControl ?? (dt.FOptCtrlCodeId && dt.FOptCtrlCodeId.FName) ?? dt['FOptCtrlCodeId.FName'];
-          const activityDuration = dt.activityDuration ?? dt.FActivity1Qty ?? dt['FActivity1Qty'];
-          const processDescription = dt.processDescription ?? dt.FOperDescription ?? dt['FOperDescription'];
-          const processNameDescription = dt.processNameDescription ?? dt.FNumber ?? dt['FNumber'];
+          const processNo = dt.processNo ?? dt.FOperNumber ?? dt["FOperNumber"];
+          const workCenter =
+            dt.workCenter ??
+            (dt.FWorkCenterId && dt.FWorkCenterId.FName) ??
+            dt["FWorkCenterId.FName"];
+          const processName =
+            dt.processName ??
+            (dt.FProcessId && dt.FProcessId.FName) ??
+            dt["FProcessId.FName"];
+          const activityUnit =
+            dt.activityUnit ??
+            (dt.FActivity1UnitID && dt.FActivity1UnitID.FName) ??
+            dt["FActivity1UnitID.FName"];
+          const processControl =
+            dt.processControl ??
+            (dt.FOptCtrlCodeId && dt.FOptCtrlCodeId.FName) ??
+            dt["FOptCtrlCodeId.FName"];
+          const activityDuration =
+            dt.activityDuration ?? dt.FActivity1Qty ?? dt["FActivity1Qty"];
+          const processDescription =
+            dt.processDescription ??
+            dt.FOperDescription ??
+            dt["FOperDescription"];
+          const processNameDescription =
+            dt.processNameDescription ?? dt.FNumber ?? dt["FNumber"];
           rows.push({
             ...base,
             processNo,
@@ -1213,7 +1318,7 @@ export default {
             processControl,
             activityDuration,
             processDescription,
-            processNameDescription
+            processNameDescription,
           });
         });
       });
@@ -1222,71 +1327,93 @@ export default {
     // 工艺成功项（分页）
     successFlatPagedRows() {
       const rows = this.successFlatRows;
-      const start = (this.processSuccessPage.pageNum - 1) * this.processSuccessPage.pageSize;
+      const start =
+        (this.processSuccessPage.pageNum - 1) *
+        this.processSuccessPage.pageSize;
       const end = start + this.processSuccessPage.pageSize;
       return rows.slice(start, end);
     },
     // 工艺失败项（分页）
     processFailedPagedItems() {
-      const items = Array.isArray(this.processUploadLog?.failedRoutes) ? this.processUploadLog.failedRoutes : [];
-      const start = (this.processFailedPage.pageNum - 1) * this.processFailedPage.pageSize;
+      const items = Array.isArray(this.processUploadLog?.failedRoutes)
+        ? this.processUploadLog.failedRoutes
+        : [];
+      const start =
+        (this.processFailedPage.pageNum - 1) * this.processFailedPage.pageSize;
       const end = start + this.processFailedPage.pageSize;
       return items.slice(start, end);
     },
     // BOM上传日志统计
     bomLogCounts() {
-      const items = Array.isArray(this.bomUploadLog?.items) ? this.bomUploadLog.items : [];
-      const success = items.filter(item => item.code === '200').length;
-      const exists = items.filter(item => item.code === '100').length;
-      const failed = items.filter(item => item.code === '300' || (item.code !== '200' && item.code !== '100')).length;
+      const items = Array.isArray(this.bomUploadLog?.items)
+        ? this.bomUploadLog.items
+        : [];
+      const success = items.filter((item) => item.code === "200").length;
+      const exists = items.filter((item) => item.code === "100").length;
+      const failed = items.filter(
+        (item) =>
+          item.code === "300" || (item.code !== "200" && item.code !== "100")
+      ).length;
       return {
         success,
         exists,
         failed,
-        total: items.length
+        total: items.length,
       };
     },
     // BOM成功项
     bomSuccessItems() {
-      const items = Array.isArray(this.bomUploadLog?.items) ? this.bomUploadLog.items : [];
-      return items.filter(item => item.code === '200');
+      const items = Array.isArray(this.bomUploadLog?.items)
+        ? this.bomUploadLog.items
+        : [];
+      return items.filter((item) => item.code === "200");
     },
     // BOM已存在项
     bomExistsItems() {
-      const items = Array.isArray(this.bomUploadLog?.items) ? this.bomUploadLog.items : [];
-      return items.filter(item => item.code === '100');
+      const items = Array.isArray(this.bomUploadLog?.items)
+        ? this.bomUploadLog.items
+        : [];
+      return items.filter((item) => item.code === "100");
     },
     // BOM失败项
     bomFailedItems() {
-      const items = Array.isArray(this.bomUploadLog?.items) ? this.bomUploadLog.items : [];
-      return items.filter(item => item.code === '300' || (item.code !== '200' && item.code !== '100'));
+      const items = Array.isArray(this.bomUploadLog?.items)
+        ? this.bomUploadLog.items
+        : [];
+      return items.filter(
+        (item) =>
+          item.code === "300" || (item.code !== "200" && item.code !== "100")
+      );
     },
     // BOM成功项（分页）
     bomSuccessPagedItems() {
       const items = this.bomSuccessItems;
-      const start = (this.bomSuccessPage.pageNum - 1) * this.bomSuccessPage.pageSize;
+      const start =
+        (this.bomSuccessPage.pageNum - 1) * this.bomSuccessPage.pageSize;
       const end = start + this.bomSuccessPage.pageSize;
       return items.slice(start, end);
     },
     // BOM已存在项（分页）
     bomExistsPagedItems() {
       const items = this.bomExistsItems;
-      const start = (this.bomExistsPage.pageNum - 1) * this.bomExistsPage.pageSize;
+      const start =
+        (this.bomExistsPage.pageNum - 1) * this.bomExistsPage.pageSize;
       const end = start + this.bomExistsPage.pageSize;
       return items.slice(start, end);
     },
     // BOM失败项（分页）
     bomFailedPagedItems() {
       const items = this.bomFailedItems;
-      const start = (this.bomFailedPage.pageNum - 1) * this.bomFailedPage.pageSize;
+      const start =
+        (this.bomFailedPage.pageNum - 1) * this.bomFailedPage.pageSize;
       const end = start + this.bomFailedPage.pageSize;
       return items.slice(start, end);
-    }
+    },
   },
   methods: {
     async fetchProcessLog() {
       if (!this.productionObj || !this.productionObj.id) {
-        this.$message.error('请先选择生产令号');
+        this.$message.error("请先选择生产令号");
         return;
       }
 
@@ -1295,11 +1422,11 @@ export default {
         const res = await getRouteLog(this.productionObj.id);
         if (res && (res.code === 200 || res.success)) {
           // 后端返回的数据在 msg 字段中（JSON 字符串），如果 msg 为空则尝试 data
-          const jsonStr = res.msg || res.data || '';
-          
+          const jsonStr = res.msg || res.data || "";
+
           // 如果返回的字符串为空，提示无数据
           if (!jsonStr || !jsonStr.trim()) {
-            this.$message.info('暂无工艺上传日志');
+            this.$message.info("暂无工艺上传日志");
             this.clearProcessLog();
             return;
           }
@@ -1309,55 +1436,60 @@ export default {
           try {
             parsed = JSON.parse(jsonStr);
           } catch (parseError) {
-            console.error('JSON 解析失败', parseError);
-            this.$message.error('日志数据格式错误，无法解析');
+            console.error("JSON 解析失败", parseError);
+            this.$message.error("日志数据格式错误，无法解析");
             this.clearProcessLog();
             return;
           }
 
           // 处理不同的数据格式
           let latest = null;
-          
+
           // 如果是数组，选择时间最新的一条记录
           if (Array.isArray(parsed)) {
             if (parsed.length === 0) {
-              this.$message.info('暂无工艺上传日志');
+              this.$message.info("暂无工艺上传日志");
               this.clearProcessLog();
               return;
             }
             latest = parsed.reduce((acc, cur) => {
-              const accTime = acc && acc.time ? new Date(acc.time).getTime() : 0;
-              const curTime = cur && cur.time ? new Date(cur.time).getTime() : 0;
+              const accTime =
+                acc && acc.time ? new Date(acc.time).getTime() : 0;
+              const curTime =
+                cur && cur.time ? new Date(cur.time).getTime() : 0;
               return curTime >= accTime ? cur : acc;
             });
-          } 
-          // 如果是单个对象，直接使用
-          else if (parsed && typeof parsed === 'object') {
-            latest = parsed;
           }
-          else {
-            this.$message.error('日志数据格式不正确');
+          // 如果是单个对象，直接使用
+          else if (parsed && typeof parsed === "object") {
+            latest = parsed;
+          } else {
+            this.$message.error("日志数据格式不正确");
             this.clearProcessLog();
             return;
           }
           if (!latest) {
-            this.$message.info('暂无工艺上传日志');
+            this.$message.info("暂无工艺上传日志");
             this.clearProcessLog();
             return;
           }
           // 直接使用解析后的数据结构
           // 处理时间：dayjs 支持时间戳（毫秒）和日期字符串
           this.processUploadLog = {
-            time: latest.time ? dayjs(latest.time).format('YYYY-MM-DD HH:mm:ss') : null,
+            time: latest.time
+              ? dayjs(latest.time).format("YYYY-MM-DD HH:mm:ss")
+              : null,
             successfulRoutes: latest.successfulRoutes || [],
             duplicateRoutes: latest.duplicateRoutes || [],
-            failedRoutes: latest.failedRoutes || []
+            failedRoutes: latest.failedRoutes || [],
           };
         } else {
-          this.$message.error(res && res.msg ? res.msg : '获取工艺上传日志失败');
+          this.$message.error(
+            res && res.msg ? res.msg : "获取工艺上传日志失败"
+          );
         }
       } catch (e) {
-        this.$message.error('获取工艺上传日志失败');
+        this.$message.error("获取工艺上传日志失败");
       } finally {
         this.processLogLoading = false;
       }
@@ -1367,7 +1499,7 @@ export default {
         time: null,
         successfulRoutes: [],
         duplicateRoutes: [],
-        failedRoutes: []
+        failedRoutes: [],
       };
       // 重置分页
       this.processSuccessPage = { pageNum: 1, pageSize: 10 };
@@ -1376,20 +1508,22 @@ export default {
     // 获取BOM上传日志
     async fetchBomLog() {
       if (!this.productionObj || !this.productionObj.productionOrderNo) {
-        this.$message.error('请先选择生产令号');
+        this.$message.error("请先选择生产令号");
         return;
       }
 
       this.bomLogLoading = true;
       try {
-        const res = await getBomUploadStatus(this.productionObj.productionOrderNo);
+        const res = await getBomUploadStatus(
+          this.productionObj.productionOrderNo
+        );
         if (res && (res.code === 200 || res.success)) {
           // 后端返回的数据在 data 字段中（JSON 字符串），如果 data 为空则尝试 msg
-          const jsonStr = res.data || res.msg || '';
-          
+          const jsonStr = res.data || res.msg || "";
+
           // 如果返回的字符串为空，提示无数据
           if (!jsonStr || !jsonStr.trim()) {
-            this.$message.info('暂无BOM上传日志');
+            this.$message.info("暂无BOM上传日志");
             this.clearBomLog();
             return;
           }
@@ -1399,8 +1533,8 @@ export default {
           try {
             parsed = JSON.parse(jsonStr);
           } catch (parseError) {
-            console.error('JSON 解析失败', parseError);
-            this.$message.error('BOM日志数据格式错误，无法解析');
+            console.error("JSON 解析失败", parseError);
+
             this.clearBomLog();
             return;
           }
@@ -1409,22 +1543,22 @@ export default {
           let items = [];
           if (Array.isArray(parsed)) {
             items = parsed;
-          } else if (parsed && typeof parsed === 'object' && Array.isArray(parsed.items)) {
+          } else if (
+            parsed &&
+            typeof parsed === "object" &&
+            Array.isArray(parsed.items)
+          ) {
             items = parsed.items;
-          } else {
-            this.$message.error('BOM日志数据格式不正确');
-            this.clearBomLog();
-            return;
           }
 
           this.bomUploadLog = {
-            items: items
+            items: items,
           };
         } else {
-          this.$message.error(res && res.msg ? res.msg : '获取BOM上传日志失败');
+          this.$message.error(res && res.msg ? res.msg : "获取BOM上传日志失败");
         }
       } catch (e) {
-        this.$message.error('获取BOM上传日志失败');
+        this.$message.error("获取BOM上传日志失败");
       } finally {
         this.bomLogLoading = false;
       }
@@ -1432,7 +1566,7 @@ export default {
     // 清空BOM日志
     clearBomLog() {
       this.bomUploadLog = {
-        items: []
+        items: [],
       };
       // 重置分页
       this.bomSuccessPage = { pageNum: 1, pageSize: 10 };
@@ -1441,16 +1575,18 @@ export default {
     },
     // 格式化BOM错误信息
     formatBomErrorReason(reason) {
-      if (!reason) return '';
+      if (!reason) return "";
       // 如果 reason 是 JSON 字符串，尝试解析并格式化
       try {
         const parsed = JSON.parse(reason);
         if (Array.isArray(parsed)) {
-          return parsed.map(item => {
-            const field = item.FieldName || '';
-            const message = item.Message || '';
-            return field ? `${field}: ${message}` : message;
-          }).join('; ');
+          return parsed
+            .map((item) => {
+              const field = item.FieldName || "";
+              const message = item.Message || "";
+              return field ? `${field}: ${message}` : message;
+            })
+            .join("; ");
         }
         return reason;
       } catch (e) {
@@ -1460,7 +1596,7 @@ export default {
     },
     formatFraction(value) {
       // 如果本身就是分数字符串，直接返回
-      if (typeof value === 'string' && value.includes('/')) {
+      if (typeof value === "string" && value.includes("/")) {
         return value;
       }
       // 如果是数字或数字字符串，直接原样返回（或保留三位小数）
@@ -1473,7 +1609,7 @@ export default {
     // 处理分数值，用于数据处理阶段
     formatFractionValue(value) {
       // 如果本身就是分数字符串，直接返回
-      if (typeof value === 'string' && value.includes('/')) {
+      if (typeof value === "string" && value.includes("/")) {
         return value;
       }
       // 如果是数字，转换为数字
@@ -1483,14 +1619,17 @@ export default {
       return 0; // 兜底
     },
     handleCommand(command, row) {
-      if ("工艺" === command) {
-        this.handleDetail(row.productionOrderNo)
+      if ("BOM" === command) {
+        this.handleBOM(row.productionOrderNo);
       }
       if ("修改" === command) {
-        this.handleUpdate(row)
+        this.handleUpdate(row);
       }
       if ("删除" === command) {
-        this.handleDelete(row)
+        this.handleDelete(row);
+      }
+      if ("清空项目" === command) {
+        this.clearProject(row);
       }
     },
     handleClose(done) {
@@ -1498,19 +1637,21 @@ export default {
     },
     /** 获取图纸类型选项 */
     getDrawingTypeOptions() {
-      getDrawingTypeDict().then(response => {
-        this.drawingTypeOptions = response.rows.map(item => ({
-          fileType: item.fileType,
-          fileUrl: item.fileUrl
-        }));
-      }).catch(() => {
-        this.drawingTypeOptions = [
-          {fileType: '机械图纸', fileUrl: 'mechanical'},
-          {fileType: '电气图纸', fileUrl: 'electrical'},
-          {fileType: '工艺图纸', fileUrl: 'process'},
-          {fileType: '装配图纸', fileUrl: 'assembly'}
-        ];
-      });
+      getDrawingTypeDict()
+        .then((response) => {
+          this.drawingTypeOptions = response.rows.map((item) => ({
+            fileType: item.fileType,
+            fileUrl: item.fileUrl,
+          }));
+        })
+        .catch(() => {
+          this.drawingTypeOptions = [
+            { fileType: "机械图纸", fileUrl: "mechanical" },
+            { fileType: "电气图纸", fileUrl: "electrical" },
+            { fileType: "工艺图纸", fileUrl: "process" },
+            { fileType: "装配图纸", fileUrl: "assembly" },
+          ];
+        });
     },
     productionCodeHandle(row) {
       this.productionObj = row;
@@ -1528,26 +1669,56 @@ export default {
     },
     /** 获取图纸类型标签 */
     getDrawingTypeLabel(value) {
-      const option = this.drawingTypeOptions.find(item => item.fileType === value);
+      const option = this.drawingTypeOptions.find(
+        (item) => item.fileType === value
+      );
       if (option) {
         return option.fileType;
       }
       // 如果没有找到匹配的选项，尝试从路径中提取文件名
-      if (value && typeof value === 'string') {
-        const fileName = value.split('/').pop() || value.split('\\').pop();
+      if (value && typeof value === "string") {
+        const fileName = value.split("/").pop() || value.split("\\").pop();
         return fileName || value;
       }
       return value;
     },
+    /** 项目类型缩写文本 */
+    getProjectTypeLabel(code) {
+      if (!code) return "-";
+      const map = {
+        CP: "产品",
+        FB: "非标",
+        BG: "变更",
+        QB: "研发",
+        EY: "研发",
+        GZ: "固资",
+        ZP: "展品",
+      };
+      return map[String(code)] || code;
+    },
     /** 查询项目令号列表 */
-    getList() {
+    async getList() {
       this.loading = true;
-      listOrderPro(this.queryParams).then(response => {
+      try {
+        const base = process.env.VUE_APP_BASE_API || "";
+        const url = `${base}/system/orderPro/refreshDelayStatus`;
+        await axios.get(url, { headers: { ...(this.uploadHeaders || {}) } });
+      } catch (e) {
+        /* ignore refresh errors to not block list */
+      }
+      const params = { ...this.queryParams };
+      if (Array.isArray(params.isEnterpriseStandardList) && params.isEnterpriseStandardList.length > 0) {
+        params.isEnterpriseStandardList = params.isEnterpriseStandardList.join(",");
+      }
 
+      delete params.isEnterpriseStandard;
+      try {
+        const response = await listOrderPro(params);
         this.orderProList = response.rows;
         this.total = response.total;
+      } finally {
         this.loading = false;
-      });
+      }
     },
     // 取消按钮
     cancel() {
@@ -1574,42 +1745,48 @@ export default {
         drawingType: undefined,
         projectEndTime: undefined,
         unit: undefined,
-        quantity: undefined,
+        quantity: 0,
         isEnterpriseStandard: 0, // 默认为否
-        drawingPath: undefined
+        drawingPath: undefined,
+        drawer: undefined,
+        drawUptime: undefined,
+        routeUptime: undefined,
+        planUptime: undefined,
+        bomUptime: undefined
       };
       this.resetForm("form");
     },
     handleDetail(productionOrderNo) {
-      this.processParams = {productionOrderNo: productionOrderNo};
-      this.processDrawer = true
+      this.processParams = { productionOrderNo: productionOrderNo };
+      this.processDrawer = true;
     },
     handleBOM(productionOrderNo) {
-      this.bomParams = {productionOrderNo: productionOrderNo};
-      this.bomDrawer = true
+      this.bomParams = { productionOrderNo: productionOrderNo };
+      this.bomDrawer = true;
     },
     /** MRP运算结果复查相关方法 */
     // 获取MRP运算结果
     async getMRPResults() {
       if (!this.productionObj || !this.productionObj.id) {
-        this.$message.error('请先选择生产令号');
+        this.$message.error("请先选择生产令号");
         return;
       }
 
       // 只显示一次开始提示，不重复弹窗
       this.$message({
-        message: 'MRP运算已开始，由于数据量较大，可能需要较长时间，请耐心等待...',
-        type: 'info',
+        message:
+          "MRP运算已开始，由于数据量较大，可能需要较长时间，请耐心等待...",
+        type: "info",
         duration: 6000, // 减少到6秒
-        showClose: true
+        showClose: true,
       });
 
       this.loadingMRP = true;
-      this.mrpOperationStatus = 'MRP运算已开始，正在处理数据...';
+      this.mrpOperationStatus = "MRP运算已开始，正在处理数据...";
 
       // 只更新状态，不弹窗提醒
       const progressTimer = setInterval(() => {
-        this.mrpOperationStatus = 'MRP运算仍在进行中，请继续等待...';
+        this.mrpOperationStatus = "MRP运算仍在进行中，请继续等待...";
         // 移除弹窗提示，只更新状态显示
       }, 30000);
 
@@ -1620,25 +1797,28 @@ export default {
         clearInterval(progressTimer);
 
         if (response && response.code === 200) {
-          this.$message.success('MRP运算完成！');
+          this.$message.success("MRP运算完成！");
           // 运算完成后刷新MRP数据
           await this.getMrpData();
         } else {
-          this.$message.error(response?.msg || 'MRP运算失败');
+          this.$message.error(response?.msg || "MRP运算失败");
         }
       } catch (error) {
         // 清除定时器
         clearInterval(progressTimer);
 
         // 简化错误提示，避免重复弹窗
-        if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-          this.$message.error('MRP运算超时，请稍后重试');
+        if (
+          error.code === "ECONNABORTED" ||
+          error.message.includes("timeout")
+        ) {
+          this.$message.error("MRP运算超时，请稍后重试");
         } else {
-          this.$message.error('MRP运算失败，请重试');
+          this.$message.error("MRP运算失败，请重试");
         }
       } finally {
         this.loadingMRP = false;
-        this.mrpOperationStatus = ''; // 清空状态
+        this.mrpOperationStatus = ""; // 清空状态
       }
     },
 
@@ -1651,16 +1831,22 @@ export default {
 
         if (response && response.rows) {
           // 统一转Number，避免 toFixed 报错
-          const processedRows = response.rows.map(item => ({
+          const processedRows = response.rows.map((item) => ({
             ...item,
             availableStock: Number(item.availableStock) || 0,
             realTimeStock: Number(item.realTimeStock) || 0,
             prodNotInStock: Number(item.prodNotInStock) || 0,
             purchaseRequestQty: Number(item.purchaseRequestQty) || 0,
-            purchaseNotInStock: this.formatFractionValue(item.purchaseNotInStock),
+            purchaseNotInStock: this.formatFractionValue(
+              item.purchaseNotInStock
+            ),
             childNotPickedQty: Number(item.childNotPickedQty) || 0,
-            createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') : '',
-            updateTime: item.updateTime ? dayjs(item.updateTime).format('YYYY-MM-DD HH:mm:ss') : ''
+            createTime: item.createTime
+              ? dayjs(item.createTime).format("YYYY-MM-DD HH:mm:ss")
+              : "",
+            updateTime: item.updateTime
+              ? dayjs(item.updateTime).format("YYYY-MM-DD HH:mm:ss")
+              : "",
           }));
           this.mrpResultData = processedRows;
           this.mrpTotal = response.total || processedRows.length;
@@ -1668,14 +1854,13 @@ export default {
           this.calculateMrpStats(processedRows);
         }
       } catch (error) {
-        console.error('获取MRP数据失败:', error);
-        this.$message.error('获取MRP数据失败');
+        console.error("获取MRP数据失败:", error);
+        this.$message.error("获取MRP数据失败");
       } finally {
         this.mrpLoading = false;
       }
     },
 
-
     // MRP分页大小改变
     handleMrpSizeChange(size) {
       this.mrpQueryParams.pageSize = size;
@@ -1691,33 +1876,75 @@ export default {
 
     // 格式化日期时间
     formatDateTime(date) {
-      if (!date) return '-';
-      if (typeof date === 'string') {
+      if (!date) return "-";
+      if (typeof date === "string") {
         date = new Date(date);
       }
-      if (isNaN(date.getTime())) return '-';
+      if (isNaN(date.getTime())) return "-";
 
       const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, '0');
-      const day = String(date.getDate()).padStart(2, '0');
-      const hours = String(date.getHours()).padStart(2, '0');
-      const minutes = String(date.getMinutes()).padStart(2, '0');
+      const month = String(date.getMonth() + 1).padStart(2, "0");
+      const day = String(date.getDate()).padStart(2, "0");
+      const hours = String(date.getHours()).padStart(2, "0");
+      const minutes = String(date.getMinutes()).padStart(2, "0");
 
       return `${year}-${month}-${day} ${hours}:${minutes}`;
     },
 
+    normalizeIncomingDate(value) {
+      if (!value) return "";
+      const s = typeof value === "string" ? value.trim() : value;
+      if (
+        typeof s === "string" &&
+        (s === "0000-00-00 00:00:00" || s.startsWith("1970-01-01"))
+      ) {
+        return "";
+      }
+      const d = dayjs(s);
+      if (!d.isValid()) return "";
+      return d.format("YYYY-MM-DD HH:mm:ss");
+    },
+
+    normalizeDateTime(value) {
+      if (!value) return null;
+      if (typeof value === "string") {
+        const v = value.trim();
+        if (v === "" || v === "0000-00-00 00:00:00") return null;
+        if (/^\d{4}-\d{2}-\d{2}$/.test(v)) {
+          const now = dayjs();
+          return `${v} ${now.format("HH:mm:ss")}`;
+        }
+        const d = dayjs(v);
+        if (!d.isValid()) return null;
+        return d.format("YYYY-MM-DD HH:mm:ss");
+      }
+      const d = dayjs(value);
+      if (!d.isValid()) return null;
+      return d.format("YYYY-MM-DD HH:mm:ss");
+    },
+
+    normalizeDateTimeNonZero(value) {
+      const s = this.normalizeDateTime(value);
+      if (!s) return s;
+      if (/^\d{4}-\d{2}-\d{2} 00:00:00$/.test(s)) {
+        const now = dayjs();
+        return `${s.slice(0, 10)} ${now.format("HH:mm:ss")}`;
+      }
+      return s;
+    },
+
     // MRP搜索处理
     handleMrpSearch() {
       this.mrpQueryParams.pageNum = 1;
       this.mrpQueryParams.materialCode = this.mrpSearchKeyword;
-      console.log('MRP搜索参数:', this.mrpQueryParams);
+      console.log("MRP搜索参数:", this.mrpQueryParams);
       this.getMrpData();
     },
 
     // 清空MRP搜索
     clearMrpSearch() {
-      this.mrpSearchKeyword = '';
-      this.mrpQueryParams.materialCode = '';
+      this.mrpSearchKeyword = "";
+      this.mrpQueryParams.materialCode = "";
       this.mrpQueryParams.pageNum = 1;
       this.getMrpData();
     },
@@ -1729,35 +1956,36 @@ export default {
       }
 
       const keyword = this.mrpSearchKeyword.toLowerCase();
-      return data.filter(item =>
-        item.materialName.toLowerCase().includes(keyword) ||
-        item.materialCode.toLowerCase().includes(keyword)
+      return data.filter(
+        (item) =>
+          item.materialName.toLowerCase().includes(keyword) ||
+          item.materialCode.toLowerCase().includes(keyword)
       );
     },
 
     // 计算MRP统计信息
     calculateMrpStats(data) {
       const total = data.length;
-      const positive = data.filter(item => item.availableStock > 0).length;
-      const negative = data.filter(item => item.availableStock < 0).length;
-      const zero = data.filter(item => item.availableStock === 0).length;
+      const positive = data.filter((item) => item.availableStock > 0).length;
+      const negative = data.filter((item) => item.availableStock < 0).length;
+      const zero = data.filter((item) => item.availableStock === 0).length;
 
       this.mrpStats = {
         totalMaterials: total,
         positiveStock: positive,
         negativeStock: negative,
-        zeroStock: zero
+        zeroStock: zero,
       };
     },
 
     // 获取抽屉标题
     getDrawerTitle() {
       if (!this.productionObj) {
-        return '项目详情';
+        return "项目详情";
       }
 
-      const orderNo = this.productionObj.productionOrderNo || '';
-      const projectName = this.productionObj.productionName || '';
+      const orderNo = this.productionObj.productionOrderNo || "";
+      const projectName = this.productionObj.productionName || "";
 
       if (orderNo && projectName) {
         return `项目详情 - ${orderNo} | ${projectName}`;
@@ -1766,7 +1994,7 @@ export default {
       } else if (projectName) {
         return `项目详情 - ${projectName}`;
       } else {
-        return '项目详情';
+        return "项目详情";
       }
     },
 
@@ -1780,40 +2008,43 @@ export default {
     async handleExportMrp() {
       // 增强参数验证
       if (!this.productionObj) {
-        this.$message.error('请先选择生产令号');
+        this.$message.error("请先选择生产令号");
         return;
       }
 
       if (!this.productionObj.id) {
-        this.$message.error('生产令号ID无效，请重新选择');
+        this.$message.error("生产令号ID无效，请重新选择");
         return;
       }
 
       if (!this.productionObj.productionOrderNo) {
-        this.$message.error('生产令号信息不完整，请重新选择');
+        this.$message.error("生产令号信息不完整，请重新选择");
         return;
       }
 
       // 调试信息
-      console.log('productionObj:', this.productionObj);
-      console.log('productionObj.id:', this.productionObj.id);
-      console.log('mrpResultData.length:', this.mrpResultData?.length || 0);
+      console.log("productionObj:", this.productionObj);
+      console.log("productionObj.id:", this.productionObj.id);
+      console.log("mrpResultData.length:", this.mrpResultData?.length || 0);
 
       // 显示导出确认信息
       const exportInfo = `即将导出生产令号"${this.productionObj.productionOrderNo}"的MRP数据`;
-      const searchInfo = this.mrpSearchKeyword ? `，包含搜索关键词"${this.mrpSearchKeyword}"` : '';
-      const dataInfo = this.mrpResultData && this.mrpResultData.length > 0
-        ? `，当前显示${this.mrpResultData.length}条记录`
-        : '（后台将查询所有相关数据）';
+      const searchInfo = this.mrpSearchKeyword
+        ? `，包含搜索关键词"${this.mrpSearchKeyword}"`
+        : "";
+      const dataInfo =
+        this.mrpResultData && this.mrpResultData.length > 0
+          ? `，当前显示${this.mrpResultData.length}条记录`
+          : "（后台将查询所有相关数据）";
 
       try {
         await this.$confirm(
           `${exportInfo}${searchInfo}${dataInfo}。\n\n确定要导出吗？`,
-          '确认导出',
+          "确认导出",
           {
-            confirmButtonText: '确定导出',
-            cancelButtonText: '取消',
-            type: 'info'
+            confirmButtonText: "确定导出",
+            cancelButtonText: "取消",
+            type: "info",
           }
         );
       } catch (error) {
@@ -1827,41 +2058,44 @@ export default {
         // 准备导出参数，主要传递orderProId给后台
         const exportParams = {
           orderProId: this.productionObj.id, // 核心参数：生产令号ID
-          materialCode: this.mrpSearchKeyword || '', // 可选的物料编码搜索
-          materialName: '', // 清空名称搜索，避免冲突
+          materialCode: this.mrpSearchKeyword || "", // 可选的物料编码搜索
+          materialName: "", // 清空名称搜索，避免冲突
           pageSize: 9999, // 后台查询时获取所有数据
-          pageNum: 1
+          pageNum: 1,
         };
 
         // 详细调试信息
-        console.log('导出参数:', exportParams);
-        console.log('orderProId类型:', typeof exportParams.orderProId);
-        console.log('orderProId值:', exportParams.orderProId);
-        console.log('materialCode:', exportParams.materialCode);
+        console.log("导出参数:", exportParams);
+        console.log("orderProId类型:", typeof exportParams.orderProId);
+        console.log("orderProId值:", exportParams.orderProId);
+        console.log("materialCode:", exportParams.materialCode);
 
         const response = await exportMrp(exportParams);
 
         // 创建下载链接
         const blob = new Blob([response], {
-          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
         const url = window.URL.createObjectURL(blob);
-        const link = document.createElement('a');
+        const link = document.createElement("a");
         link.href = url;
-        link.download = `MRP运算结果_${this.productionObj.productionOrderNo}_${new Date().getTime()}.xlsx`;
+        link.download = `MRP运算结果_${this.productionObj.productionOrderNo
+          }_${new Date().getTime()}.xlsx`;
         link.click();
         window.URL.revokeObjectURL(url);
 
-        this.$message.success(`导出成功！文件已下载：MRP运算结果_${this.productionObj.productionOrderNo}_${new Date().getTime()}.xlsx`);
+        this.$message.success(
+          `导出成功！文件已下载：MRP运算结果_${this.productionObj.productionOrderNo
+          }_${new Date().getTime()}.xlsx`
+        );
       } catch (error) {
-        console.error('导出失败:', error);
-        this.$message.error('导出失败: ' + (error.message || error));
+        console.error("导出失败:", error);
+        this.$message.error("导出失败: " + (error.message || error));
       } finally {
         this.exportLoading = false;
       }
     },
 
-
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -1874,14 +2108,14 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.currentPid = null; // 新增时，不依赖当前行
-      this.chainForm.productionCode = '';
+      this.chainForm.productionCode = "";
       this.reset();
       this.open = true;
       this.title = "添加项目令号";
@@ -1890,35 +2124,76 @@ export default {
     handleUpdate(row) {
       this.loading = true;
       this.reset();
-      const id = row.id || this.ids
-      getOrderPro(id).then(response => {
+      const id = row.id || this.ids;
+      getOrderPro(id).then((response) => {
         this.loading = false;
-        this.form = response.data;
+        this.form = response.data || {};
+        this.form.isEnterpriseStandard =
+          this.form.isEnterpriseStandard != null
+            ? Number(this.form.isEnterpriseStandard)
+            : 0;
+        this.form.drawer = this.parseDesignerArray(this.form && this.form.drawingBy);
+        this.form.drawUptime = this.normalizeIncomingDate(
+          this.form && this.form.drawingTime
+        );
+        this.form.projectEndTime = this.normalizeIncomingDate(
+          this.form && this.form.projectEndTime
+        );
+        this.form.routeUptime = this.normalizeIncomingDate(
+          this.form && this.form.routeUptime
+        );
+        this.form.planUptime = this.normalizeIncomingDate(
+          this.form && this.form.planUptime
+        );
+        this.form.bomUptime = this.normalizeIncomingDate(
+          this.form && this.form.bomUptime
+        );
+        // 保持后端返回的 drawingPath（图片ID串）原样，避免将 URL 误传给 ImageUpload
         this.open = true;
         this.title = "修改项目令号";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           this.buttonLoading = true;
+          const payload = {
+            ...this.form,
+            isEnterpriseStandard:
+              this.form.isEnterpriseStandard != null
+                ? Number(this.form.isEnterpriseStandard)
+                : 0,
+            drawingBy: Array.isArray(this.form.drawer)
+              ? this.form.drawer.join(",")
+              : this.form.drawer,
+            drawingTime: this.normalizeDateTime(this.form.drawUptime),
+            projectEndTime: this.normalizeDateTime(this.form.projectEndTime),
+            routeUptime: this.normalizeDateTime(this.form.routeUptime),
+            planUptime: this.normalizeDateTime(this.form.planUptime),
+            bomUptime: this.normalizeDateTime(this.form.bomUptime),
+            drawingPath: this.form.drawingPath || "",
+          };
           if (this.form.id != null) {
-            updateOrderPro(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
+            updateOrderPro(payload)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
           } else {
-            addOrderPro(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
+            addOrderPro(payload)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
           }
         }
       });
@@ -1926,38 +2201,49 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除项目令号编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delOrderPro(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
+      this.$modal
+        .confirm('是否确认删除项目令号编号为"' + ids + '"的数据项？')
+        .then(() => {
+          this.loading = true;
+          return delOrderPro(ids);
+        })
+        .then(() => {
+          this.loading = false;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => { })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/orderPro/export', {
-        ...this.queryParams
-      }, `orderPro_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/orderPro/export",
+        {
+          ...this.queryParams,
+        },
+        `orderPro_${new Date().getTime()}.xlsx`
+      );
     },
-  openAddChainDialog() {
-    this.isEditChain = false;
-    this.chainForm = {
+    openAddChainDialog() {
+      this.isEditChain = false;
+      this.chainForm = {
         pid: this.id,
         productionCode: this.productionObj.productionOrderNo,
-        productType: '',
-        figureNumber: '',
-        figureName: '',
-        figureNum: '',
-        jdInventory: '',
-        axialType: '',
-        boxType: '',
-        selectedFileType: '',
-        drawPath: '',
+        productType: "",
+        figureNumber: "",
+        figureName: "",
+        figureNum: "",
+        jdInventory: "",
+        axialType: "",
+        boxType: "",
+        selectedFileType: "",
+        drawPath: "",
+        fileType: "",
+        drawBy: "",
+        drawTime: "",
         id: undefined,
       };
       this.chainDialogVisible = true;
@@ -1967,17 +2253,21 @@ export default {
       this.editChainIndex = index;
       this.chainForm = {
         pid: this.productionObj && this.productionObj.id,
-        productionCode: this.productionObj && this.productionObj.productionOrderNo,
-        productType: row && (row.productType || row.type) || '',
-        figureNumber: row && row.figureNumber || '',
-        figureName: row && (row.figureName || row.productName) || '',
-        figureNum: row && row.figureNum || '',
-        jdInventory: row && row.jdInventory || '',
-        axialType: row && row.axialType || '',
-        boxType: row && row.boxType || '',
-        selectedFileType: row && (row.fileType || row.selectedFileType) || '',
-        drawPath: row && row.drawPath || '',
-        id: row && row.id
+        productionCode:
+          this.productionObj && this.productionObj.productionOrderNo,
+        productType: (row && (row.productType || row.type)) || "",
+        figureNumber: (row && row.figureNumber) || "",
+        figureName: (row && (row.figureName || row.productName)) || "",
+        figureNum: (row && row.figureNum) || "",
+        jdInventory: (row && row.jdInventory) || "",
+        axialType: (row && row.axialType) || "",
+        boxType: (row && row.boxType) || "",
+        selectedFileType: (row && (row.fileType || row.selectedFileType)) || "",
+        drawPath: (row && row.drawPath) || "",
+        fileType: (row && row.fileType) || "",
+        drawBy: (row && row.drawBy) || "",
+        drawTime: (row && row.drawTime) || "",
+        id: row && row.id,
       };
       // 同步文件类型选择：优先使用后端返回的 fileType；若无，则根据当前路径匹配配置项
       if (!this.chainForm.selectedFileType) {
@@ -1987,28 +2277,32 @@ export default {
     },
     removeChain(index) {
       const row = this.chainTable[index];
-      this.$modal.confirm('是否确认删除该销齿链型号？').then(() => {
-        return delSave(row.id);
-      }).then(() => {
-        this.$modal.msgSuccess("删除成功");
-        // 删除成功后刷新表格数据
-        this.loadChainTableData();
-      }).catch(() => {
-        // 删除失败时不显示错误信息，因为用户可能取消了操作
-      });
+      this.$modal
+        .confirm("是否确认删除该销齿链型号？")
+        .then(() => {
+          return delSave(row.id);
+        })
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          // 删除成功后刷新表格数据
+          this.loadChainTableData();
+        })
+        .catch(() => {
+          // 删除失败时不显示错误信息，因为用户可能取消了操作
+        });
     },
     handleChainSelectionChange(selection) {
-      this.selectedChainIds = selection.map(item => item.id).filter(Boolean);
+      this.selectedChainIds = selection.map((item) => item.id).filter(Boolean);
     },
     beforeBatchDwgUpload(file) {
-      const name = file.name || '';
-      const suffix = name.substring(name.lastIndexOf('.') + 1).toLowerCase();
+      const name = file.name || "";
+      const suffix = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
       if (!this.selectedChainIds.length) {
-        this.$message.warning('请先勾选需要上传的行');
+        this.$message.warning("请先勾选需要上传的行");
         return false;
       }
-      if (suffix !== 'dwg') {
-        this.$message.error('仅允许上传 DWG 文件');
+      if (suffix !== "dwg") {
+        this.$message.error("仅允许上传 DWG 文件");
         return false;
       }
       return true;
@@ -2017,49 +2311,60 @@ export default {
       try {
         const formData = new FormData();
         // Spring 接收 List<Long> ids，使用重复键形式提交
-        this.selectedChainIds.forEach(id => formData.append('ids', id));
-        formData.append('file', file);
+        this.selectedChainIds.forEach((id) => formData.append("ids", id));
+        formData.append("file", file);
 
         const res = await axios.post(this.dwgUploadUrl, formData, {
           headers: {
-            ...this.uploadHeaders
-          }
+            ...this.uploadHeaders,
+          },
         });
 
         const payload = res && res.data ? res.data : {};
         const ok = payload.code === 200 || payload.success === true;
-        const msg = payload.msg || '上传完成';
+        const msg = payload.msg || "上传完成";
         if (ok) {
           this.$message.success(msg);
           this.loadChainTableData();
         } else {
-          this.$message.error(msg || '上传失败');
+          this.$message.error(msg || "上传失败");
         }
       } catch (e) {
         const status = e && e.response && e.response.status;
-        const serverMsg = (e && e.response && (e.response.data && (e.response.data.msg || e.response.data.message || e.response.data))) || '';
+        const serverMsg =
+          (e &&
+            e.response &&
+            e.response.data &&
+            (e.response.data.msg ||
+              e.response.data.message ||
+              e.response.data)) ||
+          "";
         if (status === 413) {
-          this.$message.error('文件过大，已超过服务器限制');
+          this.$message.error("文件过大，已超过服务器限制");
         } else if (status === 401) {
-          this.$message.error('未认证或登录已过期');
+          this.$message.error("未认证或登录已过期");
         } else if (status === 403) {
-          this.$message.error('权限不足，无法上传');
+          this.$message.error("权限不足，无法上传");
         } else if (status === 404) {
-          this.$message.error('上传接口不存在或路径错误');
+          this.$message.error("上传接口不存在或路径错误");
         } else if (status === 415) {
-          this.$message.error('服务器不支持当前文件类型');
+          this.$message.error("服务器不支持当前文件类型");
         } else if (status >= 500) {
-          this.$message.error('服务器内部错误：' + (serverMsg || '请联系管理员'));
+          this.$message.error(
+            "服务器内部错误：" + (serverMsg || "请联系管理员")
+          );
         } else {
-          this.$message.error('上传失败：' + (serverMsg || e.message || '请重试'));
+          this.$message.error(
+            "上传失败：" + (serverMsg || e.message || "请重试")
+          );
         }
       }
     },
     beforeElectricalBomUpload(file) {
-      const name = file.name || '';
-      const suffix = name.substring(name.lastIndexOf('.') + 1).toLowerCase();
-      if (!(suffix === 'xls' || suffix === 'xlsx')) {
-        this.$message.error('仅支持Excel文件(xls/xlsx)');
+      const name = file.name || "";
+      const suffix = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
+      if (!(suffix === "xls" || suffix === "xlsx")) {
+        this.$message.error("仅支持Excel文件(xls/xlsx)");
         return false;
       }
       return true;
@@ -2067,41 +2372,171 @@ export default {
     async uploadElectricalBom({ file }) {
       try {
         const formData = new FormData();
-        formData.append('file', file);
+        formData.append("file", file);
         const res = await importElectricalBom(formData);
         if (res && (res.code === 200 || res.success)) {
           let payload = res.data || res.msg || {};
-          if (typeof payload === 'string') {
-            try { payload = JSON.parse(payload); } catch (_) { payload = {}; }
+          if (typeof payload === "string") {
+            try {
+              payload = JSON.parse(payload);
+            } catch (_) {
+              payload = {};
+            }
           }
           const total = payload.totalRows ?? payload.total ?? 0;
           const parsed = payload.parsedRows ?? 0;
           const saved = payload.savedRows ?? payload.saved ?? 0;
-          const message = payload.message || '导入完成';
-          this.$message.success(`${message}（总:${total} 解析:${parsed} 保存:${saved}）`);
+          const message = payload.message || "导入完成";
+          this.$message.success(
+            `${message}（总:${total} 解析:${parsed} 保存:${saved}）`
+          );
           this.fetchBomLog();
         } else {
-          this.$message.error(res?.msg || '导入失败');
+          this.$message.error(res?.msg || "导入失败");
         }
       } catch (e) {
-        this.$message.error('导入失败: ' + (e.message || e));
+        this.$message.error("导入失败: " + (e.message || e));
+      }
+    },
+    async importProducts({ file }) {
+      try {
+        const formData = new FormData();
+        formData.append("file", file);
+        const base = process.env.VUE_APP_BASE_API || "";
+        const url = `${base}/system/save/importData`;
+        const res = await axios.post(`${url}?updateSupport=false`, formData, {
+          headers: {
+            "Content-Type": "multipart/form-data",
+            ...(this.uploadHeaders || {}),
+          },
+        });
+        const data = res && res.data ? res.data : {};
+        if (data && (data.code === 200 || data.success)) {
+          const msg = data.msg || data.message || data.data || "导入成功";
+          this.$message.success(msg);
+          this.loadChainTableData();
+        } else {
+          this.$message.error(data.msg || data.message || "导入失败");
+        }
+      } catch (e) {
+        this.$message.error("导入失败: " + (e.message || e));
+      }
+    },
+    async downloadSelectedDwgZip() {
+      if (!Array.isArray(this.selectedChainIds) || this.selectedChainIds.length === 0) {
+        this.$message.warning("请先勾选需要下载的行");
+        return;
+      }
+      try {
+        const base = process.env.VUE_APP_BASE_API || "";
+        const firstId = this.selectedChainIds[0];
+        const url = `${base}/system/orderPro/downloadDwg/${firstId}`;
+        const res = await axios.get(url, {
+          params: { ids: this.selectedChainIds },
+          responseType: "blob",
+          headers: { ...(this.uploadHeaders || {}) },
+        });
+        const contentType = res && res.headers && res.headers["content-type"];
+        if (contentType && contentType.includes("application/json")) {
+          // 错误信息
+          const text = await new Response(res.data).text();
+          try {
+            const json = JSON.parse(text);
+            this.$message.error(json.msg || json.message || "下载失败");
+          } catch (_) {
+            this.$message.error(text || "下载失败");
+          }
+          return;
+        }
+        // 提取文件名
+        let filename = `${(this.productionObj && this.productionObj.productionOrderNo) || "DWG"}_ZIP.zip`;
+        const cd = res && res.headers && res.headers["content-disposition"];
+        if (cd) {
+          const m = cd.match(/filename\*?=UTF-8''([^;]+)|filename="?([^";]+)"?/i);
+          const raw = (m && (m[1] || m[2])) || "";
+          if (raw) {
+            try {
+              filename = decodeURIComponent(raw.replace(/\+/g, "%20"));
+            } catch (_) {
+              filename = raw;
+            }
+          }
+        }
+        const blob = new Blob([res.data], { type: "application/zip" });
+        const link = document.createElement("a");
+        const urlObj = window.URL.createObjectURL(blob);
+        link.href = urlObj;
+        link.download = filename;
+        link.click();
+        window.URL.revokeObjectURL(urlObj);
+        this.$message.success("图纸ZIP下载成功");
+      } catch (e) {
+        this.$message.error("下载失败：" + (e.message || e));
+      }
+    },
+    async pushDingTalkCard() {
+      if (!this.productionObj || !this.productionObj.id) {
+        this.$message.warning("请先选择生产令号");
+        return;
+      }
+      try {
+        const base = process.env.VUE_APP_BASE_API || "";
+        const url = `${base}/system/orderPro/pushDingTalkCard/${this.productionObj.id}`;
+        const res = await axios.post(url, null, { headers: { ...(this.uploadHeaders || {}) } });
+        const ct = res && res.headers && res.headers["content-type"];
+        if (ct && ct.includes("application/json")) {
+          const data = res.data;
+          if (data && (data.code === 200 || data.success)) {
+            this.$message.success("已推送钉钉卡片");
+          } else {
+            this.$message.error((data && (data.msg || data.message)) || "推送失败");
+          }
+        } else {
+          this.$message.success("已推送钉钉卡片");
+        }
+      } catch (e) {
+        this.$message.error("推送失败：" + (e.message || e));
+      }
+    },
+    async clearProject(row) {
+      if (!row || !row.id) {
+        this.$message.warning("未获取到项目ID");
+        return;
+      }
+      try {
+        await this.$confirm(
+          `确认清空项目【${row.productionOrderNo || row.id}】的关联数据？（保留项目本身）`,
+          "提示",
+          { type: "warning" }
+        );
+      } catch (e) {
+        return;
+      }
+      try {
+        const base = process.env.VUE_APP_BASE_API || "";
+        const url = `${base}/system/orderPro/clear/${row.id}`;
+        await axios.delete(url, { headers: { ...(this.uploadHeaders || {}) } });
+        this.$message.success("清空项目数据成功");
+        this.getList();
+      } catch (e) {
+        this.$message.error("清空失败：" + (e.message || e));
       }
     },
     async saveChainForm() {
       if (!this.chainForm.productionCode) {
-        this.$message.warning('生产令号不能为空');
+        this.$message.warning("生产令号不能为空");
         return;
       }
       if (!this.chainForm.figureNumber) {
-        this.$message.warning('图号不能为空');
+        this.$message.warning("图号不能为空");
         return;
       }
       if (!this.chainForm.figureName) {
-        this.$message.warning('名称不能为空');
+        this.$message.warning("名称不能为空");
         return;
       }
       if (!this.chainForm.figureNum || Number(this.chainForm.figureNum) < 1) {
-        this.$message.warning('数量不能为空且必须大于0');
+        this.$message.warning("数量不能为空且必须大于0");
         return;
       }
       const payload = {
@@ -2115,26 +2550,29 @@ export default {
         jdInventory: this.chainForm.jdInventory || undefined,
         axialType: this.chainForm.axialType || undefined,
         boxType: this.chainForm.boxType || undefined,
-        selectedFileType: this.chainForm.selectedFileType || '',
-        drawPath: this.chainForm.drawPath || '',
+        selectedFileType: this.chainForm.selectedFileType || "",
+        drawPath: this.chainForm.drawPath || "",
+        fileType: this.chainForm.fileType || "",
+        drawBy: this.chainForm.drawBy || "",
+        drawTime: this.normalizeDateTimeNonZero(this.chainForm.drawTime) || null,
       };
 
       if (this.isEditChain && this.chainForm.id) {
         payload.id = this.chainForm.id;
       }
-      console.log('saveChainForm........', payload);
+      console.log("saveChainForm........", payload);
       try {
         if (this.isEditChain) {
           await this.$api.updateProduct(payload);
-          this.$message.success('修改成功');
+          this.$message.success("修改成功");
         } else {
           await this.$api.addProduct(payload);
-          this.$message.success('添加成功');
+          this.$message.success("添加成功");
         }
         this.chainDialogVisible = false;
         this.loadChainTableData();
       } catch (e) {
-        const msg = this.isEditChain ? '修改失败' : '添加失败';
+        const msg = this.isEditChain ? "修改失败" : "添加失败";
         this.$message.error(msg);
       }
     },
@@ -2146,38 +2584,41 @@ export default {
         return;
       }
       this.chainLoading = true;
-      listRigidChain({typeName: query}).then(res => {
-        this.rigidChainOptions = (res.rows || []).slice(0, 10);
-        const types = new Set();
-        const journeys = new Set();
-        this.rigidChainOptions.forEach(item => {
-          if (item.type) types.add(item.type);
-          if (item.typeName) types.add(item.typeName);
-          if (item.journey) journeys.add(item.journey);
+      listRigidChain({ typeName: query })
+        .then((res) => {
+          this.rigidChainOptions = (res.rows || []).slice(0, 10);
+          const types = new Set();
+          const journeys = new Set();
+          this.rigidChainOptions.forEach((item) => {
+            if (item.type) types.add(item.type);
+            if (item.typeName) types.add(item.typeName);
+            if (item.journey) journeys.add(item.journey);
+          });
+          this.typeOptions = Array.from(types);
+          this.journeyOptions = Array.from(journeys);
+          this.chainLoading = false;
+        })
+        .catch(() => {
+          this.chainLoading = false;
         });
-        this.typeOptions = Array.from(types);
-        this.journeyOptions = Array.from(journeys);
-        this.chainLoading = false;
-      }).catch(() => {
-        this.chainLoading = false;
-      });
     },
     onRigidChainSelect(id) {
       if (!id) {
-        this.chainForm.productType = '';
-        this.chainForm.figureNumber = '';
-        this.chainForm.figureName = '';
-        this.chainForm.drawPath = '';
+        this.chainForm.productType = "";
+        this.chainForm.figureNumber = "";
+        this.chainForm.figureName = "";
+        this.chainForm.drawPath = "";
         return;
       }
 
-      const selected = this.rigidChainOptions.find(item => item.id === id);
+      const selected = this.rigidChainOptions.find((item) => item.id === id);
 
       if (selected) {
-        this.chainForm.productType = selected.type || '';
-        this.chainForm.figureNumber = selected.typeName || selected.figureNumber || '';
-        this.chainForm.figureName = selected.productName || '';
-        this.chainForm.drawPath = selected.drawPath || '';
+        this.chainForm.productType = selected.type || "";
+        this.chainForm.figureNumber =
+          selected.typeName || selected.figureNumber || "";
+        this.chainForm.figureName = selected.productName || "";
+        this.chainForm.drawPath = selected.drawPath || "";
         if (!this.chainForm.figureNum) {
           this.chainForm.figureNum = 1;
         }
@@ -2187,43 +2628,55 @@ export default {
       }
     },
     async executeDrawCommand() {
-      this.drawLoading = true;
-      this.drawLog = '';
-      try {
-        // 调用后端出图接口，传递当前pid和chainTable
-        // const orderPro = null;
-        const res = await executDrawing(this.productionObj);
-        if (res.code === 200) {
-          this.time = setInterval(async () => {
-            const data = await getstate();
+        this.drawLoading = true;
+        this.drawLog = "";
 
-            if (data.processstate === 3) {
-              // 分割消息
-              const msg = data.msg.split(',');
-              // 分割进度
-              const percentage = msg[1].split('/');
-              // 计算进度保留两位小数
-              this.percentage = (percentage[0] / percentage[1] * 100).toFixed(2);
-            }
+        try {
+          const res = await executDrawing(this.productionObj);
 
-            this.drawLog = data.msg;
+          if (res.code === 200) {
+            this.time = setInterval(async () => {
+              const data = await getstate();
 
-            // 出图完成
-            if (data.processstate === 4) {
-              this.percentage = 100;
-              clearInterval(this.time);
-              this.time = null;
-            }
-          }, 1000);
+              this.drawLog = data.msg;
+
+              // 进行中
+              if (data.processstate === 3) {
+                const msg = data.msg.split(",");
+
+                if (msg.length > 1) {
+                  const progress = msg[1]
+                    .replace(".", "")
+                    .replace(/\s/g, "")
+                    .split("/");
+
+                  const current = Number(progress[0]);
+                  const total = Number(progress[1]);
+
+                  if (total > 0) {
+                    this.percentage = Number(
+                      ((current / total) * 100).toFixed(2)
+                    );
+                  }
+                }
+              }
+
+              // 完成
+              if (data.processstate === 4) {
+                this.percentage = 100;
+
+                clearInterval(this.time);
+                this.time = null;
+
+                this.drawLoading = false;
+              }
+            }, 1000);
+          }
+        } catch (e) {
+          this.drawLog = "出图失败：" + (e.msg || e.message || e);
+          this.drawLoading = false;
         }
-
-
-      } catch (e) {
-        this.drawLog = '出图失败：' + (e.msg || e.message || e);
-      } finally {
-        this.drawLoading = false;
-      }
-    },
+      },
     // 加载销齿链型号表格数据
     async loadChainTableData() {
       if (!this.productionObj || !this.productionObj.id) {
@@ -2232,64 +2685,81 @@ export default {
       }
       try {
         this.getMrpData(this.productionObj.id); // 获取MRP数据
-        const response = await listSave({pid: this.productionObj.id});
+        const response = await listSave({ pid: this.productionObj.id });
         this.chainTable = response.rows || [];
       } catch (error) {
-        console.error('加载表格数据失败:', error);
+        console.error("加载表格数据失败:", error);
         this.chainTable = [];
       }
     },
     getConfigIniOptions() {
-      listConfigIni().then(res => {
-        this.configIniOptions = (res.rows || []).map(item => ({
+      listConfigIni().then((res) => {
+        this.configIniOptions = (res.rows || []).map((item) => ({
           fileType: item.fileType,
-          fileUrl: item.fileUrl
+          fileUrl: item.fileUrl,
         }));
       });
     },
     onConfigIniSelect(fileType) {
-      const selected = this.configIniOptions.find(item => item.fileType === fileType);
+      const selected = this.configIniOptions.find(
+        (item) => item.fileType === fileType
+      );
       if (selected) {
         this.chainForm.drawPath = selected.fileUrl;
       }
     },
     setSelectedFileTypeFromPath(path) {
       if (!path) {
-        this.chainForm.selectedFileType = '';
+        this.chainForm.selectedFileType = "";
         return;
       }
-      const match = this.configIniOptions && this.configIniOptions.find(opt => opt.fileUrl === path);
+      const match =
+        this.configIniOptions &&
+        this.configIniOptions.find((opt) => opt.fileUrl === path);
       if (match) {
         this.chainForm.selectedFileType = match.fileType;
       } else if (!this.configIniOptions || this.configIniOptions.length === 0) {
         // 配置尚未加载，拉取后再匹配
         this.getConfigIniOptions();
         this.$nextTick(() => {
-          const m = this.configIniOptions.find(opt => opt.fileUrl === path);
+          const m = this.configIniOptions.find((opt) => opt.fileUrl === path);
           if (m) this.chainForm.selectedFileType = m.fileType;
         });
       }
     },
     getFullImageUrl(row) {
-      if (!row) return '';
-      let url = row.drawingPathUrl || row.drawingPath || '';
-      if (!url) return '';
-      if (typeof url === 'string') {
-        url = url.replace(/[`'"]/g, '').trim();
+      if (!row) return "";
+      let url = row.drawingPathUrl || row.drawingPath || "";
+      if (!url) return "";
+      if (typeof url === "string") {
+        url = url.replace(/[`'"]/g, "").trim();
       }
       return url;
     },
+    getImageList(row) {
+      if (!row) return [];
+      const raw = row.drawingPathUrl || row.drawingPath || "";
+      if (!raw) return [];
+      if (Array.isArray(raw)) return raw.filter(Boolean).map((s) => String(s).trim());
+      if (typeof raw === "string") {
+        return raw
+          .split(",")
+          .map((s) => s.trim())
+          .filter((s) => s.length > 0);
+      }
+      return [];
+    },
     beforeDwgUpload(file, row) {
       // 验证文件格式
-      const ext = file.name.split('.').pop().toLowerCase();
-      if (ext !== 'dwg') {
-        this.$message.error('仅支持dwg格式文件上传');
+      const ext = file.name.split(".").pop().toLowerCase();
+      if (ext !== "dwg") {
+        this.$message.error("仅支持dwg格式文件上传");
         return false;
       }
 
       // 验证行数据
       if (!row || !row.id) {
-        this.$message.error('行数据无效，无法上传');
+        this.$message.error("行数据无效，无法上传");
         return false;
       }
 
@@ -2298,7 +2768,9 @@ export default {
       const maxSize = limitMB * 1024 * 1024;
       const sizeMB = (file.size / (1024 * 1024)).toFixed(2);
       if (file.size > maxSize) {
-        this.$message.error(`文件过大（所选 ${sizeMB}MB，限制 ${limitMB}MB）。请压缩后重试或联系管理员调整服务器限制`);
+        this.$message.error(
+          `文件过大（所选 ${sizeMB}MB，限制 ${limitMB}MB）。请压缩后重试或联系管理员调整服务器限制`
+        );
         return false;
       }
 
@@ -2315,127 +2787,251 @@ export default {
           row.drawPath = response.data.filePath;
         }
       } else {
-        this.$message.error((response && response.msg) || '上传失败');
+        this.$message.error((response && response.msg) || "上传失败");
       }
     },
     handleDwgUploadError(error, file, row) {
-      console.error('图纸上传失败:', error);
-      const status = (error && (error.status || (error.response && error.response.status))) || 0;
+      console.error("图纸上传失败:", error);
+      const status =
+        (error &&
+          (error.status || (error.response && error.response.status))) ||
+        0;
       if (status === 413) {
-        this.$message.error('文件过大（超出服务器限制）。请联系管理员提高上传大小限制或压缩文件后重试');
+        this.$message.error(
+          "文件过大（超出服务器限制）。请联系管理员提高上传大小限制或压缩文件后重试"
+        );
         return;
       }
       this.$message.error(`图纸上传失败：${file.name}`);
     },
     downloadPDF() {
       if (!this.productionObj || !this.productionObj.id) {
-        this.$message.error('请先选择生产令号');
+        this.$message.error("请先选择生产令号");
         return;
       }
 
-      this.$message.success('开始下载PDF文件');
-      console.log('开始下载，生产令号ID:', this.productionObj.id);
+      this.$message.success("开始下载PDF文件");
+      console.log("开始下载，生产令号ID:", this.productionObj.id);
 
       // 调用API获取文件流
       uploadPDF(this.productionObj.id)
-        .then(response => {
-          console.log('API响应:', response);
-          console.log('响应类型:', typeof response);
-          console.log('是否为Blob:', response instanceof Blob);
+        .then((response) => {
+          console.log("API响应:", response);
+          console.log("响应类型:", typeof response);
+          console.log("是否为Blob:", response instanceof Blob);
 
           // 检查响应是否为blob类型
           if (!(response instanceof Blob)) {
-            console.error('响应不是文件流:', response);
-            this.$message.error('服务器返回的不是文件流');
+            console.error("响应不是文件流:", response);
+            this.$message.error("服务器返回的不是文件流");
             return;
           }
 
           // 检查文件大小
-          console.log('文件大小:', response.size);
+          console.log("文件大小:", response.size);
           if (response.size === 0) {
-            this.$message.error('文件为空或下载失败');
+            this.$message.error("文件为空或下载失败");
             return;
           }
 
           // 创建blob对象并下载
-          let blob = new Blob([response], {type: 'application/zip'});
+          let blob = new Blob([response], { type: "application/zip" });
           let url = window.URL.createObjectURL(blob);
-          const link = document.createElement('a');
+          const link = document.createElement("a");
           link.href = url;
           link.download = `${this.productionObj.productionOrderNo}_PDF.zip`;
           link.click();
           window.URL.revokeObjectURL(url);
 
-          this.$message.success('PDF文件下载成功');
+          this.$message.success("PDF文件下载成功");
         })
-        .catch(error => {
-
-          this.$message.error('PDF文件下载失败: ' + (error.message || error));
+        .catch((error) => {
+          this.$message.error("PDF文件下载失败: " + (error.message || error));
         });
     },
     downloadRoute() {
       if (!this.productionObj || !this.productionObj.id) {
-        this.$message.error('请先选择生产令号');
+        this.$message.error("请先选择生产令号");
         return;
       }
 
-      this.$message.success('开始下载生产工艺计划表');
-      console.log('开始下载，生产令号ID:', this.productionObj.id);
+      this.$message.success("开始下载生产工艺计划表");
+      console.log("开始下载，生产令号ID:", this.productionObj.id);
 
       // 调用API获取文件流
       exportRoute(this.productionObj.id)
-        .then(response => {
+        .then((response) => {
           // 检查文件大小
           if (response.size === 0) {
-            this.$message.error('文件为空或下载失败');
+            this.$message.error("文件为空或下载失败");
             return;
           }
 
           // 创建blob对象并下载
-          let blob = new Blob([response], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+          let blob = new Blob([response], {
+            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          });
           let url = window.URL.createObjectURL(blob);
-          const link = document.createElement('a');
+          const link = document.createElement("a");
           link.href = url;
           link.download = `${this.productionObj.productionOrderNo}_生产工艺计划表.xlsx`;
           link.click();
           window.URL.revokeObjectURL(url);
 
-      this.$message.success('生产工艺计划表下载成功');
+          this.$message.success("生产工艺计划表下载成功");
         })
-        .catch(error => {
-          console.error('下载失败:', error);
+        .catch((error) => {
+          console.error("下载失败:", error);
           // 后端异常会直接抛出，显示错误信息
-          this.$message.error('下载失败: ' + (error.message || '项目未出图'));
+          this.$message.error("下载失败: " + (error.message || "项目未出图"));
         });
     },
     downloadRoute3() {
-      this.$message.success('开始导出工艺计划表');
-      console.log('开始下载，生产令号ID:', this.productionObj.id);
+      this.$message.success("开始导出工艺计划表");
+      console.log("开始下载，生产令号ID:", this.productionObj.id);
       exportRoute3(this.productionObj.id)
-        .then(response => {
+        .then((response) => {
           if (response.size === 0) {
-            this.$message.error('文件为空或下载失败');
+            this.$message.error("文件为空或下载失败");
             return;
           }
-          const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+          const blob = new Blob([response], {
+            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          });
           const url = window.URL.createObjectURL(blob);
-          const link = document.createElement('a');
+          const link = document.createElement("a");
           link.href = url;
           link.download = `${this.productionObj.productionOrderNo}_工艺计划表.xlsx`;
           link.click();
           window.URL.revokeObjectURL(url);
-          this.$message.success('工艺计划表下载成功');
+          this.$message.success("工艺计划表下载成功");
         })
-        .catch(error => {
-          console.error('下载失败:', error);
-          this.$message.error('下载失败: ' + (error.message || '项目未出图'));
+        .catch((error) => {
+          console.error("下载失败:", error);
+          this.$message.error("下载失败: " + (error.message || "项目未出图"));
         });
     },
+    async pushProcessInbound() {
+      if (!this.productionObj || !this.productionObj.productionOrderNo) {
+        this.$message.error("请先选择生产令号");
+        return;
+      }
+      try {
+        const { value } = await this.$prompt(
+          "请输入入库编码（仓库编号）",
+          "推送工序计划单入库",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            inputPlaceholder: "例如：CK001",
+            inputValidator: (val) => !!(val && String(val).trim()),
+            inputErrorMessage: "入库编码不能为空",
+          }
+        );
+        const code = String(value).trim();
+        const res = await updateProductionOrders(
+          this.productionObj.productionOrderNo,
+          code
+        );
+        if (res && (res.code === 200 || res.success)) {
+          const list = res.data || [];
+          const msg = Array.isArray(list)
+            ? `成功：${list.length} 项`
+            : "推送成功";
+          this.$message.success(msg);
+        } else {
+          this.$message.error(res?.msg || "推送失败");
+        }
+      } catch (e) {
+        // 用户取消或异常
+        if (e && e === "cancel") return;
+        this.$message.error("推送失败：" + (e.message || e));
+      }
+    },
+    async pushPurchaseInbound() {
+      if (!this.productionObj || !this.productionObj.productionOrderNo) {
+        this.$message.error("请先选择生产令号");
+        return;
+      }
+      try {
+        const { value } = await this.$prompt(
+          "请输入入库编码（仓库编号）",
+          "推送入库采购申请",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            inputPlaceholder: "例如：CK001",
+            inputValidator: (val) => !!(val && String(val).trim()),
+            inputErrorMessage: "入库编码不能为空",
+          }
+        );
+        const code = String(value).trim();
+        const res = await updateCgOrders(
+          this.productionObj.productionOrderNo,
+          code
+        );
+        if (res && (res.code === 200 || res.success)) {
+          const list = res.data || [];
+          const msg = Array.isArray(list)
+            ? `成功：${list.length} 项`
+            : "推送成功";
+          this.$message.success(msg);
+        } else {
+          this.$message.error(res?.msg || "推送失败");
+        }
+      } catch (e) {
+        if (e && e === "cancel") return;
+        this.$message.error("推送失败：" + (e.message || e));
+      }
+    },
+    formatStepTime(row, field, fmt) {
+      const val = row && row[field];
+      if (!this.isValidTime(val)) return "—";
+      const format = fmt || "{y}-{m}-{d} {h}:{i}:{s}";
+      return this.parseTime(val, format);
+    }, drawingTime(row, field, fmt) {
+      const val = row && row[field];
+      if (!this.isValidTime(val)) return "—";
+      const format = fmt || "{y}-{m}-{d} {h}:{i}:{s}";
+      return this.parseTime(val, format);
+    },
+    isValidTime(val) {
+      if (!val) return false;
+      const d = new Date(val);
+      if (isNaN(d.getTime())) return false;
+      const year = d.getFullYear();
+      return year > 1971;
+    },
+    parseDesignerArray(v) {
+      if (!v) return [];
+      if (Array.isArray(v)) return v.filter(Boolean).map((x) => String(x));
+      if (typeof v === "string") {
+        return v
+          .split(",")
+          .map((s) => s.trim())
+          .filter((s) => s.length > 0);
+      }
+      return [];
+    },
+    getDesignerLabels(value) {
+      const opts =
+        (this.dict && this.dict.type && this.dict.type.plan_proer) || [];
+      const codes = this.parseDesignerArray(value);
+      return codes.map((c) => {
+        const m =
+          opts.find(
+            (o) =>
+              String(o.value) === String(c) ||
+              String(o.dictValue || "") === String(c)
+          ) || null;
+        return m ? m.label || m.dictLabel || c : c;
+      });
+    },
   },
   beforeMount() {
     clearInterval(this.time);
     this.time = null;
-  }
+  },
 };
 </script>
 
@@ -2475,7 +3071,8 @@ export default {
   line-height: 1.3;
   margin-top: 6px;
   width: 100%;
-  padding-left: 22px; /* 与上面的图标对齐 */
+  padding-left: 22px;
+  /* 与上面的图标对齐 */
 }
 
 .drawing-path i {
@@ -2574,19 +3171,21 @@ export default {
 }
 
 .project-name-column {
-  color: #008B8B; /* 深青绿色 */
+  color: #008b8b;
+  /* 深青绿色 */
   font-weight: 500;
 }
 
 .project-name-column {
-  color: #008B8B; /* 深青绿色 */
+  color: #008b8b;
+  /* 深青绿色 */
   font-weight: 500;
 }
 
 /* MRP运算结果复查表格样式 */
 .mrp-result-card .el-card__header {
   background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
-  border-bottom: 2px solid #409EFF;
+  border-bottom: 2px solid #409eff;
 }
 
 .mrp-result-card .el-table {
@@ -2603,13 +3202,13 @@ export default {
   background-color: #fafafa;
 }
 
-.mrp-result-card .el-table__body tr:hover > td {
+.mrp-result-card .el-table__body tr:hover>td {
   background-color: #f0f9ff !important;
 }
 
 /* 数值列的颜色样式 */
 .mrp-result-card .el-table .cell {
-  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+  font-family: "Monaco", "Menlo", "Ubuntu Mono", monospace;
   font-size: 13px;
 }
 
@@ -2626,9 +3225,9 @@ export default {
 }
 
 .mrp-result-card .el-pagination .el-pager li.active {
-  background: #409EFF;
+  background: #409eff;
   color: #fff;
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 
 /* 负库存行样式 */
@@ -2636,7 +3235,7 @@ export default {
   background-color: #fef0f0 !important;
 }
 
-.mrp-result-card .el-table .negative-stock-row:hover > td {
+.mrp-result-card .el-table .negative-stock-row:hover>td {
   background-color: #fde2e2 !important;
 }
 
@@ -2645,7 +3244,7 @@ export default {
   background-color: #fdf6ec !important;
 }
 
-.mrp-result-card .el-table .zero-stock-row:hover > td {
+.mrp-result-card .el-table .zero-stock-row:hover>td {
   background-color: #faecd8 !important;
 }
 
@@ -2714,11 +3313,11 @@ export default {
 }
 
 .mrp-search-input:hover .el-input__inner {
-  border-color: #409EFF;
+  border-color: #409eff;
 }
 
 .mrp-search-input .el-input__inner:focus {
-  border-color: #409EFF;
+  border-color: #409eff;
   box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
 }
 </style>
diff --git a/src/views/system/proPlan/index.vue b/src/views/system/proPlan/index.vue
index aea12e8..bfda7fd 100644
--- a/src/views/system/proPlan/index.vue
+++ b/src/views/system/proPlan/index.vue
@@ -39,6 +39,7 @@
         <el-select v-model="queryParams.processStatus" placeholder="请选择方案状态" clearable>
           <el-option label="未开始" value="0" />
           <el-option label="已完成" value="1" />
+           <el-option label="已取消" value="2" />
 
         </el-select>
       </el-form-item>
@@ -100,7 +101,14 @@
       <el-table-column label="方案编码" align="center" prop="projectCode" />
       <el-table-column label="设计人" align="center" prop="designer">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.plan_proer" :value="scope.row.designer"/>
+          <div>
+            <el-tag
+              v-for="n in getDesignerLabels(scope.row.designer)"
+              :key="n"
+              size="mini"
+              style="margin-right:4px"
+            >{{ n }}</el-tag>
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="方案备注" align="center" prop="remark" />
@@ -156,13 +164,13 @@
           <el-input v-model="form.projectCode" placeholder="请输入方案编码" />
         </el-form-item>
         <el-form-item label="设计人" prop="designer">
-          <el-select v-model="form.designer" placeholder="请选择设计人">
+          <el-select v-model="form.designer" multiple collapse-tags placeholder="请选择设计人" clearable>
             <el-option
               v-for="dict in dict.type.plan_proer"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
-            ></el-option>
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="方案备注" prop="remark">
@@ -188,6 +196,7 @@
           <el-select v-model="form.processStatus" placeholder="请选择方案状态">
             <el-option label="未开始" value="0" />
             <el-option label="已完成" value="1" />
+            <el-option label="已取消" value="2" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -330,7 +339,8 @@ export default {
       const id = row.id || this.ids
       getProPlan(id).then(response => {
         this.loading = false;
-        this.form = response.data;
+        this.form = response.data || {};
+        this.form.designer = this.parseDesignerArray(this.form.designer);
         this.open = true;
         this.title = "修改方案管理";
       });
@@ -341,7 +351,13 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.id != null) {
-            updateProPlan(this.form).then(response => {
+            const payload = {
+              ...this.form,
+              designer: Array.isArray(this.form.designer)
+                ? this.form.designer.join(",")
+                : this.form.designer
+            };
+            updateProPlan(payload).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -349,7 +365,13 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addProPlan(this.form).then(response => {
+            const payload = {
+              ...this.form,
+              designer: Array.isArray(this.form.designer)
+                ? this.form.designer.join(",")
+                : this.form.designer
+            };
+            addProPlan(payload).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -380,6 +402,25 @@ export default {
       this.download('system/proPlan/export', {
         ...this.queryParams
       }, `proPlan_${new Date().getTime()}.xlsx`)
+    },
+    parseDesignerArray(v) {
+      if (!v) return [];
+      if (Array.isArray(v)) return v.filter(Boolean).map(x => String(x));
+      if (typeof v === "string") {
+        return v.split(",").map(s => s.trim()).filter(s => s.length > 0);
+      }
+      return [];
+    },
+    getDesignerLabels(value) {
+      const opts = (this.dict && this.dict.type && this.dict.type.plan_proer) || [];
+      const codes = this.parseDesignerArray(value);
+      return codes.map(c => {
+        const m = opts.find(o =>
+          String(o.value) === String(c) ||
+          String((o.dictValue || "")) === String(c)
+        ) || null;
+        return m ? (m.label || m.dictLabel || c) : c;
+      });
     }
   }
 };
diff --git a/src/views/system/productionPlan/index.vue b/src/views/system/productionPlan/index.vue
index ebe96fb..8063980 100644
--- a/src/views/system/productionPlan/index.vue
+++ b/src/views/system/productionPlan/index.vue
@@ -324,10 +324,10 @@ export default {
         ...this.searchParams,
         text: this.options.find(option => option.value === this.value).label
       };
-      
+
       // 调用后端API进行查询
       listProcedureGX(params).then(response => {
-        // 处理返回的数据 
+        // 处理返回的数据
         if (response && Array.isArray(response)) {
           // ...
           // 这里的数据处理逻辑和selectChange方法中的类似
diff --git a/src/views/system/route/fromed.vue b/src/views/system/route/fromed.vue
index 9b1df30..b57385b 100644
--- a/src/views/system/route/fromed.vue
+++ b/src/views/system/route/fromed.vue
@@ -84,6 +84,7 @@
     :model="n"
     ref="ruleForm"
     size="mini"
+    :key="i"
     :rules="rules"
   >
       <el-form-item prop="key1">
diff --git a/src/views/system/route/index.vue b/src/views/system/route/index.vue
index 6e63be4..24b4165 100644
--- a/src/views/system/route/index.vue
+++ b/src/views/system/route/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams">
         <el-form-item label="项目令号" prop="routeDescription">
           <el-select v-model="queryParams.routeDescription" filterable remote :remote-method="handleQuery1"
-                     placeholder="请输入令号" clearable :loading="loading">
+            placeholder="请输入令号" clearable :loading="loading">
             <el-option v-for="item in projectCodes" :key="item" :label="item" :value="item"></el-option>
           </el-select>
         </el-form-item>
@@ -13,81 +13,60 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
+
       </el-form>
 
 
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:route:add']">新增
-        </el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-                   v-hasPermi="['system:route:edit']">修改
-        </el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                   v-hasPermi="['system:route:remove']">删除
-        </el-button>
-      </el-col>-->
 
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   v-hasPermi="['system:route:export']">导出
+          v-hasPermi="['system:route:export']">导出
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
-                   v-hasPermi="['system:route:importRoute']">导入工艺
+          v-hasPermi="['system:route:importRoute']">导入工艺
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-time" size="mini" @click="handleImportTime"
-                   v-hasPermi="['system:route:importDataTime']">导入时间
+          v-hasPermi="['system:route:importDataTime']">导入时间
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-share" size="mini" @click="pushRouteBom"
-                   v-hasPermi="['system:route:pushRouteBom']">推送工艺
+          v-hasPermi="['system:route:pushRouteBom']">推送工艺
         </el-button>
       </el-col>
       <el-col :span="3">
-        <el-input
-          v-model="routeGroupName"
-          placeholder="请输入推送分组"
-          size="mini"
-          clearable
-        />
+        <el-input v-model="routeGroupName" placeholder="请输入推送分组" size="mini" clearable />
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-edit" size="mini" :disabled="multiple" @click="updateProcessPlan"
-                   v-hasPermi="['system:route:updateProcessPlan']">更新计划时间
+          v-hasPermi="['system:route:updateProcessPlan']">更新计划时间
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-setting" size="mini" @click="updateProcesTime"
-                   v-hasPermi="['system:route:updateProcesTime']">更新生产订单
+          v-hasPermi="['system:route:updateProcesTime']">更新生产订单
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-document" size="mini" @click="generatePDFs1"
-                   v-hasPermi="['system:route:generatePDFs']">生成PDF
+          v-hasPermi="['system:route:generatePDFs']">生成PDF
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-warning" size="mini" @click="getKindeeExcel"
-                   v-hasPermi="['system:route:getKindeeExcel']">获取标准工艺
+          v-hasPermi="['system:route:getKindeeExcel']">获取标准工艺
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-warning" size="mini" @click="getAllRouteAndUse"
-                   v-hasPermi="['system:route:getAllRouteAndUse']">获取全部工艺
+          v-hasPermi="['system:route:getAllRouteAndUse']">获取全部工艺
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -95,32 +74,31 @@
 
     <el-form :inline="true" :model="form" ref="ruleForm" size="mini" :rules="rules">
       <el-table v-if="showtable" v-loading="loading" row-key="id" ref="tree" v-drag:[config]="form.routeList"
-                :tree-props="{ children: 'children' }" :data="form.routeList" stripe :row-class-name="tableRowClassName"
-                border max-height="680px" @cell-click="cellhand" :default-expand-all="true"
-                @selection-change="handleSelectionChange">
+        :tree-props="{ children: 'children' }" :data="form.routeList" stripe :row-class-name="tableRowClassName" border
+        max-height="680px" @cell-click="cellhand" :default-expand-all="true" @selection-change="handleSelectionChange">
 
-        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column type="selection" width="55" align="center" />
         <!--     <el-table-column label="主键ID" align="center" prop="id" v-if="true"/>-->
         <el-table-column label="操作" width="55" align="center">
           <template slot-scope="props">
             <!-- <el-button type="text" icon="el-icon-check" v-if="scope.row.id < 0" @click="onSaveChild()" /> -->
             <!-- <fromed v-if="props.row.parentId" /> -->
             <!-- {{props.row.materialCode}} -->
-            <el-button v-if="props.row.parentId" size="mini" class="handle" icon="el-icon el-icon-rank"/>
+            <el-button v-if="props.row.parentId" size="mini" class="handle" icon="el-icon el-icon-rank" />
           </template>
         </el-table-column>
 
         <!-- <el-table-column label="项目令号" align="center">
-          <template slot-scope="scope">
+          <template slot-scope="scope">升降台
             <router-link :to="'/route1/' + scope.row.routeDescription" type="primary" :underline="false">{{
       scope.row.routeDescription }}</router-link>
           </template>
         </el-table-column> -->
-        <el-table-column label="物料编码" width="120" align="center" prop="materialCode" fixed="left"/>
-        <el-table-column label="名称" width="120" align="center" prop="materialName" fixed="left"/>
+        <el-table-column label="物料编码" width="120" align="center" prop="materialCode" fixed="left" />
+        <el-table-column label="名称" width="120" align="center" prop="materialName" fixed="left" />
 
-        <el-table-column label="材质" width="80" align="center" prop="material"/>
-        <el-table-column label="单重" width="60" align="center" prop="discWeight"/>
+        <el-table-column label="材质" width="80" align="center" prop="material" />
+        <el-table-column label="单重" width="60" align="center" prop="discWeight" />
         <el-table-column label="单台数" width="60" align="center" prop="unitQuantity">
           <template slot-scope="scope">
             <span :style="{
@@ -131,24 +109,20 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="本批数" width="60" align="center" prop="batchQuantity"/>
+        <el-table-column label="本批数" width="60" align="center" prop="batchQuantity" />
+        <el-table-column label="重要程度" width="80" align="center" prop="stateImportance" />
 
-        <!--
-      <el-table-column label="材料BOM物料编码" width="220"align="center" prop="ra wMaterialCode" />
-      <el-table-column label="材料BOM物料名称"width="220" align="center" prop="rawMaterialName" />
-      <el-table-column label="用量"width="60"align="center" prop="discUsage" />
-      <el-table-column label="单位"width="60" align="center" prop="bomUnit" />-->
-        <el-table-column label="工序号" width="60" align="center" prop="processNo"/>
+        <el-table-column label="工序号" width="60" align="center" prop="processNo" />
         <el-table-column label="工作中心" width="96" align="center">
           <template slot-scope="scope">
             <el-form-item v-if="scope.row.isEdit" :prop="'routeList.' + scope.$index + '.workCenter'">
               <el-select v-model="scope.row.workCenter" placeholder="请选择工作中心" clearable>
                 <el-option v-for="dict in dict.type.work_center" :key="dict.value" :label="dict.label"
-                           :value="dict.value"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <span v-else>
-              <dict-tag :options="dict.type.work_center" :value="scope.row.workCenter"/>
+              <dict-tag :options="dict.type.work_center" :value="scope.row.workCenter" />
             </span>
           </template>
         </el-table-column>
@@ -156,10 +130,9 @@
         <el-table-column label="工序名称" width="160" align="center">
           <template slot-scope="scope">
             <el-form-item v-if="scope.row.id < 0 || scope.row.isEdit"
-                          :prop="'routeList.' + scope.$index + '.processName'">
+              :prop="'routeList.' + scope.$index + '.processName'">
               <el-select v-model="scope.row.processName" filterable remote :remote-method="handleQuery3"
-                         placeholder="请输入工序名称" clearable :loading="loading"
-                         @change="handleProcessNameChange(scope)">
+                placeholder="请输入工序名称" clearable :loading="loading" @change="handleProcessNameChange(scope)">
                 <el-option v-for="item in processName" :key="item" :label="item" :value="item"></el-option>
               </el-select>
             </el-form-item>
@@ -170,7 +143,7 @@
         <el-table-column label="序说明" width="300" align="center">
           <template slot-scope="scope">
             <el-form-item v-if="scope.row.id < 0 || scope.row.isEdit"
-                          :prop="'routeList.' + scope.$index + '.processDescription'">
+              :prop="'routeList.' + scope.$index + '.processDescription'">
               <el-input v-model="scope.row.processDescription"></el-input>
             </el-form-item>
             <span v-else>{{ scope.row.processDescription }}</span>
@@ -194,20 +167,20 @@
         <el-table-column label="活动时长" align="center">
           <template slot-scope="scope">
             <el-form-item v-if="scope.row.id < 0 || scope.row.isEdit"
-                          :prop="'routeList.' + scope.$index + '.activityDuration'">
+              :prop="'routeList.' + scope.$index + '.activityDuration'">
               <el-input v-model="scope.row.activityDuration"></el-input>
             </el-form-item>
             <span v-else>{{ scope.row.activityDuration }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="活动单位" align="center" prop="activityUnit"/>
+        <el-table-column label="活动单位" align="center" prop="activityUnit" />
         <el-table-column label="序开始时间" align="center" prop="xuStartTime" width="100">
           <template slot-scope="scope">
             <el-form-item v-if="scope.row.id < 0 || scope.row.isEdit"
-                          :prop="'routeList.' + scope.$index + '.xuStartTime'">
+              :prop="'routeList.' + scope.$index + '.xuStartTime'">
               <el-date-picker v-model="scope.row.xuStartTime" type="date" placeholder="选择序开始时间"
-                              value-format="yyyy-MM-dd" format="yyyy-MM-dd">
+                value-format="yyyy-MM-dd" format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
             <span v-else>{{ parseTime(scope.row.xuStartTime, '{y}-{m}-{d}') }}</span>
@@ -216,17 +189,14 @@
         <el-table-column label="序结束时间" align="center" prop="xuEndTime" width="100">
           <template slot-scope="scope">
             <el-form-item v-if="scope.row.id < 0 || scope.row.isEdit"
-                          :prop="'routeList.' + scope.$index + '.xuEndTime'">
-              <el-date-picker v-model="scope.row.xuEndTime" type="date" placeholder="选择序结束时间"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd">
+              :prop="'routeList.' + scope.$index + '.xuEndTime'">
+              <el-date-picker v-model="scope.row.xuEndTime" type="date" placeholder="选择序结束时间" value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
             <span v-else>{{ parseTime(scope.row.xuEndTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <!--  //<el-table-column label="单位" align="center" prop="bomUnit" /> -->
-        <!--  <el-table-column label="单台数量" align="center" prop="unitQuantity" /> -->
 
         <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="180">
           <template slot-scope="scope">
@@ -240,13 +210,13 @@
         </el-table-column>
 
         <el-table-column class="maxWidth" label="操作" width="220" fixed="right" align="center"
-                         class-name="small-padding fixed-width">
+          class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button class="btn" size="mini" @click="onAddChild(scope)" v-if="!scope.row.parentId">
               添加工艺
             </el-button>
             <el-button class="btn" size="mini" type="success" @click="onSave(scope)"
-                       v-if="!scope.row.parentId && showParentSaveBtn === scope.row.id">
+              v-if="!scope.row.parentId && showParentSaveBtn === scope.row.id">
               保存工艺
             </el-button>
             <template v-else-if="scope.row.parentId">
@@ -261,11 +231,11 @@
               <template v-else>
                 <template v-if="scope.row.id > 0">
                   <el-button class="btn" size="mini" type="primary" @click="handleRowEdit(scope)"
-                             v-hasPermi="['system:route:edit']">
+                    v-hasPermi="['system:route:edit']">
                     修改
                   </el-button>
                   <el-button class="btn" size="mini" type="danger" @click="handleDelete(scope)"
-                             v-hasPermi="['system:route:remove']">
+                    v-hasPermi="['system:route:remove']">
                     删除
                   </el-button>
                 </template>
@@ -282,7 +252,7 @@
     </el-form>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+      @pagination="getList" />
 
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -290,12 +260,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="物料编码" prop="materialCode">
-              <el-input v-model="form.materialCode" placeholder="请输入物料编码"/>
+              <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="物料名称" prop="materialName">
-              <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
+              <el-input v-model="form.materialName" placeholder="请输入物料名称" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -303,12 +273,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="材质" prop="material">
-              <el-input v-model="form.material" placeholder="请输入材质"/>
+              <el-input v-model="form.material" placeholder="请输入材质" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单重" prop="discWeight">
-              <el-input v-model="form.discWeight" placeholder="请输入单重"/>
+              <el-input v-model="form.discWeight" placeholder="请输入单重" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -328,7 +298,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="单台数量" prop="unitQuantity">
-              <el-input-number v-model="form.unitQuantity" :min="0" placeholder="请输入单台数量"/>
+              <el-input-number v-model="form.unitQuantity" :min="0" placeholder="请输入单台数量" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -336,12 +306,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="本批数量" prop="batchQuantity">
-              <el-input-number v-model="form.batchQuantity" :min="0" placeholder="请输入本批数量"/>
+              <el-input-number v-model="form.batchQuantity" :min="0" placeholder="请输入本批数量" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="首批数量" prop="firstBatchQuantity">
-              <el-input-number v-model="form.firstBatchQuantity" :min="0" placeholder="请输入首批数量"/>
+              <el-input-number v-model="form.firstBatchQuantity" :min="0" placeholder="请输入首批数量" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -365,7 +335,7 @@
           <el-col :span="12">
             <el-form-item label="工序名称" prop="processName">
               <el-select v-model="form.processName" filterable remote :remote-method="handleQuery3"
-                         placeholder="请输入工序名称" clearable :loading="loading" @change="handleProcessNameChange">
+                placeholder="请输入工序名称" clearable :loading="loading" @change="handleProcessNameChange">
                 <el-option v-for="item in processName" :key="item" :label="item" :value="item"></el-option>
               </el-select>
             </el-form-item>
@@ -375,7 +345,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="工序说明" prop="processDescription">
-              <el-input type="textarea" v-model="form.processDescription" placeholder="请输入工序说明"/>
+              <el-input type="textarea" v-model="form.processDescription" placeholder="请输入工序说明" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -392,7 +362,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="活动时长" prop="activityDuration">
-              <el-input v-model="form.activityDuration" placeholder="请输入活动时长"/>
+              <el-input v-model="form.activityDuration" placeholder="请输入活动时长" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -400,17 +370,15 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="序开始时间" prop="xuStartTime">
-              <el-date-picker v-model="form.xuStartTime" type="date" placeholder="选择序开始时间"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd">
+              <el-date-picker v-model="form.xuStartTime" type="date" placeholder="选择序开始时间" value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="序结束时间" prop="xuEndTime">
-              <el-date-picker v-model="form.xuEndTime" type="date" placeholder="选择序结束时间"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd">
+              <el-date-picker v-model="form.xuEndTime" type="date" placeholder="选择序结束时间" value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -424,13 +392,13 @@
     <!-- 导入导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-                 :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                 :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport"/>
+            <el-checkbox v-model="upload.updateSupport" />
             是否更新已经存在的物料数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
@@ -447,8 +415,8 @@
 
     <el-dialog :title="timeUpload.title" :visible.sync="timeUpload.open" width="400px" append-to-body>
       <el-upload ref="timeUpload" :limit="1" accept=".xlsx, .xls" :headers="timeUpload.headers" :action="timeUpload.url"
-                 :disabled="timeUpload.isUploading" :on-progress="handleTimeFileUploadProgress"
-                 :on-success="handleTimeFileSuccess" :auto-upload="false" drag>
+        :disabled="timeUpload.isUploading" :on-progress="handleTimeFileUploadProgress"
+        :on-success="handleTimeFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -461,7 +429,8 @@
       </div>
     </el-dialog>
     <!-- 抽屉 -->
-    <el-drawer title="BOM信息" :visible.sync="BOMpop" :before-close="bomClose" :size="1100" :destroy-on-close="true" :modal="false">
+    <el-drawer title="BOM信息" :visible.sync="BOMpop" :before-close="bomClose" :size="1100" :destroy-on-close="true"
+      :modal="false">
       <div style="padding: 20px;">
         <!-- BOM信息头部 -->
         <div class="bom-header">
@@ -492,13 +461,13 @@
 
         <!-- BOM数据表格 -->
         <el-table :data="filteredBomData" stripe max-height="400px" border v-loading="bomLoading"
-                  @selection-change="handleBomSelectionChange" element-loading-text="加载中..."
-                  element-loading-spinner="el-icon-loading">
-          <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column label="生产令号" width="150" align="center" prop="projectNumber"/>
-          <el-table-column label="物料编码" width="200" align="center" prop="materialCode" show-overflow-tooltip/>
-          <el-table-column label="物料名称" width="200" align="center" prop="materialName" show-overflow-tooltip/>
-          <el-table-column label="材质" width="70" align="center" prop="materialType"/>
+          @selection-change="handleBomSelectionChange" element-loading-text="加载中..."
+          element-loading-spinner="el-icon-loading">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="生产令号" width="150" align="center" prop="projectNumber" />
+          <el-table-column label="物料编码" width="200" align="center" prop="materialCode" show-overflow-tooltip />
+          <el-table-column label="物料名称" width="200" align="center" prop="materialName" show-overflow-tooltip />
+          <el-table-column label="材质" width="70" align="center" prop="materialType" />
 
           <el-table-column label="库存" width="88" align="center" prop="singleWeight ">
             <template slot-scope="scope">
@@ -510,12 +479,11 @@
               <span>{{ scope.row.quantity || '0' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="单位" width="88" align="center" prop="unit"/>
+          <el-table-column label="单位" width="88" align="center" prop="unit" />
           <el-table-column label="操作" align="center" width="150">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleBomEdit(scope.row)">修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete"
-                         @click="handleBomDelete(scope.row)">删除
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleBomDelete(scope.row)">删除
               </el-button>
             </template>
           </el-table-column>
@@ -530,9 +498,8 @@
             <!-- 物料名称 - 支持搜索或手动输入 -->
             <el-form-item label="物料名称" prop="materialName">
               <el-autocomplete v-model="bomForm.materialName" :fetch-suggestions="handleMaterialSearch"
-                               :trigger-on-focus="false" @select="handleMaterialSelect" placeholder="请输入物料名称"
-                               clearable
-                               popper-class="material-autocomplete-dropdown">
+                :trigger-on-focus="false" @select="handleMaterialSelect" placeholder="请输入物料名称" clearable
+                popper-class="material-autocomplete-dropdown">
                 <template slot-scope="{ item }">
                   <div class="material-suggestion-item">
                     <div class="material-name">{{ item.materialName }}</div>
@@ -571,14 +538,12 @@
 
             <!-- 当前库存 - 允许手动输入 -->
             <el-form-item label="当前库存" prop="stock">
-              <el-input-number v-model="bomForm.stock" :min="0" :precision="2"
-                               placeholder="请输入库存"></el-input-number>
+              <el-input-number v-model="bomForm.stock" :min="0" :precision="2" placeholder="请输入库存"></el-input-number>
             </el-form-item>
 
             <!-- 用量 -->
             <el-form-item label="用量" prop="quantity">
-              <el-input-number v-model="bomForm.quantity" :min="0" :precision="2"
-                               placeholder="请输入用量"></el-input-number>
+              <el-input-number v-model="bomForm.quantity" :min="0" :precision="2" placeholder="请输入用量"></el-input-number>
             </el-form-item>
           </el-form>
 
@@ -593,15 +558,13 @@
           <h3>工艺路线信息</h3>
         </div>
         <el-table :data="processRoutes" stripe border v-loading="processLoading">
-          <el-table-column label="工艺编号" prop="fnumber" width="120" align="center"/>
-          <el-table-column label="项目令号" prop="project_code" width="180" align="center"/>
-          <el-table-column label="物料编码" prop="materialCode" fixed="left" width="140" align="center"/>
-          <el-table-column label="物料名称" prop="materialName" fixed="left" min-width="140" align="center"/>
+          <el-table-column label="工艺编号" prop="fnumber" width="120" align="center" />
+          <el-table-column label="项目令号" prop="project_code" width="180" align="center" />
+          <el-table-column label="物料编码" prop="materialCode" fixed="left" width="140" align="center" />
+          <el-table-column label="物料名称" prop="materialName" fixed="left" min-width="140" align="center" />
           <el-table-column label="操作" width="120" align="center">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click="handleViewRoute(scope.row)"
+              <el-button @click="handleViewRoute(scope.row)"
                 :type="selectedRouteId === scope.row.id ? 'success' : 'primary'">
                 {{ selectedRouteId === scope.row.id ? '查看中' : '查看' }}
               </el-button>
@@ -615,11 +578,11 @@
             <h4>工序信息 - {{ selectedRoute.fnumber }}</h4>
           </div>
           <el-table :data="currentProcessList" stripe border max-height="300px">
-            <el-table-column label="工序号" prop="processNo" width="80" align="center"/>
-            <el-table-column label="工作中心" prop="workCenter" width="120" align="center"/>
-            <el-table-column label="工序名称" prop="processName" width="120" align="center"/>
-            <el-table-column label="工序说明" prop="processDescription" min-width="200" show-overflow-tooltip/>
-            <el-table-column label="工序控制" prop="processControl" width="120" align="center"/>
+            <el-table-column label="工序号" prop="processNo" width="80" align="center" />
+            <el-table-column label="工作中心" prop="workCenter" width="120" align="center" />
+            <el-table-column label="工序名称" prop="processName" width="120" align="center" />
+            <el-table-column label="工序说明" prop="processDescription" min-width="200" show-overflow-tooltip />
+            <el-table-column label="工序控制" prop="processControl" width="120" align="center" />
             <el-table-column label="活动时长" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.activityDuration }} {{ scope.row.activityUnit }}
@@ -640,14 +603,14 @@ import {
   addRoute,
   updateRoute,
   getDistinctProjectCodes,
-  updateProcessPlan, generatePDFs, updateBom, addBom, deleteBom, getKindeeExcel,getAllRouteAndUse,updateProcesTime
+  updateProcessPlan, generatePDFs, updateBom, addBom, deleteBom, getKindeeExcel, getAllRouteAndUse, updateProcesTime
 
 } from "@/api/system/route";
-import {getToken} from "../../../utils/auth";
+import { getToken } from "../../../utils/auth";
 import Fromed from './fromed'
 import Bomfrom from './bomfrom'
-import {getProcessInfoList, pushRouteBom, onSave, getBomInfo, getProcessRouteList} from "@/api/system/route";
-import {listMaterial} from "@/api/system/material";
+import { getProcessInfoList, pushRouteBom, onSave, getBomInfo, getProcessRouteList } from "@/api/system/route";
+import { listMaterial } from "@/api/system/material";
 
 import dict from "@/utils/dict";
 import DictData from "@/components/DictData";
@@ -662,7 +625,7 @@ export default {
     Bomfrom
   },
   props: {
-    params:{},
+    params: {},
     showdel: {
       type: Boolean,
       default: true
@@ -680,7 +643,7 @@ export default {
         open: false,
         title: "",
         isUploading: false,
-        headers: {Authorization: "Bearer " + getToken()},
+        headers: { Authorization: "Bearer " + getToken() },
         url: process.env.VUE_APP_BASE_API + "/system/route/importDataTime"
       },
       materialOptions: [], // 用于存储物料信息
@@ -738,6 +701,7 @@ export default {
         routeDescription: [],
         materialCode: undefined,
         materialName: undefined,
+        stateImportance: undefined,
         bomUnit: undefined,
         processNo: undefined,
         workCenter: undefined,
@@ -847,7 +811,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: {Authorization: "Bearer " + getToken()},
+        headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/route/importData"
       },
@@ -855,25 +819,25 @@ export default {
       // 表单校验
       rules: {
         id: [
-          {required: true, message: "主键ID不能为空", trigger: "blur"}
+          { required: true, message: "主键ID不能为空", trigger: "blur" }
         ],
         routeDescription: [
-          {required: true, message: "工艺路线描述不能为空", trigger: "blur"}
+          { required: true, message: "工艺路线描述不能为空", trigger: "blur" }
         ],
         materialCode: [
-          {required: true, message: "物料编码不能为空", trigger: "blur"}
+          { required: true, message: "物料编码不能为空", trigger: "blur" }
         ],
         materialName: [
-          {required: true, message: "物料名称不能为空", trigger: "blur"}
+          { required: true, message: "物料名称不能为空", trigger: "blur" }
         ],
         processControl: [  // 添加工序控制码的验证
-          {required: true, message: "工序控制码不能为空", trigger: "blur"}
+          { required: true, message: "工序控制码不能为空", trigger: "blur" }
         ],
         processName: [  // 添加工序名称的验证
-          {required: true, message: "工序名称不能为空", trigger: "blur"}
+          { required: true, message: "工序名称不能为空", trigger: "blur" }
         ],
         activityDuration: [  // 添加活动时长的验证
-          {required: true, message: "活动时长不能为空", trigger: "blur"}
+          { required: true, message: "活动时长不能为空", trigger: "blur" }
         ]
       },
       bomDialogVisible: false,
@@ -892,31 +856,31 @@ export default {
       },
       bomRules: {
         materialName: [
-          {required: true, message: '请输入物料名称', trigger: 'blur'}
+          { required: true, message: '请输入物料名称', trigger: 'blur' }
         ],
         materialCode: [
-          {required: true, message: '请输入物料编码', trigger: 'blur'}
+          { required: true, message: '请输入物料编码', trigger: 'blur' }
         ],
         materialType: [
-          {required: true, message: '请选择材质', trigger: 'change'}
+          { required: true, message: '请选择材质', trigger: 'change' }
         ],
         unit: [
-          {required: true, message: '请选择单位', trigger: 'change'}
+          { required: true, message: '请选择单位', trigger: 'change' }
         ],
         quantity: [
-          {required: true, message: '请输入用量', trigger: 'blur'}
+          { required: true, message: '请输入用量', trigger: 'blur' }
         ],
         projectNumber: [
-          {required: true, message: '项目令号不能为空', trigger: 'blur'}
+          { required: true, message: '项目令号不能为空', trigger: 'blur' }
         ],
         parentMaterialCode: [
-          {required: true, message: '父级物料编码不能为空', trigger: 'blur'}
+          { required: true, message: '父级物料编码不能为空', trigger: 'blur' }
         ],
         parentMaterialName: [
-          {required: true, message: '父级物料名称不能为空', trigger: 'blur'}
+          { required: true, message: '父级物料名称不能为空', trigger: 'blur' }
         ],
         stock: [
-          {required: true, message: '库存不能为空', trigger: 'blur'}
+          { required: true, message: '库存不能为空', trigger: 'blur' }
         ]
       },
       selectedBomRows: [],
@@ -983,76 +947,76 @@ export default {
   methods: {
     // dict,
     getKindeeExcel() {
-    // 显示加载状态
-    const loadingInstance = this.$loading({
-      lock: true,
-      text: '正在获取已投放的工艺数据...',
-      spinner: 'el-icon-loading',
-      background: 'rgba(255, 255, 255, 0.7)',
-    });
-    this.loading = true;
-
-    // 调用 reset 方法，重置表单或状态
-    this.reset();
-
-    // 获取生产订单号
-    const rooteProdet = this.params.productionOrderNo;
-
-    // 调用 getKindeeExcel 方法
-    getKindeeExcel(rooteProdet)
-      .then(data => {
-        // 处理返回的数据
-        this.$message.success('获取工艺成功！');
-      })
-      .catch(error => {
-        this.$message.error(error.message); // 显示错误消息
-      })
-      .finally(() => {
-        // 关闭加载状态
-        loadingInstance.close();
-        this.loading = false; // 关闭 loading 状态
+      // 显示加载状态
+      const loadingInstance = this.$loading({
+        lock: true,
+        text: '正在获取已投放的工艺数据...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255, 255, 255, 0.7)',
       });
+      this.loading = true;
+
+      // 调用 reset 方法，重置表单或状态
+      this.reset();
+
+      // 获取生产订单号
+      const rooteProdet = this.params.productionOrderNo;
+
+      // 调用 getKindeeExcel 方法
+      getKindeeExcel(rooteProdet)
+        .then(data => {
+          // 处理返回的数据
+          this.$message.success('获取工艺成功！');
+        })
+        .catch(error => {
+          this.$message.error(error.message); // 显示错误消息
+        })
+        .finally(() => {
+          // 关闭加载状态
+          loadingInstance.close();
+          this.loading = false; // 关闭 loading 状态
+        });
       this.handleBomRefresh();
-  },
+    },
 
 
-   getAllRouteAndUse() {
-    // 显示加载状态
-    const loadingInstance = this.$loading({
-      lock: true,
-      text: '正在获取全部工艺数据...',
-      spinner: 'el-icon-loading',
-      background: 'rgba(255, 255, 255, 0.7)',
-    });
-    this.loading = true;
-
-    // 调用 reset 方法，重置表单或状态
-    this.reset();
-
-    // 获取生产订单号
-    const rooteProdet = this.params.productionOrderNo;
-
-    // 调用 getAllRouteAndUse 方法
-    getAllRouteAndUse(rooteProdet)
-      .then(data => {
-        // 处理返回的数据
-        this.$message.success('获取全部工艺成功！');
-      })
-      .catch(error => {
-        this.$message.error(error.message); // 显示错误消息
-      })
-      .finally(() => {
-        // 关闭加载状态
-        loadingInstance.close();
-        this.loading = false; // 关闭 loading 状态
+    getAllRouteAndUse() {
+      // 显示加载状态
+      const loadingInstance = this.$loading({
+        lock: true,
+        text: '正在获取全部工艺数据...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255, 255, 255, 0.7)',
       });
+      this.loading = true;
+
+      // 调用 reset 方法，重置表单或状态
+      this.reset();
+
+      // 获取生产订单号
+      const rooteProdet = this.params.productionOrderNo;
+
+      // 调用 getAllRouteAndUse 方法
+      getAllRouteAndUse(rooteProdet)
+        .then(data => {
+          // 处理返回的数据
+          this.$message.success('获取全部工艺成功！');
+        })
+        .catch(error => {
+          this.$message.error(error.message); // 显示错误消息
+        })
+        .finally(() => {
+          // 关闭加载状态
+          loadingInstance.close();
+          this.loading = false; // 关闭 loading 状态
+        });
       this.handleBomRefresh();
-  },
+    },
 
 
     // 处理工作中心变化
     handleWorkCenterChange(scope) {
-      const {row} = scope;
+      const { row } = scope;
       const currentIndex = this.form.routeList.findIndex(item => item === row);
 
       // 移除自动设置工序控制码的逻辑
@@ -1084,7 +1048,7 @@ export default {
         }
       }
 
-      return {valid: true};
+      return { valid: true };
     },
 
     // 开始编辑行
@@ -1157,7 +1121,7 @@ export default {
       this.timeUpload.isUploading = false;
       this.$refs.timeUpload.clearFiles();
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>"
-        + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true});
+        + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
       this.getList();
     },
     // 提交时间文件上传
@@ -1272,7 +1236,7 @@ export default {
       });
     },
     // 控制表格可移动部分
-    tableRowClassName({row, rowIndex}) {
+    tableRowClassName({ row, rowIndex }) {
       // 过滤掉父节点
       if (!row.parentId) {
         return "filtered";
@@ -1434,7 +1398,7 @@ export default {
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>"
-        + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true});
+        + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
       this.getList();
     },
     // 提交上传文件
@@ -1497,7 +1461,7 @@ export default {
       getRoute(id).then(response => {
         this.loading = false;
         // 只提取工艺相关字段
-        const {workCenter, processName, processDescription, processControl, activityDuration} = response.data;
+        const { workCenter, processName, processDescription, processControl, activityDuration } = response.data;
         this.form = {
           ...this.form,  // 保留现有数据
           id: id,
@@ -1560,7 +1524,7 @@ export default {
           timeoutPromise
         ]);
         // 处理后端返回的数据 - 适配新的返回结构 R<ProcessRoutePushResultDTO>
-        const {duplicateRoutes, failedRoutes, successfulRoutes} = response.data;
+        const { duplicateRoutes, failedRoutes, successfulRoutes } = response.data;
         // 提取物料编码和错误信息
         const duplicateCodes = duplicateRoutes.join(', ');
         const failedInfo = failedRoutes.map(route =>
@@ -1592,8 +1556,8 @@ export default {
 
         // 显示错误通知
         this.$notify({
-          title: '推送失败',
-          message: error.message || '推送失败，请重试!',
+          title: '推送工艺失败',
+          message: error.message || '推送工艺失败，请重试!',
           type: 'error',
           duration: 0,
           showClose: true
@@ -1621,7 +1585,7 @@ export default {
       // 获取生产订单号
       const rooteProdet = this.params.productionOrderNo;
       //获取物料编码
-       const materialCode = this.params.materialCode;
+      const materialCode = this.params.materialCode;
 
       console.log(rooteProdet);
 
@@ -1688,7 +1652,7 @@ export default {
       generatePDFs(rooteProdet)
         .then(response => {
 
-          let blob = new Blob([response], {type: 'application/zip'})
+          let blob = new Blob([response], { type: 'application/zip' })
           let url = window.URL.createObjectURL(blob)
           const link = document.createElement('a') // 创建a标签
           link.href = url
diff --git a/src/views/system/safetyStock/index.vue b/src/views/system/safetyStock/index.vue
index d2000ae..fea50ea 100644
--- a/src/views/system/safetyStock/index.vue
+++ b/src/views/system/safetyStock/index.vue
@@ -132,15 +132,21 @@
         <el-form-item label="物料名称" prop="materialName">
           <el-input v-model="form.materialName" placeholder="请输入物料名称" />
         </el-form-item>
+        <el-form-item label="材质" prop="wlMaterial">
+          <el-input v-model="form.wlMaterial" placeholder="请输入材质" />
+        </el-form-item>
         <el-form-item label="最低安全库存" prop="minSafetyStock">
-          <el-input v-model="form.minSafetyStock" placeholder="请输入最低安全库存" />
+          <el-input v-model="form.minSafetyStock" placeholder="请输入最低安全库存" type="number" />
         </el-form-item>
         <el-form-item label="最高安全库存" prop="maxSafetyStock">
-          <el-input v-model="form.maxSafetyStock" placeholder="请输入最高安全库存" />
+          <el-input v-model="form.maxSafetyStock" placeholder="请输入最高安全库存" type="number" />
         </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-input v-model="form.type" placeholder="请输入类型" />
         </el-form-item>
+        <el-form-item label="即时库存" prop="currentStock">
+          <el-input v-model="form.currentStock" placeholder="请输入即时库存" type="number" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -180,7 +186,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 100,
+        pageSize: 10,
         materialCode: undefined,
         materialName: undefined,
         minSafetyStock: undefined,
@@ -191,32 +197,23 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键ID不能为空", trigger: "blur" }
-        ],
         materialCode: [
           { required: true, message: "物料编码不能为空", trigger: "blur" }
         ],
         materialName: [
           { required: true, message: "物料名称不能为空", trigger: "blur" }
         ],
+        wlMaterial: [
+          { required: true, message: "材质不能为空", trigger: "blur" }
+        ],
         minSafetyStock: [
           { required: true, message: "最低安全库存不能为空", trigger: "blur" }
         ],
         maxSafetyStock: [
           { required: true, message: "最高安全库存不能为空", trigger: "blur" }
         ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" }
+        type: [
+          { required: true, message: "类型不能为空", trigger: "blur" }
         ]
       }
     };
@@ -245,13 +242,11 @@ export default {
         id: undefined,
         materialCode: undefined,
         materialName: undefined,
+        wlMaterial: undefined,
         minSafetyStock: undefined,
         maxSafetyStock: undefined,
         currentStock: undefined,
-        createTime: undefined,
-        updateTime: undefined,
-        createBy: undefined,
-        updateBy: undefined
+        type: undefined
       };
       this.resetForm("form");
     },