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 | 333 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 224 insertions(+), 109 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
index 791e2ae..a05c9d4 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
@@ -1,7 +1,7 @@
<template>
- <div>
- <a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination"
- :scroll="{y:189}" :customRow="customRow" :size="size" rowKey="docId" @change="handleTableChange">
+ <div style="flex: 1">
+ <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>
@@ -13,119 +13,234 @@
</template>
<script>
- import { getAction } from '@/api/manage'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import DocumentModal from './DocumentModal'
- import NcDocumentAssignModal from './NcDocumentAssignModal'
+import { getAction } from '@/api/manage'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import DocumentModal from '../../../../common/DocumentModal'
+import NcDocumentAssignModal from './NcDocumentAssignModal'
+import dncApi from '@api/dnc'
- export default {
- name: 'NcDocumentTableList',
- components: { NcDocumentAssignModal, DocumentModal },
- mixins: [JeecgListMixin],
- props: {
- currentTreeNodeInfo: {
- type: Object
- },
- size: {
- type: String
- }
+export default {
+ name: 'NcDocumentTableList',
+ components: { NcDocumentAssignModal, DocumentModal },
+ mixins: [JeecgListMixin],
+ props: {
+ currentNCDocumentAttributionInfo: {
+ type: Object
},
- data() {
- return {
- disableMixinCreated: true,
- columns: [
- {
- title: '搴忓彿',
- dataIndex: 'rowIndex',
- key: 'rowIndex',
- width: 65,
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
- }
- },
- { title: '鏂囦欢鍚嶇О', dataIndex: 'docName', align: 'center' },
- { title: '浠ｇ爜鐗堟湰', dataIndex: 'docAlias', align: 'center' },
- { title: '鍑哄簱鐘舵��', dataIndex: 'pullStatus_dictText', align: 'center' },
- { title: '鐘� 鎬�', dataIndex: 'docStatus_dictText', align: 'center' },
- { title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center' },
- { title: '涓婁紶鏃堕棿', dataIndex: 'createTime', align: 'center' }
- ],
- dataSource: [],
- currentRightClickedDocumentInfo: {},
- currentClickedDocumentInfo: {},
- url: {
- list: '/nc/doc/find/page'
- }
- }
- },
- created() {
- this.$bus.$on('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod)
- },
- methods: {
- loadData(arg) {
- if (!this.url.list) {
- this.$message.error('璇疯缃畊rl.list灞炴��!')
- return
- }
- //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
- if (arg === 1) this.ipagination.current = 1
- var params = this.getQueryParams()//鏌ヨ鏉′欢
- console.log('currentTreeNodeInfo', this.currentTreeNodeInfo)
- params.attributionId = this.currentTreeNodeInfo.id
- params.attributionType = this.currentTreeNodeInfo.type
- params.docClassCode = 'NC'
- if (!params) return false
- this.dataSource = []
- this.loading = true
- getAction(this.url.list + `/${this.ipagination.current}/${this.ipagination.pageSize}`, params).then((res) => {
- if (res.success) {
- this.dataSource = res.result.records
- if (res.result.total) {
- this.ipagination.total = res.result.total
- } else {
- this.ipagination.total = 0
- }
- } else {
- this.$message.warning(res.message)
+ size: {
+ type: String
+ }
+ },
+ data() {
+ return {
+ disableMixinCreated: true,
+ columns: [
+ {
+ title: '搴忓彿',
+ dataIndex: 'rowIndex',
+ key: 'rowIndex',
+ width: 50,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
}
- }).finally(() => {
- this.loading = false
- })
- },
-
- customRow(record) {
- return {
- on: {
- contextmenu: event => {
- event.preventDefault()
- this.currentRightClickedDocumentInfo = Object.assign({ param: 'NC' }, record)
- this.$emit('handleTableContextMenuOpen', this.currentRightClickedDocumentInfo)
- },
- click: () => {
- if (this.currentClickedDocumentInfo.docId === record.docId) return
- this.currentClickedDocumentInfo = Object.assign({}, record)
- this.$bus.$emit('sendCurrentClickedDocumentInfo', record)
- }
- }
+ },
+ {
+ title: '鏂囦欢鍚嶇О',
+ dataIndex: 'docName',
+ key: 'docName',
+ align: 'center',
+ scopedSlots: {customRender: 'docName'},
+ width: 500,
+ sorter: true
+ },
+ {
+ title: '鍑哄簱鐘舵��',
+ dataIndex: 'pullStatus_dictText',
+ key: 'pullStatus',
+ align: 'center',
+ filters: [
+ { text: '鏈嚭搴�', value: 1 },
+ { text: '宸插嚭搴�', value: 2 }
+ ],
+ width: 100
+ },
+ {
+ title: '鐘舵��',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
+ align: 'center',
+ filters: [
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
+ ],
+ width: 70
+ },
+ { title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center', width: 120 },
+ {
+ title: '鍒涘缓鏃堕棿',
+ dataIndex: 'createTime',
+ align: 'center',
+ width: 150,
+ sorter: true
}
- },
-
- handleDocumentEdit(record, modalTitle) {
- this.$refs.modalForm.edit(record)
- this.$refs.modalForm.title = modalTitle
- },
-
- handleDocumentAssign(record, modalTitle) {
- this.$refs.documentAssignModalRef.title = modalTitle
- this.$refs.documentAssignModalRef.visible = true
- },
-
- triggerCorrespondingMethod({ methodName, level, modalTitle, tableRowInfo }) {
- if (this[methodName]) this[methodName](tableRowInfo, modalTitle)
+ ],
+ dataSource: [],
+ currentRightClickedDocumentInfo: {},
+ currentClickedDocumentInfo: {},
+ url: {
+ list: '/nc/doc/find/page'
}
}
+ },
+ watch: {
+ currentNCDocumentAttributionInfo: {
+ handler(value) {
+ this.currentClickedDocumentInfo = this.currentRightClickedDocumentInfo = {}
+ },
+ immediate: true
+ }
+ },
+ created() {
+ this.$bus.$on('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod)
+ },
+ methods: {
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ console.log('currentNCDocumentAttributionInfo', this.currentNCDocumentAttributionInfo)
+ const { attributionId, attributionType, docClassCode } = this.currentNCDocumentAttributionInfo
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) this.ipagination.current = 1
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
+ params.attributionId = attributionId
+ params.attributionType = attributionType
+ params.docClassCode = docClassCode
+ if (!params) return false
+ this.dataSource = []
+ this.loading = true
+ getAction(this.url.list + `/${this.ipagination.current}/${this.ipagination.pageSize}`, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+
+ customRow(record) {
+ return {
+ style: {
+ backgroundColor: this.currentClickedDocumentInfo.docId === record.docId ? '#BAE7FF' : 'transparent'
+ },
+ on: {
+ contextmenu: event => {
+ event.preventDefault()
+ this.currentRightClickedDocumentInfo = Object.assign({ param: 'NC' }, record)
+ this.$emit('handleTableContextMenuOpen', this.currentRightClickedDocumentInfo)
+ },
+ click: () => {
+ if (this.currentClickedDocumentInfo.docId === record.docId) return
+ this.currentClickedDocumentInfo = Object.assign({}, record)
+ this.$bus.$emit('sendCurrentClickedDocumentInfo', record)
+ }
+ }
+ }
+ },
+
+ /**
+ * 琛ㄦ牸鍒嗛〉銆佹帓搴忔敼鍙樸�佺瓫閫夋椂瑙﹀彂
+ * @param pagination 鍒嗛〉鍣ㄩ�夐」
+ * @param filters 绛涢�夐�夐」
+ * @param sorter 鎺掑簭閫夐」
+ */
+ handleTableChange(pagination, filters, sorter) {
+ if (sorter.order) {
+ this.isorter.column = sorter.field
+ this.isorter.order = sorter.order === 'ascend' ? 'asc' : 'desc'
+ } else {
+ this.isorter.column = 'createTime'
+ this.isorter.order = 'desc'
+ }
+ for (let key in filters) {
+ this.filters[key] = filters[key].join(',')
+ }
+ this.ipagination = pagination
+ this.loadData()
+ },
+
+ handleDocumentEdit(record, modalTitle) {
+ if (!this.$refs.modalForm) return
+ this.$refs.modalForm.edit(record)
+ this.$refs.modalForm.title = modalTitle
+ },
+
+ handleDocumentAssign(record, modalTitle) {
+ if (!this.$refs.documentAssignModalRef) return
+ this.$refs.documentAssignModalRef.title = modalTitle
+ 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涓殑鍚屽悕鍑芥暟锛岄�氱敤鍑芥暟鍐欏湪鐖剁骇涓�
+ },
+
+ triggerCorrespondingMethod({ methodName, level, modalTitle, tableRowInfo }) {
+ if (this[methodName] && tableRowInfo.param === 'NC') this[methodName](tableRowInfo, modalTitle)
+ }
}
+}
</script>
<style scoped>
--
Gitblit v1.9.3