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/Cutter/CutterTableList.vue | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Cutter/CutterTableList.vue b/src/views/dnc/base/modules/ProductStructure/Cutter/CutterTableList.vue
index 09270d2..451c5bb 100644
--- a/src/views/dnc/base/modules/ProductStructure/Cutter/CutterTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Cutter/CutterTableList.vue
@@ -20,11 +20,7 @@
<a-space>
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="handleAdd" icon="plus" v-has="'cutter_add'">鏂板</a-button>
- <a-button type="primary" @click="handleExportXls('鍒�鍏峰垪琛�')" icon="export">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
- :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
+ <a-button type="primary" @click="handleAdd()" icon="export">鍙戦�佸垁鍏风郴缁�</a-button>
</a-space>
</a-col>
</a-row>
@@ -34,7 +30,8 @@
<a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination" :size="size" rowKey="id"
@change="handleTableChange" :scroll="{y:189}">
<template slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
+
+ <a @click="handleEdit(record)">閫夋嫨鍒�鍏�</a>
<a-divider type="vertical"/>
@@ -92,12 +89,14 @@
return parseInt(index) + 1
}
},
- { title: '鍒�鍏风紪鍙�', dataIndex: 'cutterCode', align: 'center' },
- { title: '鍒�鍏峰悕绉�', dataIndex: 'cutterName', align: 'center' },
- { title: '鍒�鍏风被鍨�', dataIndex: 'cutterType_dictText', align: 'center' },
+ { title: '鍒�鍏风紪鍙�', dataIndex: 'cutterCode', width: 100, align: 'center' },
+ { title: '鍒�鍏峰悕绉�', dataIndex: 'cutterName', width: 100, align: 'center' },
+ { title: '鍒�鍏风畝绉�', dataIndex: 'cutterType', width: 80, align: 'center' },
+ { title: '鍒�鍏疯鏍�', dataIndex: 'cutterSpec', align: 'center' },
{ title: '棰濆畾瀵垮懡', dataIndex: 'lifetime', width: 150, align: 'center' },
- { title: '鍒�浣�', dataIndex: 'cutterSpacing', width: 150, align: 'center' },
- { title: '鍒�鍏锋暟閲�', dataIndex: 'quantity', width: 150, align: 'center' },
+ { title: '鍒�浣�', dataIndex: 'cutterSpacing', width: 50, align: 'center' },
+ { title: '鍒�鍏锋暟閲�', dataIndex: 'quantity', width: 80, align: 'center' },
+ { title: '鎻忚堪', dataIndex: 'description', width: 200, align: 'center' },
{ title: '鎿嶄綔', dataIndex: 'action', scopedSlots: { customRender: 'action' }, align: 'center', width: 150 }
],
url: {
@@ -115,8 +114,33 @@
},
methods: {
setQueryParamAndLoadData(pageNo = 1) {
- const { id, type } = this.currentLevelInfo
- this.queryParam = Object.assign({}, { attributionId: id, attributionType: type })
+ if (this.currentLevelInfo.classificationId_dictText==='nc'){
+ const {docId,attributionType,attributionId} = this.currentLevelInfo
+ this.queryParam = Object.assign({}, { docId:docId,attributionType:attributionType,attributionId:attributionId })
+ }
+ if (this.currentLevelInfo.deviceManagementId !== null && this.currentLevelInfo.deviceManagementId !== undefined){
+ const {attributionType,id} = this.currentLevelInfo
+ this.queryParam = Object.assign({}, {attributionType:attributionType,attributionId:id })
+ }
+ if (this.currentLevelInfo.id !== null && this.currentLevelInfo.type !== null && this.currentLevelInfo.type !== undefined && this.currentLevelInfo.id !== undefined){
+ const { id, type } = this.currentLevelInfo
+ this.queryParam = Object.assign({}, { attributionId: id, attributionType: type })
+ }
+ this.loadData(pageNo)
+ },
+ searchQuery(pageNo = 1) {
+ if (this.currentLevelInfo.classificationId_dictText==='nc'){
+ const {docId,attributionType,attributionId} = this.currentLevelInfo
+ this.queryParam = Object.assign({}, { docId:docId,attributionType:attributionType,attributionId:attributionId })
+ }
+ if (this.currentLevelInfo.deviceManagementId !== null && this.currentLevelInfo.deviceManagementId !== undefined){
+ const {attributionType,id} = this.currentLevelInfo
+ this.queryParam = Object.assign({}, {attributionType:attributionType,attributionId:id })
+ }
+ if (this.currentLevelInfo.id !== null && this.currentLevelInfo.type !== null && this.currentLevelInfo.type !== undefined && this.currentLevelInfo.id !== undefined){
+ const { id, type } = this.currentLevelInfo
+ this.queryParam = Object.assign({}, { attributionId: id, attributionType: type })
+ }
this.loadData(pageNo)
},
--
Gitblit v1.9.3