From c51167b62fea2831abba53ba9c05bc13646340cf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 三月 2024 14:53:34 +0800
Subject: [PATCH] 原材料报检时间修改
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 6 +++---
src/views/equipment/mould/index.vue | 11 +++++++++++
src/views/quality/rawMaterial/index.vue | 4 +++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/views/equipment/mould/index.vue b/src/views/equipment/mould/index.vue
index ed98b27..c3bfe27 100644
--- a/src/views/equipment/mould/index.vue
+++ b/src/views/equipment/mould/index.vue
@@ -25,6 +25,9 @@
<el-form-item prop="name" label="妯″叿鍚嶇О">
<el-input v-model="editRow.name" placeholder="璇疯緭鍏ユā鍏峰悕绉�"></el-input>
</el-form-item>
+ <el-form-item prop="drawingNo" label="妯″叿鍥惧彿">
+ <el-input v-model="editRow.drawingNo" placeholder="璇疯緭鍏ユā鍏峰浘鍙�"></el-input>
+ </el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
@@ -103,6 +106,14 @@
},
{
minWidth: '140px',
+ prop: 'drawingNo',
+ label: '妯″叿鍥惧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140px',
prop: 'createUser',
label: '璐ｄ换浜�',
isTrue: true,
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 3e3b81e..c5af6e0 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -187,12 +187,13 @@
},
{
minWidth: '120',
- prop: 'createTime',
+ prop: 'startTime',
label: '鎶ユ鏃ユ湡',
isTrue: true,
sort: true,
isSearch: true,
searchInfoType: 'text',
+ searchInfoType: 'datetimerange',
formatter: this.formatDateTime,
},
{
@@ -210,6 +211,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ searchInfoType: 'datetimerange',
formatter: this.formatDateTime,
},
{
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 7be1a3d..ea50871 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -92,10 +92,10 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鎶ユ鏃ユ湡" prop="createTime">
+ <el-form-item label="鎶ユ鏃ユ湡" prop="startTime">
<el-date-picker
:disabled="dataForm.id!=null"
- v-model="dataForm.createTime"
+ v-model="dataForm.startTime"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -481,7 +481,7 @@
}],
dataRule: {
code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }],
- createTime: [{ required: true, message: '璇烽�夋嫨鎶ユ鏃ユ湡', trigger: 'blur' }]
+ startTime: [{ required: true, message: '璇烽�夋嫨鎶ユ鏃ユ湡', trigger: 'blur' }]
},
deviceList: [],
}
--
Gitblit v1.9.3