From ecc438e1df596db8dfe720f00cc5877475fb3b90 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期五, 17 十一月 2023 11:37:31 +0800
Subject: [PATCH] 11
---
src/views/product/workbench/feed-pane.vue | 8 ++--
src/views/basic/location/index.vue | 2
src/views/basic/workstation/workstation-form.vue | 4 +-
src/views/basic/location/location-form.vue | 60 ++++++++++++++++++++++-------
src/api/warehouse/location.js | 16 ++++++++
5 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/src/api/warehouse/location.js b/src/api/warehouse/location.js
index 7f1a72f..8afd1f5 100644
--- a/src/api/warehouse/location.js
+++ b/src/api/warehouse/location.js
@@ -106,3 +106,19 @@
params: query
})
}
+
+export function getIfsLocationByGroupCopy(query) {
+ return request({
+ url: '/mes/location/getIfsLocation/copy',
+ method: 'get',
+ params: query
+ })
+}
+
+export function getIfsLocationByGroupCopyAll(query) {
+ return request({
+ url: '/mes/location/getIfsLocationByGroupCopyAll',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index f0474fe..d1c959d 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -198,7 +198,7 @@
{
minWidth: '200',
prop: 'ifsLocation',
- label: 'ERP搴撲綅',
+ label: 'IFS搴撲綅',
sort: true,
isTrue: false,
isSearch: true,
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index c2591bf..8871e84 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -135,11 +135,10 @@
<el-row>
<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,11 +151,11 @@
:key="index"
>
</el-option>
- </el-select>-->
+ </el-select> -->
<el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
- style="width:100%"
+ style="width:100%" filterable
></el-cascader>
</el-form-item>
</el-col>
@@ -219,6 +218,7 @@
warehouseOptions: [],
factoryOptions: [],
ifsLocationOptions: [],
+ locationTree: [],
visible: false,
dataForm: {
id: 0,
@@ -262,34 +262,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
}
})
@@ -404,7 +409,32 @@
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>
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 3b09630..9947e12 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -138,7 +138,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
+ <!-- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
<el-transfer
filterable
v-model="disqualifiedLocationIds"
@@ -159,7 +159,7 @@
@change="handleChangeQualifiedLocation"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
<el-transfer
filterable
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 3dd5b5f..7b41bbb 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -144,14 +144,14 @@
><span style="font-size:14px;font-weight:bold">绾胯竟浠撳悎鏍肩墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
v-if="permissions.product_feed_scan"
class="feeding-btn"
type="primary"
icon="feed-btn-feeding"
@click="scanAddFeed()"
>鎵爜鎶曟枡</el-button
- >
+ > -->
<el-button
class="feeding-btn"
type="primary"
@@ -1130,7 +1130,7 @@
><span style="font-size:14px;font-weight:bold">宸叉姇鍏ユ湭娑堣�楃墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
class="return-btn"
type="primary"
@click="submitIns()"
@@ -1141,7 +1141,7 @@
type="primary"
@click="inputHandle()"
>灏炬枡澶勭悊</el-button
- >
+ > -->
<el-button
class="return-btn"
type="primary"
--
Gitblit v1.9.3