From 6e91eb03317c5d2832ecb98c6bcd3b635029b971 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 25 十月 2023 13:41:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/basic/part/index.vue | 2 +-
src/views/basic/workstation/workstation-form.vue | 4 ++--
src/views/basic/warehouse/warehouse-form.vue | 4 ++--
src/views/basic/part/part-form.vue | 4 ++--
src/views/basic/location/location-form.vue | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 35d131b..440da03 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -15,7 +15,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ巶" prop="factoryId">
- <el-select disabled
+ <el-select
v-model="dataForm.factoryId"
filterable
placeholder="璇烽�夋嫨宸ュ巶"
@@ -222,7 +222,7 @@
visible: false,
dataForm: {
id: 0,
- factoryId: 117,
+ factoryId: '',
pType: '',
locNo: '',
locName: '',
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 3124b5a..5ef67ee 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -364,7 +364,7 @@
fun: this.addOrUpdateHandle
},
{
- text: '鍚屾IFS',
+ text: '鑾峰彇IFS闆朵欢',
type: 'primary',
fun: this.syncISDate,
loading: false
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index 9a088f2..67eefa8 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -20,12 +20,12 @@
placeholder="闆朵欢鍙�"
:disabled="(dataForm.id != null && dataForm.id > 0) || status"
>
- <el-button
+ <!-- <el-button
slot="append"
icon="el-icon-search"
@click="openPartDialog()"
v-show="!dataForm.id"
- ></el-button>
+ ></el-button> -->
</el-input>
</el-form-item>
</el-col>
diff --git a/src/views/basic/warehouse/warehouse-form.vue b/src/views/basic/warehouse/warehouse-form.vue
index 2b6cbad..43f537b 100644
--- a/src/views/basic/warehouse/warehouse-form.vue
+++ b/src/views/basic/warehouse/warehouse-form.vue
@@ -60,7 +60,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ巶" prop="factoryId">
- <el-select disabled
+ <el-select
v-model="dataForm.factoryId"
filterable
placeholder="璇烽�夋嫨"
@@ -187,7 +187,7 @@
warehouseName: '',
warehouseDesc: '',
warehouseType: '',
- factoryId: 117,
+ factoryId: '',
warehouseAddr: '',
warehouseMap: '',
warehouseStatus: '',
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 41fa6e2..3f76bf0 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -64,7 +64,7 @@
</el-select>
</el-form-item>
<el-form-item label="宸ュ巶" prop="factoryId">
- <el-select disabled
+ <el-select
v-model="dataForm.factoryId"
placeholder="宸ュ巶"
filterable
@@ -221,7 +221,7 @@
workstationNo: '',
name: '',
type: '',
- factoryId: 117,
+ factoryId: '',
remark: '',
artificialType: '',
workCenter: '',
--
Gitblit v1.9.3