From ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:50:14 +0800
Subject: [PATCH] 机床增加设备编号
---
src/views/tasks/machinereturnfileop.vue | 34 ++++++++++++-----
src/views/basesetting/machine.vue | 28 ++++++++++---
src/views/basesetting/produceplan.vue | 9 ++++
3 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index f62bc43..3572019 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -29,11 +29,7 @@
<template #menu-left>
<div class="menuLeft">
<el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
- <!-- <el-upload :show-file-list="false" class="upload-demo"
- action="/api/blade-mdm/machine/import"
- :on-change="handleChange">
- <el-button type="primary" plain size="default">瀵煎叆</el-button>
- </el-upload> -->
+
<el-button type="primary" plain @click="importAction">瀵煎叆</el-button>
<el-button type="primary" plain @click="downloadTemplate">涓嬭浇妯℃澘
</el-button>
@@ -174,6 +170,10 @@
prop: 'code'
},
{
+ label: '璁惧缂栧彿',
+ prop: 'equipmentCode'
+ },
+ {
label: '鏈哄簥鍨嬪彿',
prop: 'name',
},
@@ -225,6 +225,20 @@
{
required: true,
message: '璇疯緭鍏ユ満搴婄紪鍙�',
+ trigger: 'blur'
+ }
+ ]
+ },
+ {
+ label: '璁惧缂栧彿',
+ prop: 'equipmentCode',
+ type: 'input',
+ span: 12,
+ dataType: 'string',
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヨ澶囩紪鍙�',
trigger: 'blur'
}
]
@@ -358,7 +372,7 @@
span: 12,
dataType: 'string',
},
- {
+ /*{
label: '鍥炰紶鐩綍淇濆瓨鏃堕棿',
prop: 'receiveDirExpiryHours',
max:24,
@@ -367,7 +381,7 @@
type: 'number',
span: 12,
},
-
+ */
{
label: '澶囨敞',
prop: 'remark',
diff --git a/src/views/basesetting/produceplan.vue b/src/views/basesetting/produceplan.vue
index a287433..0134c34 100644
--- a/src/views/basesetting/produceplan.vue
+++ b/src/views/basesetting/produceplan.vue
@@ -270,6 +270,15 @@
span: 24,
},
{
+ label: '闆剁粍浠跺悕绉�',
+ prop: 'ljmc',
+ type: 'input',
+ search: false,
+ display: true,
+ disabled:true,
+ span: 24,
+ },
+ {
label: '涓荤宸ヨ壓',
prop: 'zggy',
type: 'input',
diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index fb9dc90..3af182e 100644
--- a/src/views/tasks/machinereturnfileop.vue
+++ b/src/views/tasks/machinereturnfileop.vue
@@ -6,7 +6,7 @@
-->
<template>
<basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
+ <avue-crud :option="option" :search="query" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
<template #menu-left>
@@ -40,7 +40,7 @@
total: 0,
},
form: {},
- query: {},
+ query: {status:1},
loading: true,
data: [],
option: {
@@ -65,7 +65,24 @@
{
label: '鏂囦欢鍚嶇О',
- prop: 'name'
+ prop: 'name',
+ search:true,
+ },
+ {
+ label: '瀵煎嚭鐘舵��',
+ prop: 'status',
+ search:true,
+ type:'select',
+ dicData:[
+ {
+ label: '鏈鍑�',
+ value:1
+ },
+ {
+ label: '宸插鍑�',
+ value:2
+ }
+ ]
},
{
label: '鍥炰紶鏈哄簥',
@@ -144,6 +161,7 @@
}
).then(res => {
downloadXls(res.data, `宸ユ帶缃戝洖浼犵▼搴�${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.zip`);
+ this.onLoad(this.page, {});
NProgress.done();
});
});
@@ -174,15 +192,12 @@
console.log('searchChange', params);
params.confirmTimeBegin = params?.determineTime?.[0] || '';
params.confirmTimeEnd = params?.determineTime?.[1] || '';
- console.log(params);
- // data = {
- // createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
- // createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
- // keyword: params.keyword || ''
- // }
+
data = {
confirmTimeBegin: params.confirmTimeBegin,
confirmTimeEnd: params.confirmTimeEnd,
+ name: params.name,
+ status: this.query.status,
}
this.query = data
this.onLoad(this.page, data);
@@ -216,7 +231,6 @@
console.log('onLoad', page, params);
const query = {
...this.query,
- // category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
try {
--
Gitblit v1.9.3