From 5cdff5e062935666b06848a3b63ae9b32d114146 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 04 十一月 2023 17:35:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/basic/location/location-form.vue | 106 +++++++++++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 51 deletions(-)
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 440da03..0316a75 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -32,12 +32,28 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐖惰妭鐐圭被鍨�" prop="pType">
+ <el-form-item label="鎵�灞炰粨搴撳垎缁�" prop="locGroup">
+ <el-select
+ v-model="dataForm.locGroup"
+ filterable
+ placeholder="璇烽�夋嫨鎵�灞炰粨搴撳垎缁�"
+ style="width:100%"
+ >
+ <el-option
+ v-for="(item, index) in this.warehouseOptions"
+ :label="item.warehouseName"
+ :value="item.id"
+ :key="index"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="鐖惰妭鐐圭被鍨�" prop="pType">
<el-input
v-model="dataForm.pType"
placeholder="鐖惰妭鐐圭被鍨�"
></el-input>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
<el-row>
@@ -95,45 +111,47 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="搴撲綅鍦板浘" prop="locMap">
- <el-input
- v-model="dataForm.locMap"
- placeholder="搴撲綅鍦板浘"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="鎵�灞炰粨搴撳垎缁�" prop="locGroup">
- <el-select
- v-model="dataForm.locGroup"
- filterable
- placeholder="璇烽�夋嫨鎵�灞炰粨搴撳垎缁�"
- style="width:100%"
- >
- <el-option
- v-for="(item, index) in this.warehouseOptions"
- :label="item.warehouseName"
- :value="item.id"
- :key="index"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
<el-form-item label="澶囨敞" prop="locRemark">
<el-input
v-model="dataForm.locRemark"
placeholder="澶囨敞"
></el-input>
</el-form-item>
+ <!-- <el-form-item label="搴撲綅鍦板浘" prop="locMap">
+ <el-input
+ v-model="dataForm.locMap"
+ placeholder="搴撲綅鍦板浘"
+ ></el-input>
+ </el-form-item> -->
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="搴撲綅鐘舵��" prop="locStatus">
+ <el-switch
+ v-model="dataForm.locStatus"
+ :active-value="1"
+ :inactive-value="0"
+ ></el-switch>
+ </el-form-item>
+ </el-col>
+ <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-row>
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item
v-if="permissions.basic_has_ifs"
label="IFS搴撲綅"
@@ -153,36 +171,20 @@
>
</el-option>
</el-select>-->
- <el-cascader
+ <!-- <el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
style="width:100%"
></el-cascader>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
- <el-form-item label="搴撲綅鐘舵��" prop="locStatus">
- <el-switch
- v-model="dataForm.locStatus"
- :active-value="1"
- :inactive-value="0"
- ></el-switch>
- </el-form-item>
+
</el-col>
</el-row>
<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-col>
</el-row>
@@ -223,6 +225,8 @@
dataForm: {
id: 0,
factoryId: '',
+ warehouseId: null,
+ warehouseName: null,
pType: '',
locNo: '',
locName: '',
--
Gitblit v1.9.3