From e75fbafe30f3acfafa5cc9425ddca1eb1221ae45 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 19 十二月 2023 15:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/basic/location/location-form.vue | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 22 deletions(-)
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index c2591bf..a63ba17 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -31,14 +31,14 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐖惰妭鐐圭被鍨�" prop="pType">
<el-input
v-model="dataForm.pType"
placeholder="鐖惰妭鐐圭被鍨�"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="12">
@@ -134,12 +134,24 @@
<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
- v-if="permissions.basic_has_ifs"
label="IFS搴撲綅"
prop="ifsLocationDesc"
- >
- <!--<el-select
+ > -->
+ <!-- <el-select
v-model="dataForm.ifsLocation"
filterable
placeholder="璇烽�夋嫨IFS搴撲綅"
@@ -152,14 +164,14 @@
:key="index"
>
</el-option>
- </el-select>-->
- <el-cascader
+ </el-select> -->
+ <!-- <el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
- style="width:100%"
+ 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
@@ -170,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
@@ -185,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>
@@ -219,6 +231,7 @@
warehouseOptions: [],
factoryOptions: [],
ifsLocationOptions: [],
+ locationTree: [],
visible: false,
dataForm: {
id: 0,
@@ -262,34 +275,39 @@
locationProps: {
lazy: true,
lazyLoad(node, resolve) {
- console.log('node', node)
const { level } = node
if (level === 0) {
getIfsLocationGroup().then((response) => {
if (response.data.code === 0) {
const _data = response.data.data
-
- const nodes = _data.map((item) => {
+ const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
return {
- value: item.LOCATION_GROUP,
- label: item.LOCATION_GROUP,
+ value: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
+ label: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
leaf: false
}
})
+ var set = new Set()
+ nodes.forEach(a=>{
+ set.add(JSON.stringify(a))
+ })
+ var list = []
+ set.forEach(a=>{
+ list.push(JSON.parse(a))
+ })
// 閫氳繃璋冪敤resolve灏嗗瓙鑺傜偣鏁版嵁杩斿洖锛岄�氱煡缁勪欢鏁版嵁鍔犺浇瀹屾垚
- resolve(nodes)
+ resolve(list)
}
})
} else {
- getIfsLocationByGroup({ locationGroup: node.value }).then(
+ getIfsLocationByGroup({ locationNo: node.value.split('-')[1] }).then(
(response) => {
if (response.data.code === 0) {
const _data = response.data.data
-
- const nodes = _data.map((item) => {
+ const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
return {
value: item.LOCATION_NO,
- label: item.LOCATION_NO,
+ label: item.LOCATION_DESC +' | '+ item.LOCATION_NO,
leaf: true
}
})
@@ -391,6 +409,9 @@
this.visible = false
this.isSubmit = false
this.$emit('refreshDataList')
+ }).catch(error=>{
+ console.error(error);
+ this.isSubmit = false
})
} else {
addObj(this.dataForm).then((data) => {
@@ -398,13 +419,41 @@
this.visible = false
this.isSubmit = false
this.$emit('refreshDataList')
+ }).catch(error=>{
+ console.error(error);
+ this.isSubmit = false
})
}
} else {
this.isSubmit = false
}
})
- }
+ },
+ getLocationTree(){
+ getIfsLocationGroup().then((res) => {
+ if (res.data.code === 0) {
+ var strs = JSON.parse(res.data.data)['LIST_INFO']
+ var set3 = new Set()
+ var set2 = new Set()
+ var set = []
+ strs.forEach(a=>{
+ set2.add(a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])
+ })
+ strs.forEach(a=>{
+ set2.forEach(b=>{
+ if((a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])==b){
+ set3.add(a['LOCATION_DESC'] + '-' + a['LOCATION_NO'])
+ }
+ set.push({
+ value: b,
+ label: b,
+ children: []
+ })
+ })
+ })
+ }
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3