From 0a04525d58093de7581950ae9a07129f55f2813f Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 06 六月 2025 15:54:44 +0800 Subject: [PATCH] 修改文件名称展示、批次 --- src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue | 5 +++++ src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue | 25 ++++++++++++++++++++++--- src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue | 10 +++++----- src/views/flowable/workflow/FlowTodo.vue | 3 ++- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue index 84303fb..a46a233 100644 --- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue +++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue @@ -34,6 +34,10 @@ @change="handleTableChange" :scroll="{y:456}" :size="size" rowKey="docId"> + <!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず--> + <span slot="docName" slot-scope="text"> + <j-ellipsis :value="text"/> + </span> </a-table> </a-tab-pane> </a-tabs> @@ -121,6 +125,7 @@ dataIndex: 'docName', key: 'docName', align: 'center', + scopedSlots: { customRender: 'docName' }, width: 300, sorter: true }, diff --git a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue index 13e58f0..79d4442 100644 --- a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue +++ b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue @@ -200,9 +200,15 @@ methods: { initDictConfig(){ }, - getGuideCardBatchList(){ - console.log('currentDocumentInfo', this.guideCardBatchInfo) - let params + searchQuery() { + this.queryParam.docId = this.guideCardBatchInfo.docId; + this.loadData(1); + }, + /** + * 鑾峰彇鍔犲伐纭琛ㄥ垪琛� + */ + getGuideCardBatchList() { + let params= {}; params.docId=this.guideCardBatchInfo.docId; params.serialNumber=this.queryParam.serialNumber; params.fixtureInformation=this.guideCardBatchInfo.fixtureInformation; @@ -224,6 +230,19 @@ this.loading = false }) }, + searchReset() { + // 淇濈暀蹇呰瀛楁鐨勬祬鎷疯礉鏂瑰紡 + this.queryParam = { + docId: this.guideCardBatchInfo.docId + }; + this.loadData(1); + }, + loadData(pageNum) { + if (this.ipagination) { + this.ipagination.current = pageNum; + } + this.getGuideCardBatchList(); + }, getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'serialNumber',text:'娴佹按鍙�',dictCode:''}) diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue index 7f23a43..dede3fd 100644 --- a/src/views/flowable/workflow/FlowTodo.vue +++ b/src/views/flowable/workflow/FlowTodo.vue @@ -345,7 +345,8 @@ { title: '娴佺▼鍒嗙被', align: 'center', - dataIndex: 'category_dictText' + dataIndex: 'category_dictText', + width: 100 }, { title: '娴佺▼鍚嶇О', diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue index 745176b..ed36204 100644 --- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue +++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue @@ -141,11 +141,11 @@ <a-input :disabled='coldisabled' v-model='tableRowRecord.applyTime'></a-input> </a-form-model-item > </a-col> - <a-col :span="24"> - <a-form-item label="瀵嗙骇涓�" :labelCol="labelCol" :wrapperCol="wrapperCol"> - <j-dict-select-tag type='list' v-model='assignFileStream.secretLevel' dictCode='dnc_secret_level' placeholder="璇烽�夋嫨瀵嗙骇" /> - </a-form-item> - </a-col> +<!-- <a-col :span="24">--> +<!-- <a-form-item label="瀵嗙骇涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">--> +<!-- <j-dict-select-tag type='list' v-model='assignFileStream.secretLevel' dictCode='dnc_secret_level' placeholder="璇烽�夋嫨瀵嗙骇" />--> +<!-- </a-form-item>--> +<!-- </a-col>--> <a-col :span="24" class="btxx"> <a-form-item label="瀹℃壒鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol"> <j-dict-select-tag type='list' v-model='assignFileStream.status' dictCode='dnc_assign_stream_status' placeholder="璇烽�夋嫨瀹℃壒鐘舵��" /> -- Gitblit v1.9.3