From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue b/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
index 6c1570f..1a036f4 100644
--- a/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
+++ b/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-07 22:51:22
- * @LastEditors: Sneed
- * @LastEditTime: 2024-05-12 13:14:41
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:21:11
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
-->
<template>
@@ -11,8 +11,9 @@
<el-aside width="200px" v-loading="showGrouploading">
<el-container>
<el-main>
- <el-tree default-expand-all ref="group" node-key="id" :data="treeData" :props="props"
- @node-click="nodeClick" highlight-current :current-node-key="params.areaId">
+ <el-tree :expand-on-click-node="false" default-expand-all ref="group" node-key="id"
+ :data="treeData" :props="props" @node-click="nodeClick" highlight-current
+ :current-node-key="params.areaId">
<template #default="{ node, data }">
<div class="custom-tree-node">
<span :class="data.isArea ? 'treedisabled' : ''">{{
@@ -149,8 +150,8 @@
{ required: true, message: '蹇呭～' }
],
},
- exportUrl: '/api/blade-cps/warehouse-station/export-template',
- uploadUrl: '/api/blade-cps/warehouse-station/import-station',
+ exportUrl: '/api/smis/warehouse-station/export-template',
+ uploadUrl: '/api/smis/warehouse-station/import-station',
selection: [],
apiObj: {
get: async (data) => {
@@ -158,7 +159,7 @@
...data,
...this.params,
}
- return await this.$HTTP.get(`/api/blade-cps/warehouse-station/page`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/warehouse-station/page`, {}, { params }).then(res => {
return res
})
}
@@ -177,7 +178,7 @@
},
methods: {
init() {
- this.$HTTP.get(`/api/blade-cps/warehouse-area/tree`).then(res => {
+ this.$HTTP.get(`/api/smis/warehouse-area/tree`).then(res => {
this.treeData = res.data
this.nodeClick(res.data?.[0])
})
@@ -199,11 +200,11 @@
type: 'warning'
}).then(() => {
const loading = this.$loading();
- this.$HTTP.get(`/api/blade-cps/warehouse-area/station-count?id=${id}`).then(res => {
+ this.$HTTP.get(`/api/smis/warehouse-area/station-count?id=${id}`).then(res => {
if (res.data > 0) {
this.$message.warning("璇ュ簱鍖哄凡缁忕粦瀹氬簱浣嶏紝璇峰厛娓呴櫎搴撲綅锛�")
} else {
- this.$HTTP.delete(`/api/blade-cps/warehouse-area/remove`, {}, { data: [id] }).then(res => {
+ this.$HTTP.delete(`/api/smis/warehouse-area/remove`, {}, { data: [id] }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.init()
})
@@ -219,13 +220,13 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
if (this.form.id) {
- return this.$HTTP.put(`/api/blade-cps/warehouse-area/update`, { ...this.form }).then(res => {
+ return this.$HTTP.put(`/api/smis/warehouse-area/update`, { ...this.form }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.areaVisible = false
this.init()
})
}
- this.$HTTP.post(`/api/blade-cps/warehouse-area/insert`, { ...this.form, parentId: 1 }).then(res => {
+ this.$HTTP.post(`/api/smis/warehouse-area/insert`, { ...this.form, parentId: 1 }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.areaVisible = false
this.init()
@@ -241,7 +242,7 @@
this.optionVisible = true
},
table_del(ids) {
- this.$HTTP.delete(`/api/blade-cps/warehouse-station/remove`, {}, { data: ids.map(v => v.id) }).then(res => {
+ this.$HTTP.delete(`/api/smis/warehouse-station/remove`, {}, { data: ids.map(v => v.id) }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.search()
})
@@ -254,13 +255,13 @@
this.$refs.dialogForm1.validate(async (valid) => {
if (valid) {
if (this.form1.id) {
- return this.$HTTP.put(`/api/blade-cps/warehouse-station/update`, { ...this.form1, areaId: this.params.areaId }).then(res => {
+ return this.$HTTP.put(`/api/smis/warehouse-station/update`, { ...this.form1, areaId: this.params.areaId }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.optionVisible = false
this.search()
})
}
- this.$HTTP.post(`/api/blade-cps/warehouse-station/insert`, { ...this.form1, areaId: this.params.areaId }).then(res => {
+ this.$HTTP.post(`/api/smis/warehouse-station/insert`, { ...this.form1, areaId: this.params.areaId }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.optionVisible = false
this.search()
@@ -272,9 +273,9 @@
this.selection = selection
},
getExport() {
- this.$HTTP.post(`/api/blade-cps/warehouse-station/export-station`, { ...this.params }).then(res => {
+ this.$HTTP.post(`/api/smis/warehouse-station/export-station`, { ...this.params }).then(res => {
if (res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
}).catch(() => { })
},
--
Gitblit v1.9.3