From 960f5bbd741424595030280efc9f89dfd38b0aa1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 十二月 2023 11:02:28 +0800
Subject: [PATCH] 原材料检验-扫码修改
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 4 +++-
src/views/basic/location/index.vue | 4 ++--
src/views/common/rawMaterial-part.vue | 1 +
src/views/basic/location/location-form.vue | 23 ++++++++++++++++++-----
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index dfb4f75..e102c95 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -194,7 +194,7 @@
optList: () => {
return this.getWarehouseLocGroupList()
}
- },
+ }/* ,
// ERP搴撲綅
{
minWidth: '200',
@@ -204,7 +204,7 @@
isTrue: false,
isSearch: true,
searchInfoType: 'text'
- }
+ } */
],
toolbar: [
{
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 11c4657..26c0b1c 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -134,10 +134,23 @@
<el-row>
<el-col :span="12">
+ <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
+ <el-date-picker
+ readonly
+ style="width: 100%"
+ v-model="moment"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item
label="IFS搴撲綅"
prop="ifsLocationDesc"
- >
+ > -->
<!-- <el-select
v-model="dataForm.ifsLocation"
filterable
@@ -152,13 +165,13 @@
>
</el-option>
</el-select> -->
- <el-cascader
+ <!-- <el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
style="width:100%" filterable
></el-cascader>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="搴撲綅鐘舵��" prop="locStatus">
<el-switch
@@ -169,7 +182,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="12">
<el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
<el-date-picker
@@ -184,7 +197,7 @@
</el-form-item>
</el-col>
<el-col :span="12"> </el-col>
- </el-row>
+ </el-row> -->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
diff --git a/src/views/common/rawMaterial-part.vue b/src/views/common/rawMaterial-part.vue
index 0bbf2eb..e920087 100644
--- a/src/views/common/rawMaterial-part.vue
+++ b/src/views/common/rawMaterial-part.vue
@@ -188,6 +188,7 @@
// props:['currentRow'],
methods: {
getData() {
+ console.log(1111);
if (this.$refs.rawPartTable !== undefined) {
this.$refs.rawPartTable.getDataList()
}
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 6dbb469..5094a7d 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -345,7 +345,9 @@
userName: '',
testState: ''
}],
- dataRule: {},
+ dataRule: {
+ code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }]
+ },
deviceList: [],
}
},
--
Gitblit v1.9.3