From 61a19a514eed8796ee2c6e7ab1111addf053cf67 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:46:18 +0800
Subject: [PATCH] 1.新增NC文件批次页签 2.批次页签新增 数控加工确认表按钮，点击按钮出现对应批次确认表 3.处理修改查询电子样板与NC文件查询页面处理文件名折叠问题

---
 src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue |   74 +++++++++++++++++++++++++++++-------
 1 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
index 8afb748..a05c9d4 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="flex: 1">
-    <a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination"
+    <a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination" :loading="loading"
              :scroll="{y:265}" :customRow="customRow" :size="size" rowKey="docId" @change="handleTableChange">
 
     </a-table>
@@ -17,6 +17,7 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import DocumentModal from '../../../../common/DocumentModal'
 import NcDocumentAssignModal from './NcDocumentAssignModal'
+import dncApi from '@api/dnc'
 
 export default {
   name: 'NcDocumentTableList',
@@ -38,7 +39,7 @@
           title: '搴忓彿',
           dataIndex: 'rowIndex',
           key: 'rowIndex',
-          width: 65,
+          width: 50,
           align: 'center',
           customRender: function(t, r, index) {
             return parseInt(index) + 1
@@ -49,10 +50,10 @@
           dataIndex: 'docName',
           key: 'docName',
           align: 'center',
-          width: 300,
+          scopedSlots: {customRender: 'docName'},
+          width: 500,
           sorter: true
         },
-        { title: '浠ｇ爜鐗堟湰', dataIndex: 'docAlias', align: 'center' },
         {
           title: '鍑哄簱鐘舵��',
           dataIndex: 'pullStatus_dictText',
@@ -61,25 +62,29 @@
           filters: [
             { text: '鏈嚭搴�', value: 1 },
             { text: '宸插嚭搴�', value: 2 }
-          ]
+          ],
+          width: 100
         },
         {
-          title: '鐘�  鎬�',
-          dataIndex: 'docStatus_dictText',
-          key: 'docStatus',
+          title: '鐘舵��',
+          dataIndex: 'docDispatchStatus_dictText',
+          key: 'docDispatchStatus',
           align: 'center',
           filters: [
-            { text: '璁捐', value: 1 },
-            { text: '鍙戝竷', value: 2 },
-            { text: '褰掓。', value: 3 }
-          ]
+            { text: '缂栧埗', value: 1 },
+            { text: '鏍″', value: 2 },
+            { text: '鎵瑰噯', value: 3 },
+            { text: '璇曞垏', value: 4 },
+            { text: '瀹氬瀷', value: 5 }
+          ],
+          width: 70
         },
-        { title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center', width: 200 },
+        { title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center', width: 120 },
         {
           title: '鍒涘缓鏃堕棿',
           dataIndex: 'createTime',
           align: 'center',
-          width: 200,
+          width: 150,
           sorter: true
         }
       ],
@@ -94,7 +99,7 @@
   watch: {
     currentNCDocumentAttributionInfo: {
       handler(value) {
-        this.currentClickedDocumentInfo = {}
+        this.currentClickedDocumentInfo = this.currentRightClickedDocumentInfo = {}
       },
       immediate: true
     }
@@ -188,6 +193,45 @@
       this.$refs.documentAssignModalRef.visible = true
     },
 
+    handleDocumentExtract(record){
+      const that = this
+      const { docId,attributionId, attributionType } = record
+      that.$confirm({
+        title: '鎻愮ず',
+        content: `纭鎻愬彇鍒�鍏峰悧锛焋,
+        okText: '纭',
+        cancelText: '鍙栨秷',
+        onOk: () => {
+          dncApi.extractToolsApi({ docId, attributionId, attributionType })
+            .then(res => {
+              if (res.success) {
+                that.$notification.success({
+                  message: '娑堟伅',
+                  description: `鎻愬彇鎴愬姛`
+                })
+              } else {
+                that.$notification.error({
+                  message: '娑堟伅',
+                  description: res.message
+                })
+              }
+            })
+            .catch(err => {
+              that.$notification.error({
+                message: '娑堟伅',
+                description: err.message
+              })
+            })
+            .finally(() => {
+              that.$destroyAll()
+            })
+        },
+        onCancel: () => {
+          that.$destroyAll()
+        }
+      })
+    },
+
     handleDelete() {
       // 姝ゅ鍑芥暟涓哄睆钄絤ixins涓殑鍚屽悕鍑芥暟锛岄�氱敤鍑芥暟鍐欏湪鐖剁骇涓�
     },

--
Gitblit v1.9.3