From 9d754853b524dcfeff524cad92d869cbdf24b2b5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 17:17:46 +0800
Subject: [PATCH] 机床回传程序界面调整
---
src/views/tasks/machinereturnfileop.vue | 50 +++++++++++++-----------
src/views/flowmgr/taskassign.vue | 2
src/views/tasks/machinereturnfiles.vue | 15 +++----
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/src/views/flowmgr/taskassign.vue b/src/views/flowmgr/taskassign.vue
index 604241c..4c85bd7 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -47,7 +47,7 @@
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
},
{
- label: '鍥惧彿',
+ label: '闆剁粍浠跺彿',
prop: 'drawingNo',
type: 'input',
span: 12,
diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index c066d5e..214d1e5 100644
--- a/src/views/tasks/machinereturnfileop.vue
+++ b/src/views/tasks/machinereturnfileop.vue
@@ -11,7 +11,7 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
<template #menu-left>
<el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button>
- <el-button type="primary" plain @click="reassign">鎸傝浇杞﹀簥绋嬪簭搴�</el-button>
+ <!--<el-button type="primary" plain @click="reassign">鎸傝浇杞﹀簥绋嬪簭搴�</el-button>-->
<el-button type="primary" plain @click="exportExcel">瀵煎嚭鍒癊XCEL</el-button>
</template>
<template #menu="scope">
@@ -62,31 +62,17 @@
menu: false,
dialogClickModal: false,
column: [
- {
- label: '纭鏃堕棿',
- prop: 'confirmTime',
- type: 'datetime',
- format: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- search: true,
- searchRange: true,
- searchSpan: 8,
- hide: true,
- },
-
- {
- label: '绋嬪簭缂栧彿',
- prop: 'code',
+
+ {
+ label: '鏂囦欢鍚嶇О',
+ prop: 'name'
},
{
label: '鍥炰紶鏈哄簥',
prop: 'machineCode',
},
- {
- label: '鏂囦欢鍚嶇О',
- prop: 'name'
- },
+
{
label: '鏂囦欢鍥哄寲鐘舵��',
prop: 'isCured',
@@ -100,7 +86,25 @@
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
- }
+ },
+ {
+ label: '纭鏃堕棿',
+ prop: 'determineTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ search: true,
+ searchRange: true,
+ searchSpan: 8,
+ hide: false,
+ }/*,
+ {
+ label: '鎺ユ敹x鏃堕棿',
+ prop: 'determineTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ }*/
],
selectedList: [],
}
@@ -127,7 +131,7 @@
ids: this.selectedList.map(item => item.id).join(','),
}
).then(res => {
- downloadXls(res.data, `瀵煎嚭鍥炰紶娑夊瘑缃�${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
+ downloadXls(res.data, `宸ユ帶缃戝洖浼犵▼搴�${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.zip`);
NProgress.done();
});
});
@@ -146,7 +150,7 @@
exportBlob(
`/blade-mdm/machineback/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
).then(res => {
- downloadXls(res.data, `瀵煎嚭鏈哄簥鍥炰紶绋嬪簭${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
+ downloadXls(res.data, `鏈哄簥鍥炰紶绋嬪簭鍒楄〃${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
NProgress.done();
});
});
diff --git a/src/views/tasks/machinereturnfiles.vue b/src/views/tasks/machinereturnfiles.vue
index 73431d1..91f5f48 100644
--- a/src/views/tasks/machinereturnfiles.vue
+++ b/src/views/tasks/machinereturnfiles.vue
@@ -65,18 +65,15 @@
prop: 'programName',
hide: true
},
- {
- label: '鏂囦欢缂栧彿',
- prop: ''
+ {
+ label: '鏂囦欢鍚嶇О',
+ prop: 'name',
},
{
label: '鏈哄簥鍙�',
prop: 'machineCode',
},
- {
- label: '鏂囦欢鍚嶇О',
- prop: 'name',
- },
+
{
label: '鏂囦欢鍥哄寲鐘舵��',
prop: 'isCured',
@@ -84,11 +81,11 @@
{
label: '鏂囦欢鍒拌揪鏃堕棿',
prop: 'arrivedTime',
- },
+ },/*
{
label: '鏂囦欢鏁版嵁搴撶紪鍙�',
prop: '',
- },
+ },*/
{
label: '鍏抽敭淇℃伅',
prop: 'keyword',
--
Gitblit v1.9.3