From 21127bd08e848eebfea6392adccb00169c9b3656 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Mon, 30 Mar 2026 21:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addTemplateDialog.vue          |  2 +-
 src/views/processManagement/taskDispatch.vue  |  2 +-
 .../sameFurnaceQuery/index.vue                | 36 ++++++++++++-------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue
index c698245..dbf50d4 100644
--- a/src/views/processManagement/components/addTemplateDialog.vue
+++ b/src/views/processManagement/components/addTemplateDialog.vue
@@ -183,7 +183,7 @@
                   >
                     <el-option
                       v-for="item in caIdList"
-                      :label="`${item.code}-${item.name}`"
+                      :label="`${item.caCode}-${item.caName}`"
                       :value="item.id"
                     >
                     </el-option>
diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue
index 9fafab8..7fed8e6 100644
--- a/src/views/processManagement/taskDispatch.vue
+++ b/src/views/processManagement/taskDispatch.vue
@@ -74,7 +74,7 @@ export default {
         border: true,
         index: true,
         selection: true,
-        selectable:true,
+        selectable:false,
         viewBtn: false,
         delBtn: false,
         editBtn: false,
diff --git a/src/views/productionManagement/sameFurnaceQuery/index.vue b/src/views/productionManagement/sameFurnaceQuery/index.vue
index 0384780..d3f6a0c 100644
--- a/src/views/productionManagement/sameFurnaceQuery/index.vue
+++ b/src/views/productionManagement/sameFurnaceQuery/index.vue
@@ -78,14 +78,14 @@ export default {
         column: [
           {
             label: '绑定编号',
-            prop: 'mtnCode',
+            prop: 'code',
             search: true,
             sortable: true,
             overHidden: true,
           },
           {
             label: '车间订单号',
-            prop: 'prWorkPlan.prWorkOrder.woCode',
+            prop: 'woCode',
             search: true,
             sortable: true,
             overHidden: true,
@@ -93,42 +93,42 @@ export default {
           },
           {
             label: '物料号',
-            prop: 'prWorkPlan.prWorkOrder.pjYieldOrder.partCode',
+            prop: 'partCode',
             search: true,
             sortable: true,
             overHidden: true,
           },
           {
             label: '批次号',
-            prop: 'prWorkPlan.prWorkOrder.batchNo',
+            prop: 'batchNo',
             search: true,
             sortable: true,
             overHidden: true,
           },
           {
             label: '数量',
-            prop: 'prWorkPlan.workQty',
+            prop: 'makeQty',
             search: false,
             sortable: true,
             overHidden: true,
           },
           {
             label: '设备编码',
-            prop: 'equipmentCard.deviceCode',
+            prop: 'deviceCode',
             search: false,
             sortable: true,
             overHidden: true,
           },
           {
             label: '挂具编号',
-            prop: 'bsRackSet.rsCode',
+            prop: 'rsCode',
             search: false,
             sortable: true,
             overHidden: true,
           },
           {
             label: '飞靶编号',
-            prop: 'bsFeiBaSet.fsCode',
+            prop: 'fsCode',
             search: false,
             sortable: true,
             overHidden: true,
@@ -139,10 +139,19 @@ export default {
             search: true,
             sortable: true,
             overHidden: true,
+            search: true,
+            searchLabelWidth: 'auto',
+            width: 150,
+            type: 'date',
+            searchRange: true,
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            format: 'YYYY-MM-DD HH:mm:ss',
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
           },
           {
             label: '绑定人员',
-            prop: 'createMan',
+            prop: 'name',
             search: false,
             sortable: true,
             overHidden: true,
@@ -192,11 +201,14 @@ export default {
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-
+      if (this.query.bindTime && this.query.bindTime.length > 0) {
+        this.query.startTime = this.query.bindTime[0];
+        this.query.endTime = this.query.bindTime[1];
+      }
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        // this.data = res.data.data;
+        this.data = res.data.data.records;
         this.loading = false;
-        this.page.total = this.data.length;
+        this.page.total = res.data.data.total;
       });
     },
   },