From 662f7b29c541e30b46c40cc39ca2499660fe72a6 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 11 Mar 2026 18:00:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8F=8A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderManagement/allocationMessQuery.js    |   10 +-
 src/api/orderManagement/planYieIdOrder.js     |   12 +-
 src/api/orderManagement/sinTerPlanOrder.js    |   17 +
 .../performanceCalculate.js                   |   29 +
 .../outsourcingManagement/performanceCheck.js |   11 +
 .../performanceReview.js                      |   11 +
 .../components/millMeritsProduce.vue          |  397 +++---
 .../components/millMeritsQuality.vue          |  402 ++++--
 src/views/oem/performanceCheck/index.vue      |  140 +-
 src/views/oem/performanceReview/index.vue     |  116 +-
 .../orderManagement/allocationMessQuery.vue   | 1144 +----------------
 .../components/exception/dataMissing.vue      |    2 +-
 .../components/exception/deliveryDate.vue     |    2 +-
 .../components/exception/processMissing.vue   |    2 +-
 .../components/exception/resourceMissing.vue  |    2 +-
 .../components/lookProcess.vue                |  208 ++-
 src/views/orderManagement/plannedOrder.vue    |    6 +-
 src/views/orderManagement/sinTerPlanOrder.vue |    3 +
 src/views/periodicTesting/projectCycle.vue    |    2 +-
 src/views/periodicTesting/testProject.vue     |    2 +-
 src/views/periodicTesting/testTask.vue        |    2 +-
 21 files changed, 859 insertions(+), 1661 deletions(-)
 create mode 100644 src/api/outsourcingManagement/performanceCalculate.js
 create mode 100644 src/api/outsourcingManagement/performanceCheck.js
 create mode 100644 src/api/outsourcingManagement/performanceReview.js

diff --git a/src/api/orderManagement/allocationMessQuery.js b/src/api/orderManagement/allocationMessQuery.js
index 0e54c1d..750f71f 100644
--- a/src/api/orderManagement/allocationMessQuery.js
+++ b/src/api/orderManagement/allocationMessQuery.js
@@ -1,13 +1,9 @@
 import request from '@/axios';
 //列表接口
-export const getList = (current, size, params) => {
+export const getList = (params) => {
   return request({
-    url: '/blade-desk/order/yieldOrder/pageAllocation',
+    url: '/blade-desk/order/yieldPlan/pageAllocation',
     method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    },
+    params
   });
 };
diff --git a/src/api/orderManagement/planYieIdOrder.js b/src/api/orderManagement/planYieIdOrder.js
index 09c6832..8e60c06 100644
--- a/src/api/orderManagement/planYieIdOrder.js
+++ b/src/api/orderManagement/planYieIdOrder.js
@@ -90,7 +90,11 @@ export const getProdIdentList = () => {
   });
 };
 
-
-
-
-
+// 获取生产工艺路线
+export const getProcessRouting = (params) => {
+  return request({
+    url: '/api/blade-desk/order/yieldOrder/getCraftList',
+    method: 'post',
+    params,
+  });
+};
\ No newline at end of file
diff --git a/src/api/orderManagement/sinTerPlanOrder.js b/src/api/orderManagement/sinTerPlanOrder.js
index 3a2a699..5e168ed 100644
--- a/src/api/orderManagement/sinTerPlanOrder.js
+++ b/src/api/orderManagement/sinTerPlanOrder.js
@@ -54,3 +54,20 @@ export const closeBatchs = ids => {
     params: ids,
   });
 };
+
+
+// 获取工艺路线
+export const getProcessRoute = (params) => {
+  return request({
+    url: `/api/blade-desk/order/yieldPlan/getCraftData/${params.yieldPlanId}`,
+    method: 'get',
+  });
+};
+
+// 获取工序接口
+export const getProcess = (params) => {
+  return request({
+    url: `/api/blade-desk/order/yieldPlan/getFirstProcess/${params.partCode}`,
+    method: 'get',
+  });
+};
\ No newline at end of file
diff --git a/src/api/outsourcingManagement/performanceCalculate.js b/src/api/outsourcingManagement/performanceCalculate.js
new file mode 100644
index 0000000..0ea1656
--- /dev/null
+++ b/src/api/outsourcingManagement/performanceCalculate.js
@@ -0,0 +1,29 @@
+// 外协厂家绩效计算
+import request from '@/axios';
+
+// 获取列表
+export const getList = params => {
+  return request({
+    url: '/api/blade-desk/mesOemMerits/page',
+    method: 'get',
+    params
+  });
+};
+
+// 维护厂家绩效
+export const maintenanceData = row => {
+  return request({
+    url: '/api/blade-desk/mesOemMerits/maintenance',
+    method: 'post',
+    data: row
+  });
+};
+
+// 校对厂家绩效
+export const checkData = row => {
+  return request({
+    url: '/api/blade-desk/mesOemMerits/proofread',
+    method: 'post',
+    data: row
+  });
+};
\ No newline at end of file
diff --git a/src/api/outsourcingManagement/performanceCheck.js b/src/api/outsourcingManagement/performanceCheck.js
new file mode 100644
index 0000000..aeef633
--- /dev/null
+++ b/src/api/outsourcingManagement/performanceCheck.js
@@ -0,0 +1,11 @@
+// 外协厂家绩效评审
+import request from '@/axios';
+
+// 获取列表
+export const getList = params => {
+    return request({
+      url: '/api/blade-desk/mesOemMerits/page',
+      method: 'get',
+      params
+    });
+};
\ No newline at end of file
diff --git a/src/api/outsourcingManagement/performanceReview.js b/src/api/outsourcingManagement/performanceReview.js
new file mode 100644
index 0000000..8d25a33
--- /dev/null
+++ b/src/api/outsourcingManagement/performanceReview.js
@@ -0,0 +1,11 @@
+// 外协厂家绩效审核
+import request from '@/axios';
+
+// 获取列表
+export const getList = params => {
+    return request({
+      url: '/api/blade-desk/mesOemMerits/page',
+      method: 'get',
+      params
+    });
+};
\ No newline at end of file
diff --git a/src/views/oem/performanceCalculate/components/millMeritsProduce.vue b/src/views/oem/performanceCalculate/components/millMeritsProduce.vue
index 119026d..89c8b66 100644
--- a/src/views/oem/performanceCalculate/components/millMeritsProduce.vue
+++ b/src/views/oem/performanceCalculate/components/millMeritsProduce.vue
@@ -21,17 +21,60 @@
     </template>
     <template #menu-right> </template>
     <template #menu="scope"> </template>
-    <template #produceTsTarget="scope">
+    <template #produceStatus="scope">
       <el-tag v-if="scope.row.produceStatus == 1">未维护</el-tag>
       <el-tag v-else type="success">待校对</el-tag>
     </template>
+    <template #jhzsReality-header="{ column }">
+      <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+    </template>
+    <template #jhzsReality="{ row }">
+      <el-input :class="maintenanceArr.length > 0 
+        && maintenanceArr.find(item => item.id == row.id) 
+        && (maintenanceArr.find(item => item.id == row.id).jhzsReality === null || maintenanceArr.find(item => item.id == row.id).jhzsReality === '') && 'error'" v-model="row.jhzsReality"></el-input>
+    </template>
+    <template #zdljReality-header="{ column }">
+      <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+    </template>
+    <template #zdljReality="{ row }">
+      <el-input :class="maintenanceArr.length > 0 
+        && maintenanceArr.find(item => item.id == row.id) 
+        && (maintenanceArr.find(item => item.id == row.id).zdljReality === null || maintenanceArr.find(item => item.id == row.id).zdljReality === '') && 'error'" v-model="row.zdljReality"></el-input>
+    </template>
+    <template #qqxReality-header="{ column }">
+      <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+    </template>
+    <template #qqxReality="{ row }">
+      <el-input :class="maintenanceArr.length > 0 
+        && maintenanceArr.find(item => item.id == row.id) 
+        && (maintenanceArr.find(item => item.id == row.id).qqxReality === null || maintenanceArr.find(item => item.id == row.id).qqxReality === '') && 'error'" v-model="row.qqxReality"></el-input>
+    </template>
+    <template #produceTsReality-header="{ column }">
+      <span  style="color: red;margin-right:5px;">*</span>{{column.label}}
+    </template>
+    <template #produceTsReality="{ row }">
+      <el-input  :class="maintenanceArr.length > 0 
+        && maintenanceArr.find(item => item.id == row.id) 
+        && (maintenanceArr.find(item => item.id == row.id).produceTsReality === null || maintenanceArr.find(item => item.id == row.id).produceTsReality === '') && 'error'" v-model="row.produceTsReality"></el-input>
+    </template>
+    <template #growAbility-header="{ column }">
+      <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+    </template>
+    <template #growAbility="{ row }">
+      <el-input :class="maintenanceArr.length > 0 
+        && maintenanceArr.find(item => item.id == row.id) 
+        && (maintenanceArr.find(item => item.id == row.id).growAbility === null || maintenanceArr.find(item => item.id == row.id).growAbility === '') && 'error'" v-model="row.growAbility"></el-input>
+    </template>
   </avue-crud>
 </template>
 <script>
+import {getList,maintenanceData,checkData} from "@/api/outsourcingManagement/performanceCalculate"
 export default {
   data() {
     return {
       selectionList: [],
+      loading:false,
+      query:{},
       option: {
         height: "auto",
         calcHeight: 32,
@@ -83,26 +126,17 @@ export default {
         column: [
           {
             label: "工艺能力",
-            prop: "plate",
+            prop: "caName",
             sortable: true,
             filter: true,
             span: 24,
             search: false,
             width: 130,
-            type: "select",
-            dicData: [
-              {
-                label: "镀金",
-              },
-              {
-                label: "镀银",
-              },
-            ],
           },
           {
             label: "厂家代码",
-            prop: "bsOemCustomer.ocCode",
-            bind: "bsOemCustomer.ocCode",
+            prop: "oemCode",
+            // bind: "bsOemCustomer.ocCode",
             search: false,
             sortable: true,
             filter: true,
@@ -110,8 +144,8 @@ export default {
           },
           {
             label: "厂家名称",
-            prop: "bsOemCustomer.ocName",
-            bind: "bsOemCustomer.ocName",
+            prop: "oemName",
+            // bind: "bsOemCustomer.ocName",
             search: false,
             sortable: true,
             filter: true,
@@ -135,8 +169,8 @@ export default {
                 sortable: true,
                 filter: true,
                 span: 24,
-                cell: true,
-                rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+                // cell: true,
+                // rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
               },
             ],
           },
@@ -158,8 +192,8 @@ export default {
                 sortable: true,
                 filter: true,
                 span: 24,
-                cell: true,
-                rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+                // cell: true,
+                // rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
               },
             ],
           },
@@ -181,8 +215,8 @@ export default {
                 sortable: true,
                 filter: true,
                 span: 24,
-                cell: true,
-                rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+                // cell: true,
+                // rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
               },
             ],
           },
@@ -204,8 +238,8 @@ export default {
                 sortable: true,
                 filter: true,
                 span: 24,
-                cell: true,
-                rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+                // cell: true,
+                // rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
               },
             ],
           },
@@ -219,14 +253,14 @@ export default {
                 sortable: true,
                 filter: true,
                 span: 24,
-                cell: true,
-                rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+                // cell: true,
+                // rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
               },
             ],
           },
           {
             label: "状态",
-            prop: "produceTsTarget",
+            prop: "produceStatus",
             search: false,
             sortable: true,
             filter: true,
@@ -234,6 +268,8 @@ export default {
           },
         ],
       },
+      maintenanceArr:[],
+      otherData:[],
       form: {},
       page: {
         pageSize: 10,
@@ -243,27 +279,63 @@ export default {
     };
   },
   methods: {
+    calcData(a,b){
+      // 需要比较的字段
+      const fieldsToCheck = ['jhzsReality','zdljReality','qqxReality', 'produceTsReality', 'growAbility'];
+
+      const c = b.filter((itemB, index) => {
+        // 策略 A: 如果两个数组顺序严格一致，直接使用索引匹配 (最快)
+        const itemA = a[index]; 
+        
+        // 策略 B: 如果顺序可能不一致，需要通过 id 查找 (更稳健，但如果有重复 ID 会匹配到第一个)
+        // const itemA = a.find(item => item.id === itemB.id);
+
+        if (!itemA) return false; // a 中找不到对应的项，视情况决定是否保留，这里暂不保留
+
+        // 检查指定字段是否有任何一个不相等
+        const isDifferent = fieldsToCheck.some(key => {
+          return itemA[key] !== itemB[key];
+        });
+
+        return isDifferent;
+      });
+      return c
+    },
     maintenanceClick() {
-      //   this.$refs.myTable.fullValidate((errMap) => {
-      //     if (errMap) {
-      //       return;
-      //     }
-      //     const dataList = this.$refs.myTable.getRecordset().updateRecords;
-      //     this.$ajax
-      //       .post('oemMerits/maintenance', {
-      //         dataList,
-      //         status: 2,
-      //         type: 'produce'
-      //       })
-      //       .then((res) => {
-      //         if (res.code === 0) {
-      //           this.$message.success('维护成功');
-      //           this.queryTable();
-      //         }
-      //       });
-      //   });
+      console.log('this.otherData-------------',this.otherData)
+      console.log('this.data-------------',this.data)
+      console.log('c-------------',this.calcData(this.otherData,this.data))
+      this.maintenanceArr = this.calcData(this.otherData,this.data)
+      
+      let jhzhError = this.maintenanceArr.find(item =>  item.jhzsReality === null)
+      let zdljError = this.maintenanceArr.find(item => item.zdljReality === null)
+      let qqxError = this.maintenanceArr.find(item =>  item.qqxReality === null)
+      let produceError = this.maintenanceArr.find(item =>  item.produceTsReality === null)
+      let growError = this.maintenanceArr.find(item =>  item.growAbility === null)
+      
+      if(jhzhError || zdljError || qqxError || produceError || growError){
+        this.$message.error('请填写表格中红框数据')
+        return
+      }
+      maintenanceData({type:"produce",oemMeritsEntities:this.maintenanceArr}).then(res =>{
+        if(res.data.code === 200){
+          this.$message.success('维护成功')
+          this.onLoad()
+        }
+      })
+      
     },
     proofreadClick() {
+      let checkArr = this.data.filter(item => item.produceStatus == 2)
+      checkData({
+        oemMeritsEntities:checkArr,
+        type:'produce'
+      }).then(res =>{
+        if(res.data.code === 200){
+          this.$message.success('校对成功')
+          this.onLoad()
+        }
+      })
       //   const dataList = this.$refs.myTable.getTableData().tableData;
       //   this.$ajax
       //     .post('oemMerits/proofread', {
@@ -295,115 +367,136 @@ export default {
     },
     onLoad() {
       this.loading = true;
-      this.data = [
-        {
-          $cellEdit: true,
-          bsOemCustomer: {
-            abbreviation: "L076",
-            address: "aaa",
-            codeAndName: "L076/L076",
-            contactMan: "aaa",
-            contactPhone: "aaa",
-            craftAbility:
-              "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
-            curStatus: 0,
-            curStatusText: "正常供货",
-            email: "aaa",
-            keyValue: 21,
-            limitType: 0,
-            ocCode: "L076",
-            ocId: 21,
-            ocName: "L076",
-            oemPassword: null,
-            partCodeYesOrNo: false,
-            qualification: 10,
-            qualificationTitle: null,
-            region: "陕西省",
-            updateTime: "2023-04-14 18:33:49",
-          },
-          createMan: {
-            userId: 541,
-            userName: "崔殿龙",
-          },
-          createTime: "2023-11-10 18:06:40",
-          keyValue: 1,
-          oaaId: 1,
-          plate: "222",
-        },
-        {
-          $cellEdit: true,
-          bsOemCustomer: {
-            abbreviation: "L120",
-            address: "aaa",
-            codeAndName: "L120/L120",
-            contactMan: "aaa",
-            contactPhone: "aaa",
-            craftAbility: "不锈钢涂福斯润滑剂、DL零件包装、",
-            curStatus: 0,
-            curStatusText: "正常供货",
-            email: "aaa",
-            keyValue: 2,
-            limitType: 0,
-            ocCode: "L120",
-            ocId: 2,
-            ocName: "L120",
-            oemPassword: null,
-            partCodeYesOrNo: false,
-            qualification: 0,
-            qualificationTitle: "民品&普军",
-            region: "江苏省",
-            updateTime: "2023-04-14 18:33:49",
-          },
-          createMan: {
-            userId: 541,
-            userName: "崔殿龙",
-          },
-          createTime: "2023-11-10 18:06:40",
-          keyValue: 4,
-          oaaId: 4,
-          plate: "222",
-        },
-        {
-          $cellEdit: true,
-          bsOemCustomer: {
-            abbreviation: "L070",
-            address: "aaa",
-            codeAndName: "L070/L070",
-            contactMan: "aaa",
-            contactPhone: "aaa",
-            craftAbility: "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
-            curStatus: 0,
-            curStatusText: "正常供货",
-            email: "aaa",
-            keyValue: 5,
-            limitType: 0,
-            ocCode: "L070",
-            ocId: 5,
-            ocName: "L070",
-            oemPassword: null,
-            partCodeYesOrNo: false,
-            qualification: 10,
-            qualificationTitle: null,
-            region: "江苏省",
-            updateTime: "2023-04-14 18:33:49",
-          },
-          createMan: {
-            userId: 541,
-            userName: "崔殿龙",
-          },
-          createTime: "2023-12-06 17:24:48",
-          keyValue: 21,
-          oaaId: 21,
-          plate: "222",
-        },
-      ];
-      this.page.total = this.data.length;
-      this.loading = false;
-      setTimeout(() => {
-        this.selectionClear();
-      }, 500);
+      getList({
+        current:this.page.currentPage,
+        size:this.page.pageSize,
+        produceStatusList:"1,2",
+        statusList:"1,2",
+        ...this.query,
+      }).then((res) => {
+        this.data = res.data.data.records
+        this.otherData = JSON.parse(JSON.stringify(res.data.data.records));
+        this.page.total = res.data.data.total;
+        this.loading = false;
+      })
+        
+      // this.data = [
+      //   {
+      //     $cellEdit: true,
+      //     bsOemCustomer: {
+      //       abbreviation: "L076",
+      //       address: "aaa",
+      //       codeAndName: "L076/L076",
+      //       contactMan: "aaa",
+      //       contactPhone: "aaa",
+      //       craftAbility:
+      //         "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
+      //       curStatus: 0,
+      //       curStatusText: "正常供货",
+      //       email: "aaa",
+      //       keyValue: 21,
+      //       limitType: 0,
+      //       ocCode: "L076",
+      //       ocId: 21,
+      //       ocName: "L076",
+      //       oemPassword: null,
+      //       partCodeYesOrNo: false,
+      //       qualification: 10,
+      //       qualificationTitle: null,
+      //       region: "陕西省",
+      //       updateTime: "2023-04-14 18:33:49",
+      //     },
+      //     createMan: {
+      //       userId: 541,
+      //       userName: "崔殿龙",
+      //     },
+      //     createTime: "2023-11-10 18:06:40",
+      //     keyValue: 1,
+      //     oaaId: 1,
+      //     plate: "222",
+      //   },
+      //   {
+      //     $cellEdit: true,
+      //     bsOemCustomer: {
+      //       abbreviation: "L120",
+      //       address: "aaa",
+      //       codeAndName: "L120/L120",
+      //       contactMan: "aaa",
+      //       contactPhone: "aaa",
+      //       craftAbility: "不锈钢涂福斯润滑剂、DL零件包装、",
+      //       curStatus: 0,
+      //       curStatusText: "正常供货",
+      //       email: "aaa",
+      //       keyValue: 2,
+      //       limitType: 0,
+      //       ocCode: "L120",
+      //       ocId: 2,
+      //       ocName: "L120",
+      //       oemPassword: null,
+      //       partCodeYesOrNo: false,
+      //       qualification: 0,
+      //       qualificationTitle: "民品&普军",
+      //       region: "江苏省",
+      //       updateTime: "2023-04-14 18:33:49",
+      //     },
+      //     createMan: {
+      //       userId: 541,
+      //       userName: "崔殿龙",
+      //     },
+      //     createTime: "2023-11-10 18:06:40",
+      //     keyValue: 4,
+      //     oaaId: 4,
+      //     plate: "222",
+      //   },
+      //   {
+      //     $cellEdit: true,
+      //     bsOemCustomer: {
+      //       abbreviation: "L070",
+      //       address: "aaa",
+      //       codeAndName: "L070/L070",
+      //       contactMan: "aaa",
+      //       contactPhone: "aaa",
+      //       craftAbility: "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
+      //       curStatus: 0,
+      //       curStatusText: "正常供货",
+      //       email: "aaa",
+      //       keyValue: 5,
+      //       limitType: 0,
+      //       ocCode: "L070",
+      //       ocId: 5,
+      //       ocName: "L070",
+      //       oemPassword: null,
+      //       partCodeYesOrNo: false,
+      //       qualification: 10,
+      //       qualificationTitle: null,
+      //       region: "江苏省",
+      //       updateTime: "2023-04-14 18:33:49",
+      //     },
+      //     createMan: {
+      //       userId: 541,
+      //       userName: "崔殿龙",
+      //     },
+      //     createTime: "2023-12-06 17:24:48",
+      //     keyValue: 21,
+      //     oaaId: 21,
+      //     plate: "222",
+      //   },
+      // ];
+      // this.page.total = this.data.length;
+      // this.loading = false;
+      // setTimeout(() => {
+      //   this.selectionClear();
+      // }, 500);
     },
   },
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.error {
+  ::v-deep .el-input__wrapper {
+  //   background: red;
+  // border:none
+    border:1px solid #ff0000 !important;
+  }
+}
+</style>
diff --git a/src/views/oem/performanceCalculate/components/millMeritsQuality.vue b/src/views/oem/performanceCalculate/components/millMeritsQuality.vue
index 39da121..a84e9f9 100644
--- a/src/views/oem/performanceCalculate/components/millMeritsQuality.vue
+++ b/src/views/oem/performanceCalculate/components/millMeritsQuality.vue
@@ -18,6 +18,84 @@
             <template #menu="scope">
 
             </template>
+
+            <template #qualityStatus="scope">
+                <el-tag v-if="scope.row.qualityStatus == 1">未维护</el-tag>
+                <el-tag v-else type="success">待校对</el-tag>
+            </template>
+            
+            <template #hgxTarget-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #hgxTarget="{ row }">
+                <el-input :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).hgxTarget === null || maintenanceArr.find(item => item.id == row.id).hgxTarget === '') && 'error'" v-model="row.hgxTarget"></el-input>
+            </template>
+            <template #hgxReality-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #hgxReality="{ row }">
+                <el-input :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).hgxReality === null || maintenanceArr.find(item => item.id == row.id).hgxReality === '') && 'error'" v-model="row.hgxReality"></el-input>
+            </template>
+            <template #dppmTarget-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #dppmTarget="{ row }">
+                <el-input :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).dppmTarget === null || maintenanceArr.find(item => item.id == row.id).dppmTarget === '') && 'error'" v-model="row.dppmTarget"></el-input>
+            </template>
+            <template #dppmReality-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #dppmReality="{ row }">
+                <el-input :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).dppmReality === null || maintenanceArr.find(item => item.id == row.id).dppmReality === '') && 'error'" v-model="row.dppmReality"></el-input>
+            </template>
+            <template #djcwReality-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #djcwReality="{ row }">
+                <el-input :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).djcwReality === null || maintenanceArr.find(item => item.id == row.id).djcwReality === '') && 'error'" v-model="row.djcwReality"></el-input>
+            </template>
+            <template #qualityTsReality-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #qualityTsReality="{ row }">
+                <el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).qualityTsReality === null || maintenanceArr.find(item => item.id == row.id).qualityTsReality === '') && 'error'" v-model="row.qualityTsReality"></el-input-number>
+            </template>
+            <template #pcxReality-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #pcxReality="{ row }">
+                <el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).pcxReality === null || maintenanceArr.find(item => item.id == row.id).pcxReality === '') && 'error'" v-model="row.pcxReality"></el-input-number>
+            </template>
+            <template #dywReality-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #dywReality="{ row }">
+                <el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).dywReality === null || maintenanceArr.find(item => item.id == row.id).dywReality === '') && 'error'" v-model="row.dywReality"></el-input-number>
+            </template>
+            <template #qlwtReality-header="{ column }">
+                <span style="color: red;margin-right:5px;">*</span>{{column.label}}
+            </template>
+            <template #qlwtReality="{ row }">
+                <el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0 
+                    && maintenanceArr.find(item => item.id == row.id) 
+                    && (maintenanceArr.find(item => item.id == row.id).qlwtReality === null || maintenanceArr.find(item => item.id == row.id).qlwtReality === '') && 'error'" v-model="row.qlwtReality"></el-input-number>
+            </template>
             <!-- <template #hgxReality-header="{ column }">
                 <i style="color:red">*</i>{{ (column || {}).label }}
             </template> -->
@@ -25,6 +103,7 @@
     </div>
 </template>
 <script>
+import { getList,maintenanceData,checkData } from "@/api/outsourcingManagement/performanceCalculate"
 export default {
     components: {
 
@@ -32,6 +111,10 @@ export default {
     data() {
         return {
             selectionList: [],
+            loading:false,
+            query: {},
+            maintenanceArr:[],
+            otherData:[],
             option: {
                 height: 'auto',
                 calcHeight: 32,
@@ -81,26 +164,16 @@ export default {
                 column: [
                     {
                         label: '工艺能力',
-                        prop: 'plate',
+                        prop: 'caName',
                         sortable: true,
                         filter: true,
                         span: 24,
                         search: false,
                         width: 130,
-                        type:'select',
-                        dicData:[
-                            {
-                                label:'镀金'
-                            },
-                            {
-                                label:'镀银'
-                            }
-                        ]
                     },
                     {
                         label: '厂家代码',
-                        prop: 'bsOemCustomer.ocCode',
-                        bind: 'bsOemCustomer.ocCode',
+                        prop: 'oemCode',
                         search: false,
                         sortable: true,
                         filter: true,
@@ -109,8 +182,8 @@ export default {
                     },
                     {
                         label: '厂家名称',
-                        prop: 'bsOemCustomer.ocName',
-                        bind: 'bsOemCustomer.ocName',
+                        prop: 'oemName',
+                        // bind: 'bsOemCustomer.ocName',
                         search: false,
                         sortable: true,
                         filter: true,
@@ -129,7 +202,6 @@ export default {
                                 filter: true,
                                 span: 24,
                                 width: 120,
-                                cell: true,
                                 rules: [
                                     { required: true, message: '请输入姓名', trigger: 'blur' }
                                 ]
@@ -142,7 +214,6 @@ export default {
                                 filter: true,
                                 span: 24,
                                 width: 120,
-                                cell: true,
                                 rules: [
                                     { required: true, message: '请输入姓名', trigger: 'blur' }
                                 ]
@@ -161,7 +232,6 @@ export default {
                                 filter: true,
                                 span: 24,
                                 width: 120,
-                                cell: true,
                                 rules: [
                                     { required: true, message: '请输入姓名', trigger: 'blur' }
                                 ]
@@ -174,7 +244,6 @@ export default {
                                 filter: true,
                                 span: 24,
                                 width: 120,
-                                cell: true,
                                 rules: [
                                     { required: true, message: '请输入姓名', trigger: 'blur' }
                                 ]
@@ -202,7 +271,6 @@ export default {
                                 filter: true,
                                 span: 24,
                                 width: 120,
-                                cell: true,
                                 rules: [
                                     { required: true, message: '请输入姓名', trigger: 'blur' }
                                 ]
@@ -324,7 +392,7 @@ export default {
                     },
                     {
                         label: '状态',
-                        prop: 'omStatusTitle',
+                        prop: 'qualityStatus',
                         search: false,
                         sortable: true,
                         filter: true,
@@ -345,6 +413,66 @@ export default {
         }
     },
     methods: {
+        calcData(a,b){
+            // 需要比较的字段
+            const fieldsToCheck = ['djcwReality','qualityTsReality','pcxReality', 'dywReality', 'qlwtReality','dppmTarget',
+            'dppmReality','hgxTarget','hgxReality'];
+
+            const c = b.filter((itemB, index) => {
+                // 策略 A: 如果两个数组顺序严格一致，直接使用索引匹配 (最快)
+                const itemA = a[index]; 
+                
+                // 策略 B: 如果顺序可能不一致，需要通过 id 查找 (更稳健，但如果有重复 ID 会匹配到第一个)
+                // const itemA = a.find(item => item.id === itemB.id);
+
+                if (!itemA) return false; // a 中找不到对应的项，视情况决定是否保留，这里暂不保留
+
+                // 检查指定字段是否有任何一个不相等
+                const isDifferent = fieldsToCheck.some(key => {
+                return itemA[key] !== itemB[key];
+                });
+
+                return isDifferent;
+            });
+            return c
+        },
+        maintenanceClick(){
+            this.maintenanceArr = this.calcData(this.otherData,this.data)
+            console.log('main------------',this.maintenanceArr)
+
+            let djcwError = this.maintenanceArr.find(item =>  item.djcwReality === null)
+            let qualityError = this.maintenanceArr.find(item => item.qualityTsReality === null)
+            let pcxError = this.maintenanceArr.find(item =>  item.pcxReality === null)
+            let dywError = this.maintenanceArr.find(item =>  item.dywReality === null)
+            let qlwtError = this.maintenanceArr.find(item =>  item.qlwtReality === null)
+            let dppmTargetError = this.maintenanceArr.find(item =>  item.dppmTarget === null)
+            let dppmRealityError = this.maintenanceArr.find(item =>  item.dppmReality === null)
+            let hgxTargetError = this.maintenanceArr.find(item =>  item.hgxTarget === null)
+            let hgxRealityError = this.maintenanceArr.find(item =>  item.hgxReality === null)
+            
+            if(djcwError || qualityError || pcxError || dywError || qlwtError || dppmTargetError || dppmRealityError || hgxTargetError || hgxRealityError){
+                this.$message.error('请填写表格中红框数据')
+                return
+            }
+            maintenanceData({type:"quality",oemMeritsEntities:this.maintenanceArr}).then(res =>{
+                if(res.data.code === 200){
+                    this.$message.success('维护成功')
+                    this.onLoad()
+                }
+            })
+        },
+        proofreadClick(){
+            let checkArr = this.data.filter(item => item.qualityStatus == 2)
+            checkData({
+                oemMeritsEntities:checkArr,
+                type:'quality'
+            }).then(res =>{
+                if(res.data.code === 200){
+                this.$message.success('校对成功')
+                this.onLoad()
+                }
+            })
+        },
         addEdit() {
             this.isOpen = true
         },
@@ -396,114 +524,134 @@ export default {
         },
         onLoad() {
             this.loading = true
-            this.data = [
-                {
-                    $cellEdit: true,
-                    "bsOemCustomer": {
-                        "abbreviation": "L076",
-                        "address": "aaa",
-                        "codeAndName": "L076/L076",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 21,
-                        "limitType": 0,
-                        "ocCode": "L076",
-                        "ocId": 21,
-                        "ocName": "L076",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 10,
-                        "qualificationTitle": null,
-                        "region": "陕西省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-11-10 18:06:40",
-                    "keyValue": 1,
-                    "oaaId": 1,
-                    "plate": "222"
-                },
-                {
-                    $cellEdit: true,
-                    "bsOemCustomer": {
-                        "abbreviation": "L120",
-                        "address": "aaa",
-                        "codeAndName": "L120/L120",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 2,
-                        "limitType": 0,
-                        "ocCode": "L120",
-                        "ocId": 2,
-                        "ocName": "L120",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 0,
-                        "qualificationTitle": "民品&普军",
-                        "region": "江苏省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-11-10 18:06:40",
-                    "keyValue": 4,
-                    "oaaId": 4,
-                    "plate": "222"
-                },
-                {
-                    $cellEdit: true,
-                    "bsOemCustomer": {
-                        "abbreviation": "L070",
-                        "address": "aaa",
-                        "codeAndName": "L070/L070",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 5,
-                        "limitType": 0,
-                        "ocCode": "L070",
-                        "ocId": 5,
-                        "ocName": "L070",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 10,
-                        "qualificationTitle": null,
-                        "region": "江苏省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-12-06 17:24:48",
-                    "keyValue": 21,
-                    "oaaId": 21,
-                    "plate": "222"
-                }
-            ]
-            this.page.total = this.data.length
-            this.loading = false
-            setTimeout(() => {
-                this.selectionClear()
-            }, 500)
+            getList({
+                current:this.page.currentPage,
+                size:this.page.pageSize,
+                qualityStatusList:'1,2',
+                statusList:"1,2",
+                ...this.query,
+            }).then((res) => {
+                this.data = res.data.data.records
+                this.otherData = JSON.parse(JSON.stringify(res.data.data.records));
+                this.page.total = res.data.data.total
+                this.loading = false
+            })
+            // this.data = [
+            //     {
+            //         $cellEdit: true,
+            //         "bsOemCustomer": {
+            //             "abbreviation": "L076",
+            //             "address": "aaa",
+            //             "codeAndName": "L076/L076",
+            //             "contactMan": "aaa",
+            //             "contactPhone": "aaa",
+            //             "craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
+            //             "curStatus": 0,
+            //             "curStatusText": "正常供货",
+            //             "email": "aaa",
+            //             "keyValue": 21,
+            //             "limitType": 0,
+            //             "ocCode": "L076",
+            //             "ocId": 21,
+            //             "ocName": "L076",
+            //             "oemPassword": null,
+            //             "partCodeYesOrNo": false,
+            //             "qualification": 10,
+            //             "qualificationTitle": null,
+            //             "region": "陕西省",
+            //             "updateTime": "2023-04-14 18:33:49"
+            //         },
+            //         "createMan": {
+            //             "userId": 541,
+            //             "userName": "崔殿龙"
+            //         },
+            //         "createTime": "2023-11-10 18:06:40",
+            //         "keyValue": 1,
+            //         "oaaId": 1,
+            //         "plate": "222"
+            //     },
+            //     {
+            //         $cellEdit: true,
+            //         "bsOemCustomer": {
+            //             "abbreviation": "L120",
+            //             "address": "aaa",
+            //             "codeAndName": "L120/L120",
+            //             "contactMan": "aaa",
+            //             "contactPhone": "aaa",
+            //             "craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
+            //             "curStatus": 0,
+            //             "curStatusText": "正常供货",
+            //             "email": "aaa",
+            //             "keyValue": 2,
+            //             "limitType": 0,
+            //             "ocCode": "L120",
+            //             "ocId": 2,
+            //             "ocName": "L120",
+            //             "oemPassword": null,
+            //             "partCodeYesOrNo": false,
+            //             "qualification": 0,
+            //             "qualificationTitle": "民品&普军",
+            //             "region": "江苏省",
+            //             "updateTime": "2023-04-14 18:33:49"
+            //         },
+            //         "createMan": {
+            //             "userId": 541,
+            //             "userName": "崔殿龙"
+            //         },
+            //         "createTime": "2023-11-10 18:06:40",
+            //         "keyValue": 4,
+            //         "oaaId": 4,
+            //         "plate": "222"
+            //     },
+            //     {
+            //         $cellEdit: true,
+            //         "bsOemCustomer": {
+            //             "abbreviation": "L070",
+            //             "address": "aaa",
+            //             "codeAndName": "L070/L070",
+            //             "contactMan": "aaa",
+            //             "contactPhone": "aaa",
+            //             "craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
+            //             "curStatus": 0,
+            //             "curStatusText": "正常供货",
+            //             "email": "aaa",
+            //             "keyValue": 5,
+            //             "limitType": 0,
+            //             "ocCode": "L070",
+            //             "ocId": 5,
+            //             "ocName": "L070",
+            //             "oemPassword": null,
+            //             "partCodeYesOrNo": false,
+            //             "qualification": 10,
+            //             "qualificationTitle": null,
+            //             "region": "江苏省",
+            //             "updateTime": "2023-04-14 18:33:49"
+            //         },
+            //         "createMan": {
+            //             "userId": 541,
+            //             "userName": "崔殿龙"
+            //         },
+            //         "createTime": "2023-12-06 17:24:48",
+            //         "keyValue": 21,
+            //         "oaaId": 21,
+            //         "plate": "222"
+            //     }
+            // ]
+            // this.page.total = this.data.length
+            // this.loading = false
+            // setTimeout(() => {
+            //     this.selectionClear()
+            // }, 500)
         }
     }
 }
 </script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.error {
+  ::v-deep .el-input__wrapper {
+  //   background: red;
+  // border:none
+    border:1px solid #ff0000 !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/oem/performanceCheck/index.vue b/src/views/oem/performanceCheck/index.vue
index 8be1e09..8ebdd57 100644
--- a/src/views/oem/performanceCheck/index.vue
+++ b/src/views/oem/performanceCheck/index.vue
@@ -19,6 +19,7 @@
     </basic-container>
 </template>
 <script>
+import {getList} from "@/api/outsourcingManagement/performanceCheck"
 export default {
     components: {
 
@@ -26,6 +27,8 @@ export default {
     data() {
         return {
             selectionList: [],
+            loading:false,
+            query:{},
             option: {
                 height: 'auto',
                 calcHeight: 32,
@@ -76,26 +79,16 @@ export default {
                 column: [
                     {
                         label: '工艺能力',
-                        prop: 'plate',
+                        prop: 'caName',
                         sortable: true,
                         filter: true,
                         span: 24,
                         search: false,
-                         width: 130,
-                        type:'select',
-                        dicData:[
-                            {
-                                label:'镀金'
-                            },
-                            {
-                                label:'镀银'
-                            }
-                        ]
+                        width: 130,
                     },
                     {
                         label: '厂家代码',
-                        prop: 'bsOemCustomer.ocCode',
-                        bind: 'bsOemCustomer.ocCode',
+                        prop: 'oemCode',
                         search: false,
                         sortable: true,
                         filter: true,
@@ -104,8 +97,7 @@ export default {
                     },
                     {
                         label: '厂家名称',
-                        prop: 'bsOemCustomer.ocName',
-                        bind: 'bsOemCustomer.ocName',
+                        prop: 'oemName',
                         search: false,
                         sortable: true,
                         filter: true,
@@ -701,112 +693,18 @@ export default {
         },
         onLoad() {
             this.loading = true
-            this.data = [
-                {
-                    $cellEdit: true,
-                    "bsOemCustomer": {
-                        "abbreviation": "L076",
-                        "address": "aaa",
-                        "codeAndName": "L076/L076",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 21,
-                        "limitType": 0,
-                        "ocCode": "L076",
-                        "ocId": 21,
-                        "ocName": "L076",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 10,
-                        "qualificationTitle": null,
-                        "region": "陕西省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-11-10 18:06:40",
-                    "keyValue": 1,
-                    "oaaId": 1,
-                    "plate": "222"
-                },
-                {
-                    $cellEdit: true,
-                    "bsOemCustomer": {
-                        "abbreviation": "L120",
-                        "address": "aaa",
-                        "codeAndName": "L120/L120",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 2,
-                        "limitType": 0,
-                        "ocCode": "L120",
-                        "ocId": 2,
-                        "ocName": "L120",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 0,
-                        "qualificationTitle": "民品&普军",
-                        "region": "江苏省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-11-10 18:06:40",
-                    "keyValue": 4,
-                    "oaaId": 4,
-                    "plate": "222"
-                },
-                {
-                    $cellEdit: true,
-                    "bsOemCustomer": {
-                        "abbreviation": "L070",
-                        "address": "aaa",
-                        "codeAndName": "L070/L070",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 5,
-                        "limitType": 0,
-                        "ocCode": "L070",
-                        "ocId": 5,
-                        "ocName": "L070",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 10,
-                        "qualificationTitle": null,
-                        "region": "江苏省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-12-06 17:24:48",
-                    "keyValue": 21,
-                    "oaaId": 21,
-                    "plate": "222"
-                }
-            ]
-            this.page.total = this.data.length
-            this.loading = false
-            setTimeout(() => {
-                this.selectionClear()
-            }, 500)
+            getList({
+                current:this.page.currentPage,
+                size:this.page.pageSize,
+                produceStatusList:"3",
+                qualityStatusList:"3",
+                statusList:"2",
+                ...this.query,
+            }).then((res) => {
+                this.data = res.data.data.records;
+                this.page.total = res.data.data.total;
+                this.loading = false;
+            })
         }
     }
 }
diff --git a/src/views/oem/performanceReview/index.vue b/src/views/oem/performanceReview/index.vue
index d00d084..f87f52d 100644
--- a/src/views/oem/performanceReview/index.vue
+++ b/src/views/oem/performanceReview/index.vue
@@ -20,6 +20,7 @@
     </basic-container>
 </template>
 <script>
+import {getList} from "@/api/outsourcingManagement/performanceReview"
 export default {
     components: {
 
@@ -27,6 +28,8 @@ export default {
     data() {
         return {
             selectionList: [],
+            loading:false,
+            query:{},
             option: {
                 height: 'auto',
                 calcHeight: 32,
@@ -758,109 +761,16 @@ export default {
         },
         onLoad() {
             this.loading = true
-            this.data = [
-                {
-                    "bsOemCustomer": {
-                        "abbreviation": "L076",
-                        "address": "aaa",
-                        "codeAndName": "L076/L076",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 21,
-                        "limitType": 0,
-                        "ocCode": "L076",
-                        "ocId": 21,
-                        "ocName": "L076",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 10,
-                        "qualificationTitle": null,
-                        "region": "陕西省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-11-10 18:06:40",
-                    "keyValue": 1,
-                    "oaaId": 1,
-                    "plate": "222"
-                },
-                {
-                    "bsOemCustomer": {
-                        "abbreviation": "L120",
-                        "address": "aaa",
-                        "codeAndName": "L120/L120",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 2,
-                        "limitType": 0,
-                        "ocCode": "L120",
-                        "ocId": 2,
-                        "ocName": "L120",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 0,
-                        "qualificationTitle": "民品&普军",
-                        "region": "江苏省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-11-10 18:06:40",
-                    "keyValue": 4,
-                    "oaaId": 4,
-                    "plate": "222"
-                },
-                {
-                    "bsOemCustomer": {
-                        "abbreviation": "L070",
-                        "address": "aaa",
-                        "codeAndName": "L070/L070",
-                        "contactMan": "aaa",
-                        "contactPhone": "aaa",
-                        "craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
-                        "curStatus": 0,
-                        "curStatusText": "正常供货",
-                        "email": "aaa",
-                        "keyValue": 5,
-                        "limitType": 0,
-                        "ocCode": "L070",
-                        "ocId": 5,
-                        "ocName": "L070",
-                        "oemPassword": null,
-                        "partCodeYesOrNo": false,
-                        "qualification": 10,
-                        "qualificationTitle": null,
-                        "region": "江苏省",
-                        "updateTime": "2023-04-14 18:33:49"
-                    },
-                    "createMan": {
-                        "userId": 541,
-                        "userName": "崔殿龙"
-                    },
-                    "createTime": "2023-12-06 17:24:48",
-                    "keyValue": 21,
-                    "oaaId": 21,
-                    "plate": "222"
-                }
-            ]
-            this.page.total = this.data.length
-            this.loading = false
-            setTimeout(() => {
-                this.selectionClear()
-            }, 500)
+            getList({
+                current:this.page.currentPage,
+                size:this.page.pageSize,
+                statusList:"3,4",
+                ...this.query,
+            }).then((res) => {
+                this.data = res.data.data.records
+                this.page.total = res.data.data.total
+                this.loading = false
+            })
         }
     }
 }
diff --git a/src/views/orderManagement/allocationMessQuery.vue b/src/views/orderManagement/allocationMessQuery.vue
index 92c6689..95fac2e 100644
--- a/src/views/orderManagement/allocationMessQuery.vue
+++ b/src/views/orderManagement/allocationMessQuery.vue
@@ -95,7 +95,9 @@ export default {
       dataScopeTreeObj: [],
       apiScopeTreeObj: [],
       selectionList: [],
-      query: {},
+      query: {
+        pkno:'',prtmdept:"",subpkdateStart:"",subpkdateEnd:""
+      },
       loading: true,
       page: {
         pageSize: 10,
@@ -149,7 +151,7 @@ export default {
         column: [
           {
             label: '配套单号',
-            prop: 'poCode',
+            prop: 'pkno',
             search: true,
             sortable: true,
             width: 150,
@@ -159,14 +161,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入配套单号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '父件号',
-            prop: 'partCode',
+            prop: 'prntno',
             search: false,
             sortable: true,
             width: 180,
@@ -177,14 +179,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入父件号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '型号',
-            prop: 'productType',
+            prop: 'mtltmrk',
             search: false,
             sortable: true,
             disabled: true,
@@ -195,14 +197,14 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入型号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '生产标识',
-            prop: 'partName',
+            prop: 'prtlotno',
             search: false,
             sortable: true,
             disabled: true,
@@ -213,14 +215,14 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入生产标识',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '需求日期',
-            prop: 'requireDate',
+            prop: 'pkreqdat',
             search: false,
             sortable: true,
             disabled: true,
@@ -231,14 +233,14 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入需求日期',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '父件批次',
-            prop: 'plate',
+            prop: 'fjSplcode',
             search: false,
             sortable: true,
             width: 120,
@@ -249,14 +251,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入父件批次',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '父件配套数',
-            prop: 'prodIdent',
+            prop: 'fjPkavqty',
             search: false,
             sortable: true,
             width: 120,
@@ -266,14 +268,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入父件配套数',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '配套序号',
-            prop: 'useDept',
+            prop: 'serialno',
             search: false,
             sortable: true,
             disabled: true,
@@ -284,14 +286,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入配套序号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '主制部门',
-            prop: 'poQty',
+            prop: 'prtmdept',
             search: true,
             sortable: true,
             width: 120,
@@ -301,14 +303,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入主制部门',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '计划标记',
-            prop: 'poArea',
+            prop: 'plnsign',
             search: false,
             sortable: true,
             width: 120,
@@ -319,7 +321,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入计划标记',
                 trigger: 'blur',
               },
             ],
@@ -327,7 +329,7 @@ export default {
 
           {
             label: '制造订单号',
-            prop: 'demandDate',
+            prop: 'mono',
             search: false,
             sortable: true,
             width: 150,
@@ -338,14 +340,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入制造订单号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '计划员',
-            prop: 'planUser',
+            prop: 'schemer',
             search: false,
             sortable: true,
             width: 120,
@@ -355,14 +357,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划员',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '调度员',
-            prop: 'dispatcher',
+            prop: 'planner1',
             search: false,
             sortable: true,
             searchLabelWidth: 100,
@@ -374,14 +376,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入调度员',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '配套日期',
-            prop: 'releaseDate',
+            prop: 'subpkdate',
             search: true,
             sortable: true,
             span: 24,
@@ -396,7 +398,7 @@ export default {
           },
           {
             label: '保管员',
-            prop: 'createName1',
+            prop: 'warctlr',
             search: false,
             sortable: true,
             span: 12,
@@ -406,7 +408,7 @@ export default {
           },
           {
             label: '条码序号',
-            prop: 'index',
+            prop: 'barcodeno',
             search: false,
             sortable: true,
             span: 12,
@@ -416,7 +418,7 @@ export default {
           },
           {
             label: '计划部门',
-            prop: 'planPart',
+            prop: 'plandept',
             search: false,
             sortable: true,
             span: 12,
@@ -427,7 +429,7 @@ export default {
 
           {
             label: '物料标识',
-            prop: 'materialCode',
+            prop: 'prtclass',
             search: false,
             sortable: true,
             span: 12,
@@ -437,7 +439,7 @@ export default {
           },
           {
             label: '备注',
-            prop: 'memo',
+            prop: 'remark',
             search: false,
             sortable: true,
             span: 12,
@@ -733,1081 +735,15 @@ export default {
 
     async onLoad(page, params = {}) {
       this.loading = true;
-      this.data = [
-        {
-          id: 1,
-          alreadyBranchQty: 5.0,
-          bsPlatingmedium: {
-            bpsId: 4,
-            bpsName: '小类04',
-            bsWorkCenter: {
-              area: 0.0,
-              batchNo: null,
-              bigBatch: false,
-              bsJfCenter: {
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: '2022-08-31',
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: '总工',
-                  keyValue: 1,
-                  ldapName: 'admin',
-                  mail: '13699999999@136.com',
-                  mobile: '13699999999',
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: '2022-08-31',
-                    deleted: false,
-                    deptCode: '001',
-                    deptId: 1,
-                    deptName: 'MES开发部',
-                    deptType: 1,
-                    deptTypeTitle: '厂',
-                    keyValue: 1,
-                    memo: null,
-                    orders: '00',
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: '2022-08-31 16:32:46',
-                  },
-                  pinyinIndex: 'ADMIN,ADMIN',
-                  ucUserId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                  userCode: '00',
-                  userId: 1,
-                  userName: 'admin',
-                  userSex: 1,
-                  userSources: 'admin',
-                  userString: '1:A:admin',
-                  userType: 'A',
-                },
-                createTime: '2024-12-09 00:00:00',
-                deleted: false,
-                jcCode: 'RBZX',
-                jcId: 1,
-                jcName: '热表中心',
-                keyValue: 1,
-                updateTime: '2024-12-09 00:00:00',
-              },
-              checkout: false,
-              craftAbility:
-                '真空退火、固溶、局部退火、整体退火、淬火、时效、热处理、淬火时效、真空释氢',
-              createMan: {
-                accountId: 90,
-                card: null,
-                createTime: '2023-02-08',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 41,
-                head: 1,
-                jobName: '生产调度员',
-                keyValue: 90,
-                ldapName: '03891',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2023-02-08',
-                  deleted: false,
-                  deptCode: '06',
-                  deptId: 47,
-                  deptName: '经营管理室',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 47,
-                  memo: null,
-                  materialCode: '20230208',
-                  orders: '6',
-                  parentDeptId: 41,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2023-02-08 13:23:30',
-                },
-                pinyinIndex: '03891,03891',
-                ucUserId: null,
-                updateTime: '2023-02-08 13:20:39',
-                userCode: '03891',
-                userId: 90,
-                userName: '03891',
-                userSex: 1,
-                userSources: '03891',
-                userString: '90:A:03891',
-                userType: 'A',
-              },
-              createTime: '2023-04-08 18:35:43',
-              deleted: false,
-              describe: null,
-              endPoint: null,
-              keyValue: 142,
-              leaderUser: {
-                accountId: 541,
-                card: null,
-                createTime: '2023-05-04',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 102,
-                head: 0,
-                jobName: 'MES开发',
-                keyValue: 541,
-                ldapName: 'cdl',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2022-08-31',
-                  deleted: false,
-                  deptCode: '001',
-                  deptId: 1,
-                  deptName: 'MES开发部',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 1,
-                  memo: null,
-                  orders: '00',
-                  parentDeptId: null,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                },
-                pinyinIndex: 'CUIDIANLONG,CDL',
-                ucUserId: null,
-                updateTime: '2023-05-04 09:16:54',
-                userCode: 'cdl',
-                userId: 541,
-                userName: '崔殿龙',
-                userSex: 1,
-                userSources: '崔殿龙',
-                userString: '541:A:崔殿龙',
-                userType: 'A',
-              },
-              limitType: 0,
-              processes: ' ',
-              quantity: 0,
-              roundCycle: null,
-              saturation: 0.0,
-              sign: '4',
-              startPoint: null,
-              team: '热处理班',
-              updateTime: '2023-04-08 18:35:43',
-              wcCode: '003',
-              wcId: 142,
-              wcName: '热处理作业中心',
-              whetherPlate: false,
-            },
-            capacity: 1.0,
-            keyValue: 4,
-            updateMan: {
-              accountId: 541,
-              card: null,
-              createTime: '2023-05-04',
-              curStatus: 1,
-              deleted: false,
-              deptName: null,
-              dimissionTime: null,
-              factoryId: 102,
-              head: 0,
-              jobName: 'MES开发',
-              keyValue: 541,
-              ldapName: 'cdl',
-              mail: null,
-              mobile: null,
-              pfDepartment: {
-                appLink: null,
-                createTime: '2022-08-31',
-                deleted: false,
-                deptCode: '001',
-                deptId: 1,
-                deptName: 'MES开发部',
-                deptType: 1,
-                deptTypeTitle: '厂',
-                keyValue: 1,
-                memo: null,
-                orders: '00',
-                parentDeptId: null,
-                parentPath: null,
-                ucDeptId: null,
-                updateTime: '2022-08-31 16:32:46',
-              },
-              pinyinIndex: 'CUIDIANLONG,CDL',
-              ucUserId: null,
-              updateTime: '2023-05-04 09:16:54',
-              userCode: 'cdl',
-              userId: 541,
-              userName: '崔殿龙',
-              userSex: 1,
-              userSources: '崔殿龙',
-              userString: '541:A:崔殿龙',
-              userType: 'A',
-            },
-            updateTime: '2024-04-10 16:22:22',
-          },
-          bsProcedureQua: null,
-          closeMan: null,
-          closeTime: null,
-          curStatus: 4,
-          curStatusText: '已派工',
-          custodian: null,
-          deliveryQty: 0.0,
-          demandDate: '2023-03-07 00:00:00',
-          dominantDept: '1000',
-          dsPart: null,
-          keyValue: 41417,
-          memo: '同一批次,可提前交件',
-          partCode: '21E100-001-3900-E34',
-          dispatcher: '0300092',
-          releaseDate: '2023-03-07 00:00:00',
-          createName1: '0300091',
-          materialCode: '21E100-001-3900-E34',
-          index: 0,
-          planPart: '2',
-          partName: 'LRMT振动机架底板',
-          planType: 1,
-          planUser: '0300092',
-          plate: 'Ct.Ocd',
-          requireDate: '2023-03-06 00:00:00',
-          poArea: 18.3376140803,
-          poCode: 'WO-2212149345',
-          poId: 41417,
-          poQty: 5,
-          primaryCraft: '库1-2（机加）-4（表）-库2',
-          priority: 1,
-          prodIdent: 'JII',
-          prodLine: 'test',
-          productType: 'LRMT',
-          releaseDate: '2022-12-28 09:07:31',
-          roamNo: 'B1269880',
-          routeNo: 'LX01-03-001',
-          sureType: null,
-          sureTypeTitle: '未确认',
-          syncTime: '2023-02-08 13:26:47',
-          undeliveredQty: 5.0,
-          useDept: '3505',
-          wcName: null,
-        },
-        {
-          id: 2,
-          alreadyBranchQty: 5.0,
-          bsPlatingmedium: {
-            bpsId: 6,
-            bpsName: '小类06',
-            bsWorkCenter: {
-              area: 0.0,
-              batchNo: null,
-              bigBatch: false,
-              bsJfCenter: {
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: '2022-08-31',
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: '总工',
-                  keyValue: 1,
-                  ldapName: 'admin',
-                  mail: '13699999999@136.com',
-                  mobile: '13699999999',
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: '2022-08-31',
-                    deleted: false,
-                    deptCode: '001',
-                    deptId: 1,
-                    deptName: 'MES开发部',
-                    deptType: 1,
-                    deptTypeTitle: '厂',
-                    keyValue: 1,
-                    memo: null,
-                    orders: '00',
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: '2022-08-31 16:32:46',
-                  },
-                  pinyinIndex: 'ADMIN,ADMIN',
-                  ucUserId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                  userCode: '00',
-                  userId: 1,
-                  userName: 'admin',
-                  userSex: 1,
-                  userSources: 'admin',
-                  userString: '1:A:admin',
-                  userType: 'A',
-                },
-                createTime: '2024-12-09 00:00:00',
-                deleted: false,
-                jcCode: 'RBZX',
-                jcId: 1,
-                jcName: '热表中心',
-                keyValue: 1,
-                updateTime: '2024-12-09 00:00:00',
-              },
-              checkout: false,
-              craftAbility:
-                '真空退火、固溶、局部退火、整体退火、淬火、时效、热处理、淬火时效、真空释氢',
-              createMan: {
-                accountId: 90,
-                card: null,
-                createTime: '2023-02-08',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 41,
-                head: 1,
-                jobName: '生产调度员',
-                keyValue: 90,
-                ldapName: '03891',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2023-02-08',
-                  deleted: false,
-                  deptCode: '06',
-                  deptId: 47,
-                  deptName: '经营管理室',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 47,
-                  memo: null,
-                  orders: '6',
-                  parentDeptId: 41,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2023-02-08 13:23:30',
-                },
-                pinyinIndex: '03891,03891',
-                ucUserId: null,
-                updateTime: '2023-02-08 13:20:39',
-                userCode: '03891',
-                userId: 90,
-                userName: '03891',
-                userSex: 1,
-                userSources: '03891',
-                userString: '90:A:03891',
-                userType: 'A',
-              },
-              createTime: '2023-04-08 18:35:43',
-              deleted: false,
-              describe: null,
-              endPoint: null,
-              keyValue: 142,
-              leaderUser: {
-                accountId: 541,
-                card: null,
-                createTime: '2023-05-04',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 102,
-                head: 0,
-                jobName: 'MES开发',
-                keyValue: 541,
-                ldapName: 'cdl',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2022-08-31',
-                  deleted: false,
-                  deptCode: '001',
-                  deptId: 1,
-                  deptName: 'MES开发部',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 1,
-                  memo: null,
-                  orders: '00',
-                  parentDeptId: null,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                },
-                pinyinIndex: 'CUIDIANLONG,CDL',
-                ucUserId: null,
-                updateTime: '2023-05-04 09:16:54',
-                userCode: 'cdl',
-                userId: 541,
-                userName: '崔殿龙',
-                userSex: 1,
-                userSources: '崔殿龙',
-                userString: '541:A:崔殿龙',
-                userType: 'A',
-              },
-              limitType: 0,
-              processes: ' ',
-              quantity: 0,
-              roundCycle: null,
-              saturation: 0.0,
-              sign: '4',
-              startPoint: null,
-              team: '热处理班',
-              updateTime: '2023-04-08 18:35:43',
-              wcCode: '003',
-              wcId: 142,
-              wcName: '热处理作业中心',
-              whetherPlate: false,
-            },
-            capacity: 1.0,
-            keyValue: 6,
-            updateMan: {
-              accountId: 541,
-              card: null,
-              createTime: '2023-05-04',
-              curStatus: 1,
-              deleted: false,
-              deptName: null,
-              dimissionTime: null,
-              factoryId: 102,
-              head: 0,
-              jobName: 'MES开发',
-              keyValue: 541,
-              ldapName: 'cdl',
-              mail: null,
-              mobile: null,
-              pfDepartment: {
-                appLink: null,
-                createTime: '2022-08-31',
-                deleted: false,
-                deptCode: '001',
-                deptId: 1,
-                deptName: 'MES开发部',
-                deptType: 1,
-                deptTypeTitle: '厂',
-                keyValue: 1,
-                memo: null,
-                orders: '00',
-                parentDeptId: null,
-                parentPath: null,
-                ucDeptId: null,
-                updateTime: '2022-08-31 16:32:46',
-              },
-              pinyinIndex: 'CUIDIANLONG,CDL',
-              ucUserId: null,
-              updateTime: '2023-05-04 09:16:54',
-              userCode: 'cdl',
-              userId: 541,
-              userName: '崔殿龙',
-              userSex: 1,
-              userSources: '崔殿龙',
-              userString: '541:A:崔殿龙',
-              userType: 'A',
-            },
-            updateTime: '2024-04-10 16:22:22',
-          },
-          bsProcedureQua: null,
-          closeMan: null,
-          closeTime: null,
-          curStatus: 4,
-          curStatusText: '加工中',
-          custodian: null,
-          deliveryQty: 0.0,
-          demandDate: '2022-11-20 00:00:00',
-          dominantDept: '4302',
-          dsPart: null,
-          keyValue: 41419,
-          memo: '可提前交件',
-          partCode: '21E2-505-134-B1',
-          partName: '左柜柜体喷漆部件',
-          planType: 1,
-          planUser: '0300009',
-          plate: null,
-          poArea: 0.0,
-          poCode: 'WO-221047370',
-          poId: 41419,
-          poQty: 5,
-          primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3',
-          priority: 1,
-          prodIdent: 'JIX',
-          prodLine: null,
-          productType: 'Y/QAZ',
-          releaseDate: '2022-10-12 09:02:31',
-          roamNo: null,
-          routeNo: 'LX12-02-007',
-          sureType: null,
-          sureTypeTitle: '未确认',
-          syncTime: '2023-02-08 13:26:47',
-          undeliveredQty: 5.0,
-          useDept: '4302',
-          wcName: null,
-        },
-        {
-          id: 3,
-          alreadyBranchQty: 3.0,
-          bsPlatingmedium: {
-            bpsId: 5,
-            bpsName: '小类05',
-            bsWorkCenter: {
-              area: 0.0,
-              batchNo: null,
-              bigBatch: false,
-              bsJfCenter: {
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: '2022-08-31',
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: '总工',
-                  keyValue: 1,
-                  ldapName: 'admin',
-                  mail: '13699999999@136.com',
-                  mobile: '13699999999',
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: '2022-08-31',
-                    deleted: false,
-                    deptCode: '001',
-                    deptId: 1,
-                    deptName: 'MES开发部',
-                    deptType: 1,
-                    deptTypeTitle: '厂',
-                    keyValue: 1,
-                    memo: null,
-                    orders: '00',
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: '2022-08-31 16:32:46',
-                  },
-                  pinyinIndex: 'ADMIN,ADMIN',
-                  ucUserId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                  userCode: '00',
-                  userId: 1,
-                  userName: 'admin',
-                  userSex: 1,
-                  userSources: 'admin',
-                  userString: '1:A:admin',
-                  userType: 'A',
-                },
-                createTime: '2024-12-09 00:00:00',
-                deleted: false,
-                jcCode: 'RBZX',
-                jcId: 1,
-                jcName: '热表中心',
-                keyValue: 1,
-                updateTime: '2024-12-09 00:00:00',
-              },
-              checkout: false,
-              craftAbility:
-                '真空退火、固溶、局部退火、整体退火、淬火、时效、热处理、淬火时效、真空释氢',
-              createMan: {
-                accountId: 90,
-                card: null,
-                createTime: '2023-02-08',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 41,
-                head: 1,
-                jobName: '生产调度员',
-                keyValue: 90,
-                ldapName: '03891',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2023-02-08',
-                  deleted: false,
-                  deptCode: '06',
-                  deptId: 47,
-                  deptName: '经营管理室',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 47,
-                  memo: null,
-                  orders: '6',
-                  parentDeptId: 41,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2023-02-08 13:23:30',
-                },
-                pinyinIndex: '03891,03891',
-                ucUserId: null,
-                updateTime: '2023-02-08 13:20:39',
-                userCode: '03891',
-                userId: 90,
-                userName: '03891',
-                userSex: 1,
-                userSources: '03891',
-                userString: '90:A:03891',
-                userType: 'A',
-              },
-              createTime: '2023-04-08 18:35:43',
-              deleted: false,
-              describe: null,
-              endPoint: null,
-              keyValue: 142,
-              leaderUser: {
-                accountId: 541,
-                card: null,
-                createTime: '2023-05-04',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 102,
-                head: 0,
-                jobName: 'MES开发',
-                keyValue: 541,
-                ldapName: 'cdl',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2022-08-31',
-                  deleted: false,
-                  deptCode: '001',
-                  deptId: 1,
-                  deptName: 'MES开发部',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 1,
-                  memo: null,
-                  orders: '00',
-                  parentDeptId: null,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                },
-                pinyinIndex: 'CUIDIANLONG,CDL',
-                ucUserId: null,
-                updateTime: '2023-05-04 09:16:54',
-                userCode: 'cdl',
-                userId: 541,
-                userName: '崔殿龙',
-                userSex: 1,
-                userSources: '崔殿龙',
-                userString: '541:A:崔殿龙',
-                userType: 'A',
-              },
-              limitType: 0,
-              processes: ' ',
-              quantity: 0,
-              roundCycle: null,
-              saturation: 0.0,
-              sign: '4',
-              startPoint: null,
-              team: '热处理班',
-              updateTime: '2023-04-08 18:35:43',
-              wcCode: '003',
-              wcId: 142,
-              wcName: '热处理作业中心',
-              whetherPlate: false,
-            },
-            capacity: 1.0,
-            keyValue: 5,
-            updateMan: {
-              accountId: 541,
-              card: null,
-              createTime: '2023-05-04',
-              curStatus: 1,
-              deleted: false,
-              deptName: null,
-              dimissionTime: null,
-              factoryId: 102,
-              head: 0,
-              jobName: 'MES开发',
-              keyValue: 541,
-              ldapName: 'cdl',
-              mail: null,
-              mobile: null,
-              pfDepartment: {
-                appLink: null,
-                createTime: '2022-08-31',
-                deleted: false,
-                deptCode: '001',
-                deptId: 1,
-                deptName: 'MES开发部',
-                deptType: 1,
-                deptTypeTitle: '厂',
-                keyValue: 1,
-                memo: null,
-                orders: '00',
-                parentDeptId: null,
-                parentPath: null,
-                ucDeptId: null,
-                updateTime: '2022-08-31 16:32:46',
-              },
-              pinyinIndex: 'CUIDIANLONG,CDL',
-              ucUserId: null,
-              updateTime: '2023-05-04 09:16:54',
-              userCode: 'cdl',
-              userId: 541,
-              userName: '崔殿龙',
-              userSex: 1,
-              userSources: '崔殿龙',
-              userString: '541:A:崔殿龙',
-              userType: 'A',
-            },
-            updateTime: '2024-04-10 16:22:22',
-          },
-          bsProcedureQua: null,
-          closeMan: null,
-          closeTime: null,
-          curStatus: 4,
-          curStatusText: '已退回',
-          custodian: null,
-          deliveryQty: 0.0,
-          demandDate: '2023-07-17 00:00:00',
-          dominantDept: '4302',
-          dsPart: null,
-          keyValue: 41420,
-          memo: null,
-          partCode: '21E2-505-523-B1',
-          partName: '客货舱设备架',
-          planType: 1,
-          planUser: '0300007',
-          plate: null,
-          poArea: 0.0,
-          poCode: 'WO-221279741',
-          poId: 41420,
-          poQty: 3,
-          primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3',
-          priority: 1,
-          prodIdent: 'JIX',
-          prodLine: null,
-          productType: 'Y/QAZ',
-          releaseDate: '2022-12-14 11:05:47',
-          roamNo: 'B1964845',
-          routeNo: 'LX12-02-007',
-          sureType: null,
-          sureTypeTitle: '未确认',
-          syncTime: '2023-02-08 13:26:47',
-          undeliveredQty: 3.0,
-          useDept: '4302',
-          wcName: null,
-        },
-        {
-          id: 4,
-          alreadyBranchQty: 1.0,
-          bsPlatingSmall: {
-            bpsId: 6,
-            bpsName: '小类06',
-            bsWorkCenter: {
-              area: 0.0,
-              batchNo: null,
-              bigBatch: false,
-              bsJfCenter: {
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: '2022-08-31',
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: '总工',
-                  keyValue: 1,
-                  ldapName: 'admin',
-                  mail: '13699999999@136.com',
-                  mobile: '13699999999',
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: '2022-08-31',
-                    deleted: false,
-                    deptCode: '001',
-                    deptId: 1,
-                    deptName: 'MES开发部',
-                    deptType: 1,
-                    deptTypeTitle: '厂',
-                    keyValue: 1,
-                    memo: null,
-                    orders: '00',
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: '2022-08-31 16:32:46',
-                  },
-                  pinyinIndex: 'ADMIN,ADMIN',
-                  ucUserId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                  userCode: '00',
-                  userId: 1,
-                  userName: 'admin',
-                  userSex: 1,
-                  userSources: 'admin',
-                  userString: '1:A:admin',
-                  userType: 'A',
-                },
-                createTime: '2024-12-09 00:00:00',
-                deleted: false,
-                jcCode: 'RBZX',
-                jcId: 1,
-                jcName: '热表中心',
-                keyValue: 1,
-                updateTime: '2024-12-09 00:00:00',
-              },
-              checkout: false,
-              craftAbility:
-                '真空退火、固溶、局部退火、整体退火、淬火、时效、热处理、淬火时效、真空释氢',
-              createMan: {
-                accountId: 90,
-                card: null,
-                createTime: '2023-02-08',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 41,
-                head: 1,
-                jobName: '生产调度员',
-                keyValue: 90,
-                ldapName: '03891',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2023-02-08',
-                  deleted: false,
-                  deptCode: '06',
-                  deptId: 47,
-                  deptName: '经营管理室',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 47,
-                  memo: null,
-                  orders: '6',
-                  parentDeptId: 41,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2023-02-08 13:23:30',
-                },
-                pinyinIndex: '03891,03891',
-                ucUserId: null,
-                updateTime: '2023-02-08 13:20:39',
-                userCode: '03891',
-                userId: 90,
-                userName: '03891',
-                userSex: 1,
-                userSources: '03891',
-                userString: '90:A:03891',
-                userType: 'A',
-              },
-              createTime: '2023-04-08 18:35:43',
-              deleted: false,
-              describe: null,
-              endPoint: null,
-              keyValue: 142,
-              leaderUser: {
-                accountId: 541,
-                card: null,
-                createTime: '2023-05-04',
-                curStatus: 1,
-                deleted: false,
-                deptName: null,
-                dimissionTime: null,
-                factoryId: 102,
-                head: 0,
-                jobName: 'MES开发',
-                keyValue: 541,
-                ldapName: 'cdl',
-                mail: null,
-                mobile: null,
-                pfDepartment: {
-                  appLink: null,
-                  createTime: '2022-08-31',
-                  deleted: false,
-                  deptCode: '001',
-                  deptId: 1,
-                  deptName: 'MES开发部',
-                  deptType: 1,
-                  deptTypeTitle: '厂',
-                  keyValue: 1,
-                  memo: null,
-                  orders: '00',
-                  parentDeptId: null,
-                  parentPath: null,
-                  ucDeptId: null,
-                  updateTime: '2022-08-31 16:32:46',
-                },
-                pinyinIndex: 'CUIDIANLONG,CDL',
-                ucUserId: null,
-                updateTime: '2023-05-04 09:16:54',
-                userCode: 'cdl',
-                userId: 541,
-                userName: '崔殿龙',
-                userSex: 1,
-                userSources: '崔殿龙',
-                userString: '541:A:崔殿龙',
-                userType: 'A',
-              },
-              limitType: 0,
-              processes: ' ',
-              quantity: 0,
-              roundCycle: null,
-              saturation: 0.0,
-              sign: '4',
-              startPoint: null,
-              team: '热处理班',
-              updateTime: '2023-04-08 18:35:43',
-              wcCode: '003',
-              wcId: 142,
-              wcName: '热处理作业中心',
-              whetherPlate: false,
-            },
-            capacity: 1.0,
-            keyValue: 6,
-            updateMan: {
-              accountId: 541,
-              card: null,
-              createTime: '2023-05-04',
-              curStatus: 1,
-              deleted: false,
-              deptName: null,
-              dimissionTime: null,
-              factoryId: 102,
-              head: 0,
-              jobName: 'MES开发',
-              keyValue: 541,
-              ldapName: 'cdl',
-              mail: null,
-              mobile: null,
-              pfDepartment: {
-                appLink: null,
-                createTime: '2022-08-31',
-                deleted: false,
-                deptCode: '001',
-                deptId: 1,
-                deptName: 'MES开发部',
-                deptType: 1,
-                deptTypeTitle: '厂',
-                keyValue: 1,
-                memo: null,
-                orders: '00',
-                parentDeptId: null,
-                parentPath: null,
-                ucDeptId: null,
-                updateTime: '2022-08-31 16:32:46',
-              },
-              pinyinIndex: 'CUIDIANLONG,CDL',
-              ucUserId: null,
-              updateTime: '2023-05-04 09:16:54',
-              userCode: 'cdl',
-              userId: 541,
-              userName: '崔殿龙',
-              userSex: 1,
-              userSources: '崔殿龙',
-              userString: '541:A:崔殿龙',
-              userType: 'A',
-            },
-            updateTime: '2024-04-10 16:22:22',
-          },
-          bsProcedureQua: null,
-          closeMan: {
-            accountId: null,
-            card: null,
-            createTime: '2022-08-31',
-            curStatus: 1,
-            deleted: false,
-            deptName: null,
-            dimissionTime: null,
-            factoryId: 41,
-            head: 0,
-            jobName: '总工',
-            keyValue: 1,
-            ldapName: 'admin',
-            mail: '13699999999@136.com',
-            mobile: '13699999999',
-            pfDepartment: {
-              appLink: null,
-              createTime: '2022-08-31',
-              deleted: false,
-              deptCode: '001',
-              deptId: 1,
-              deptName: 'MES开发部',
-              deptType: 1,
-              deptTypeTitle: '厂',
-              keyValue: 1,
-              memo: null,
-              orders: '00',
-              parentDeptId: null,
-              parentPath: null,
-              ucDeptId: null,
-              updateTime: '2022-08-31 16:32:46',
-            },
-            pinyinIndex: 'ADMIN,ADMIN',
-            ucUserId: null,
-            updateTime: '2022-08-31 16:32:46',
-            userCode: '00',
-            userId: 1,
-            userName: 'admin',
-            userSex: 1,
-            userSources: 'admin',
-            userString: '1:A:admin',
-            userType: 'A',
-          },
-          closeTime: '2025-08-25 15:57:35',
-          curStatus: 15,
-          curStatusText: '已完工',
-          custodian: null,
-          deliveryQty: 0.0,
-          demandDate: '2022-12-06 00:00:00',
-          dominantDept: '4302',
-          dsPart: null,
-          keyValue: 41418,
-          memo: 'SWSXJ017-00000075 0159,可提前交件',
-          partCode: '21E2-505-134-B1',
-          partName: '左柜柜体喷漆部件',
-          planType: 1,
-          planUser: '0300009',
-          plate: null,
-          poArea: 0.0,
-          poCode: 'WO-221194871',
-          poId: 41418,
-          poQty: 1,
-          primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3',
-          priority: 1,
-          prodIdent: 'JIX',
-          prodLine: null,
-          productType: 'Y/QAZ',
-          releaseDate: '2022-11-15 18:44:12',
-          roamNo: 'B2284606',
-          routeNo: 'LX12-02-007',
-          sureType: null,
-          sureTypeTitle: '未确认',
-          syncTime: '2023-02-08 13:26:47',
-          undeliveredQty: 1.0,
-          useDept: '4302',
-          wcName: null,
-        },
-      ];
       try {
-        const res = await getList(
-          page.currentPage,
-          page.pageSize,
-          Object.assign(params, this.query)
-        );
-        if (res.code) {
+        const res = await getList({
+          current:this.page.currentPage,
+          size:this.page.pageSize,
+          ...this.query
+        });
           this.data = res.data.data.records;
           this.page.total = res.data.data.total;
           this.selectionClear();
-        }
       } catch (err) {
         console.log(err);
       }
diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue
index 3c80f72..1bb36a5 100644
--- a/src/views/orderManagement/components/exception/dataMissing.vue
+++ b/src/views/orderManagement/components/exception/dataMissing.vue
@@ -17,7 +17,7 @@
     @row-update="rowUpdate"
   >
     <template #menu-left>
-      <el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
+      <el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
     </template>
     <template #menu-right> </template>
 
diff --git a/src/views/orderManagement/components/exception/deliveryDate.vue b/src/views/orderManagement/components/exception/deliveryDate.vue
index 202d1d2..5f7659f 100644
--- a/src/views/orderManagement/components/exception/deliveryDate.vue
+++ b/src/views/orderManagement/components/exception/deliveryDate.vue
@@ -17,7 +17,7 @@
     @row-update="rowUpdate"
   >
     <template #menu-left>
-      <el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
+      <el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
     </template>
     <template #menu-right> </template>
 
diff --git a/src/views/orderManagement/components/exception/processMissing.vue b/src/views/orderManagement/components/exception/processMissing.vue
index 364ad18..5c97d07 100644
--- a/src/views/orderManagement/components/exception/processMissing.vue
+++ b/src/views/orderManagement/components/exception/processMissing.vue
@@ -18,7 +18,7 @@
   >
     <template #menu-left>
       <el-button type="primary" @click="complianceCheck()">合规校验</el-button>
-      <el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
+      <el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
     </template>
     <template #menu-right> </template>
 
diff --git a/src/views/orderManagement/components/exception/resourceMissing.vue b/src/views/orderManagement/components/exception/resourceMissing.vue
index a636229..19a6339 100644
--- a/src/views/orderManagement/components/exception/resourceMissing.vue
+++ b/src/views/orderManagement/components/exception/resourceMissing.vue
@@ -18,7 +18,7 @@
   >
     <template #menu-left>
       <el-button type="primary" @click="complianceCheck()">合规校验</el-button>
-      <el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
+      <el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
     </template>
     <template #menu-right> </template>
 
diff --git a/src/views/orderManagement/components/lookProcess.vue b/src/views/orderManagement/components/lookProcess.vue
index fdaff36..c780304 100644
--- a/src/views/orderManagement/components/lookProcess.vue
+++ b/src/views/orderManagement/components/lookProcess.vue
@@ -7,7 +7,7 @@
     @open="open"
     @opened="opened"
   >
-    <el-card>
+    <el-card v-if="sourceId == 'plannedOrder' || sourceId == 'sinTerOrder'">
       <el-descriptions :column="1" size="medium" class="margin-top" border>
         <el-descriptions-item label="一级工艺路线">
           <!-- {{ craftData.primaryCraft }} -->{{ primaryCraft }}
@@ -15,6 +15,7 @@
       </el-descriptions>
     </el-card>
     <avue-crud
+      v-if="sourceId == 'plannedOrder' || sourceId == 'sinTerOrder'"
       :option="option"
       :table-loading="loading"
       :data="data"
@@ -31,10 +32,30 @@
       @on-load="onLoad"
     >
     </avue-crud>
+    <avue-crud
+      v-if="sourceId == 'planYieIdOrder' || sourceId == 'sinTerYieIdOrder'"
+      :option="option1"
+      :table-loading="loading"
+      :data="data1"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+    </avue-crud>
   </el-dialog>
 </template>
 <script>
-import { getFirstProcess } from '@/api/orderManagement/planYieIdOrder';
+import { getProcessRouting } from '@/api/orderManagement/planYieIdOrder';
+import { getProcessRoute,getProcess } from '@/api/orderManagement/sinTerPlanOrder';
+// import {} from "@/api/orderManagement/planYieIdOrder"
 export default {
   components: {},
   props: {
@@ -54,7 +75,12 @@ export default {
     },
     id: {
       type: String,
+      default:''
     },
+    checkPart:{
+      type: String,
+      default:''
+    }
   },
   data() {
     return {
@@ -117,13 +143,13 @@ export default {
         column: [
           {
             label: '零件号',
-            prop: 'partCode',
+            prop: 'partcode',
             search: false,
             width: 150,
           },
           {
             label: '零件名称',
-            prop: 'partName',
+            prop: 'partname',
             search: false,
             width: 170,
           },
@@ -135,7 +161,7 @@ export default {
           },
           {
             label: '一级工艺计划名称',
-            prop: 'firppName',
+            prop: 'firppname',
             search: false,
             width: 180,
           },
@@ -147,13 +173,13 @@ export default {
           },
           {
             label: '一级工序名称',
-            prop: 'firseqName',
+            prop: 'firseqname',
             search: false,
             width: 180,
           },
           {
             label: '一级工序序号',
-            prop: 'firseqNo',
+            prop: 'firseqno',
             search: false,
             width: 180,
           },
@@ -161,51 +187,163 @@ export default {
       },
 
       data: [],
+      option1:{
+        tip: false,
+        simplePage: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        viewBtn: false,
+        delBtn: false,
+        addBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        // searchLabelWidth: 120,
+        menuWidth: 330,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: false,
+        searchShowBtn: false,
+        excelBtn: false,
+        index: true,
+        showOverflowTooltip: true,
+        menu: false,
+        // refreshBtn:false,
+        // columnBtn:false,
+        // gridBtn :false,
+        header: false,
+        searchLabelPosition: 'left',
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        align: 'center',
+        column: [
+          {
+            label: '工序号',
+            prop: 'craftNo',
+            search: false,
+            // width: 150,
+          },
+          {
+            label: '工序代码',
+            prop: 'partname',
+            search: false,
+            // width: 170,
+          },
+          {
+            label: '工序名称',
+            prop: 'firpp',
+            search: false,
+            // width: 180,
+          },
+          // {
+          //   label: '额定加工工时(min)',
+          //   prop: 'firppname',
+          //   search: false,
+          //   width: 180,
+          // },
+          // {
+          //   label: '加工班组',
+          //   prop: 'firseq',
+          //   search: false,
+          //   width: 180,
+          // },
+          // {
+          //   label: '外协厂商',
+          //   prop: 'firseqname',
+          //   search: false,
+          //   width: 180,
+          // },
+          // {
+          //   label: '计划开始时间',
+          //   prop: 'startTime',
+          //   search: false,
+          //   width: 180,
+          // },
+          // {
+          //   label: '计划结束时间',
+          //   prop: 'endTime',
+          //   search: false,
+          //   width: 180,
+          // },
+          // {
+          //   label: '工序描述',
+          //   prop: 'makeMemo',
+          //   search: false,
+          //   width: 180,
+          // },
+        ],
+      },
+      data1:[],
     };
   },
   methods: {
     async open() {
-        console.log(this.id)
-      try {
-        const res = await getFirstProcess(this.id );
-        if (res.status === 200) {
-          this.primaryCraft = '一级工艺';
-          this.data = res.data.records1;
-        }
-      } catch (err) {
-        console.log(err);
-      }
+        // console.log(this.id)
+      // try {
+      //   const res = await getFirstProcess(this.id );
+      //   if (res.status === 200) {
+      //     this.primaryCraft = '一级工艺';
+      //     this.data = res.data.records1;
+      //   }
+      // } catch (err) {
+      //   console.log(err);
+      // }
+      console.log('sourde----------',this.sourceId)
+      console.log('checkPart----------',this.checkPart)
 
       if (this.sourceId === 'sinTerYieIdOrder') {
         console.log('由sinTerYieIdOrder组件打开');
-        // 父组件A的专属逻辑
+        getProcessRouting({id:this.id}).then(res =>{
+          console.log('res---------',res)
+          this.data1 = res.data.data
+        })
       }
       if (this.sourceId === 'planYieIdOrder') {
         console.log('由planYieIdOrder父组件打开');
-        // 父组件B的专属逻辑
+        getProcessRouting({id:this.id}).then(res =>{
+          console.log('res---------',res)
+          this.data1 = res.data.data
+        })
       }
       if (this.sourceId === 'plannedOrder') {
         console.log('由plannedOrder111父组件打开');
-        // 父组件B的专属逻辑
+        const processRes = await getProcessRoute({
+          yieldPlanId:this.id
+        })
+        console.log('processRes',processRes)
+        this.primaryCraft = processRes.data.data.primaryCraft
+        const partRes = await getProcess({
+          partCode:this.checkPart
+        })
+        console.log('partRes',partRes)
       }
       if (this.sourceId === 'sinTerOrder') {
         console.log('sinTerOrder');
-        // 父组件B的专属逻辑
+        const processRes = await getProcessRoute({
+          yieldPlanId:this.id
+        })
+        console.log('processRes',processRes)
+        this.primaryCraft = processRes.data.data.primaryCraft
+        const partRes = await getProcess({
+          partCode:this.checkPart
+        })
+        console.log('partRes',partRes)
       }
-      // this.$ajax
-      //     .get('planOrder/getCraftData/' + this.rowItem.poId)
-      //     .then((res) => {
-      //         if (this.$ifAjax(res)) {
-      //             this.craftData = res.data;
-      //         }
-      //     });
-      // this.$ajax
-      //     .get('planOrder/getFirseqData/' + this.rowItem.partCode)
-      //     .then((res1) => {
-      //         if (this.$ifAjax(res1)) {
-      //             this.firseqList = res1.data;
-      //         }
-      //     });
     },
     cancel() {
       this.setCrewShow = false;
diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue
index 048af92..e80b8f9 100644
--- a/src/views/orderManagement/plannedOrder.vue
+++ b/src/views/orderManagement/plannedOrder.vue
@@ -89,6 +89,7 @@
       :rowData="rowItem"
       sourceId="plannedOrder"
       :id="id"
+      :checkPart="checkPart"
     ></lookProcess>
   </basic-container>
 </template>
@@ -105,7 +106,7 @@ import {
   update,
 } from '@/api/system/role';
 
-import { closeBatchs,getHotList } from '@/api/orderManagement/sinTerPlanOrder';
+import { closeBatchs,getHotList,getProcessRoute,getProcess } from '@/api/orderManagement/sinTerPlanOrder';
 import { mapGetters } from 'vuex';
 import { validatenull } from '@/utils/validate';
 
@@ -573,6 +574,7 @@ export default {
       data: [],
       isRushOpen: false, //加急弹框
       isBatchOpen: false, //分批处理
+      checkPart:"",
     };
   },
   computed: {
@@ -684,7 +686,9 @@ export default {
       this.platingSmallOpen = true;
     },
     lookProcessRoute(row) {
+      console.log('row----------',row)
       this.id=row.id
+      this.checkPart = row.partCode
       this.isOpen = true;
       this.rowItem = row;
     },
diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue
index 917b58a..b90b1df 100644
--- a/src/views/orderManagement/sinTerPlanOrder.vue
+++ b/src/views/orderManagement/sinTerPlanOrder.vue
@@ -77,6 +77,7 @@
       :rowData="rowItem"
       sourceId="sinTerOrder"
       :id="id"
+      :checkPart="checkPart"
     ></lookProcess>
   </basic-container>
 </template>
@@ -528,6 +529,7 @@ export default {
 
       data: [],
       isRushOpen: false,
+      checkPart:"",
     };
   },
   computed: {
@@ -639,6 +641,7 @@ export default {
     },
     lookProcessRoute(row) {
       this.id = row.id;
+      this.checkPart = row.partCode;
       this.isOpen = true;
       this.rowItem = row;
     },
diff --git a/src/views/periodicTesting/projectCycle.vue b/src/views/periodicTesting/projectCycle.vue
index 4fa7f7d..2d58558 100644
--- a/src/views/periodicTesting/projectCycle.vue
+++ b/src/views/periodicTesting/projectCycle.vue
@@ -29,7 +29,7 @@
 
         <el-button type="success" @click="handleUser">人员设置</el-button>
         <el-button type="primary" @click="handleCycle">批量设置周期</el-button>
-        <el-button type="warning" @click="handleExport" plain>导出</el-button>
+        <el-button type="warning" @click="handleExport" >导出</el-button>
       </template>
       <template #menu-right>
         <el-button type="primary" @click="handleImport">导入</el-button>
diff --git a/src/views/periodicTesting/testProject.vue b/src/views/periodicTesting/testProject.vue
index 5182130..c299edd 100644
--- a/src/views/periodicTesting/testProject.vue
+++ b/src/views/periodicTesting/testProject.vue
@@ -19,7 +19,7 @@
       <template #menu-left>
         <el-button type="primary" @click="handleAdd">新增</el-button>
         <el-button type="danger" @click="handleDeletes">删除</el-button>
-        <el-button type="warning" @click="handleExport" plain>导出</el-button>
+        <el-button type="warning" @click="handleExport" >导出</el-button>
       </template>
       <template #menu-right>
         <el-button type="primary" @click="handleImport">导入</el-button>
diff --git a/src/views/periodicTesting/testTask.vue b/src/views/periodicTesting/testTask.vue
index 9ccf089..ebdd326 100644
--- a/src/views/periodicTesting/testTask.vue
+++ b/src/views/periodicTesting/testTask.vue
@@ -20,7 +20,7 @@
     >
       <template #menu-left>
         <el-button @click="handleIssue" type="primary" v-if="permission.issue_btn"> 转派 </el-button>
-        <el-button type="warning" plain @click="handleExport">导出</el-button>
+        <el-button type="warning"  @click="handleExport">导出</el-button>
       </template>
       <template #menu-right="{ size }">
         <el-button type="warning" plain @click="handleSearch(1)">临期</el-button>

From 5c0bd65a5c2b54cb4a52593bbf3009def48dc4a9 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 11 Mar 2026 18:01:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionTesting/productionQuality.js               | 8 ++++----
 src/views/productionTesting/InspectionTemplate.vue       | 9 +++++++++
 src/views/productionTesting/productionQuality.vue        | 4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/api/qualityManagement/productionTesting/productionQuality.js b/src/api/qualityManagement/productionTesting/productionQuality.js
index 15f077c..27d7d64 100644
--- a/src/api/qualityManagement/productionTesting/productionQuality.js
+++ b/src/api/qualityManagement/productionTesting/productionQuality.js
@@ -101,11 +101,11 @@ export const goQualityRecord = (data) => {
 };
 
 // 合格证跳转
-export const goCertificate = (params) => {
+export const goCertificate = (data) => {
   return request({
-    url: '/api/blade-desk/QA/reviewQualification',
-    method: 'get',
-    params
+    url: '/api/blade-desk/QA/InspectionTask/reviewQualification',
+    method: 'post',
+    data
   });
 };
 
diff --git a/src/views/productionTesting/InspectionTemplate.vue b/src/views/productionTesting/InspectionTemplate.vue
index de77afc..76f6813 100644
--- a/src/views/productionTesting/InspectionTemplate.vue
+++ b/src/views/productionTesting/InspectionTemplate.vue
@@ -52,7 +52,15 @@
               <el-input v-model="formData.priority" placeholder="请输入优先级"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="分类" prop="category">
+              <el-select v-model="formData.category">
+                <el-option v-for="item in typeData" :key="item.id" :label="item.dictValue" :value="item.dictKey"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
+          
       </el-form>
       <div v-if="title == '新增'">
         <el-button type="primary"   @click="insertEvent()">插入一行</el-button>
@@ -561,6 +569,7 @@ export default {
               inspectionTemplateCode:this.formData.inspectionTemplateCode,
               name:this.formData.name,
               priority:this.formData.priority,
+              category:this.formData.category,
               detailList:this.tidList.length > 0 ? this.tidList : []
             }
             if(this.title == '新增'){
diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index 2704e74..01cdcba 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -902,7 +902,7 @@ export default {
       goQualityRecord({
         id:this.checkedId
       }).then(res =>{
-        window.open(res.data.data.url)
+        window.open(res.data.data)
       })
     },
     // 跳转合格证
@@ -910,7 +910,7 @@ export default {
       goCertificate({
         id:this.checkedId
       }).then(res =>{
-        window.open(res.data.data.url)
+        window.open(res.data.data)
       })
     },
     getRowClass(row, index) {