From 12c1c0b3df4956739aa68505078e4561922a1124 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 15 七月 2025 10:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/WarehouseList.vue | 90 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/src/views/tms/WarehouseList.vue b/src/views/tms/WarehouseList.vue
index 5a467a1..9be0090 100644
--- a/src/views/tms/WarehouseList.vue
+++ b/src/views/tms/WarehouseList.vue
@@ -144,7 +144,6 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import WarehouseModal from './modules/WarehouseModal'
import { getAction, putAction, deleteAction } from '../../api/manage'
- import moment from 'moment'
export default {
name: 'WarehouseList',
@@ -153,16 +152,8 @@
WarehouseModal
},
data () {
- const now = moment()
- const lastWeek = now.clone().subtract(7,'days')
return {
description: '浠撳簱绠＄悊',
- queryParam: {
- beginTime: lastWeek.format('YYYY-MM-DD HH:mm'),
- endTime: now.format('YYYY-MM-DD HH:mm'),
- warehouseName: '',
- parentId: ''
- },
// 琛ㄥご
columns: [
{
@@ -188,12 +179,26 @@
{
title:'鐖惰妭鐐圭紪鍙�',
align:"center",
- dataIndex: 'parentWarehouseId'
+ dataIndex: 'parentWarehouseId',
+ customRender:function (text,r) {
+ if (r.parentId === '-1') {
+ return '-1';
+ } else {
+ return text;
+ }
+ }
},
{
title:'鐖惰妭鐐瑰悕绉�',
align:"center",
- dataIndex: 'parentWarehouseName'
+ dataIndex: 'parentWarehouseName',
+ customRender:function (text,r) {
+ if (r.parentId === '-1') {
+ return '鑸畤鏁戠敓';
+ } else {
+ return text;
+ }
+ }
},
{
title:'鐘舵��',
@@ -214,10 +219,7 @@
{
title:'鍒涘缓鏃堕棿',
align:"center",
- dataIndex: 'createTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
+ dataIndex: 'createTime'
},
{
title: '鎿嶄綔',
@@ -254,30 +256,47 @@
}
},
mounted() {
- this.$bus.$on('getCurrSelected', (data) => {
- console.log(data)
+ this.handleGetCurrSelected = (data) => {
this.treeSelected = data;
this.queryParam.parentId = data.key;
this.loadData();
- });
+ }
+ this.$bus.$on('getCurrSelected', this.handleGetCurrSelected);
},
beforeDestroy() {
- this.$bus.$off('getCurrSelected', {});
+ this.$bus.$off('getCurrSelected', this.handleGetCurrSelected);
},
methods: {
+ handleAdd: function () {
+ const nextSeq = Number(this.dataSource[this.dataSource.length - 1].seq) + 1
+ this.$refs.modalForm.add(nextSeq);
+ this.$refs.modalForm.title = "鏂板";
+ this.$refs.modalForm.disableSubmit = false;
+ },
handleStatus(record) {
- const params = {
- id: record.id,
- status: record.status === '1' ? '2' : '1'
- }
- putAction(this.url.edit, params).then((res) => {
+ getAction(this.url.list, { parentId: record.id }).then((res) => {
if (res.success) {
- this.$message.success(res.message)
- this.loadData()
+ if (res.result.total > 0) {
+ this.$message.warning('璇ヨ妭鐐逛笅瀛樺湪瀛愯妭鐐癸紝涓嶈兘鍙樻洿鐘舵�侊紒')
+ } else {
+ const params = {
+ id: record.id,
+ status: record.status === '1' ? '2' : '1'
+ }
+ putAction(this.url.edit, params).then((res) => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.loadData()
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ }
} else {
- this.$message.warning(res.message)
+ this.$message.warning(res.message);
}
- })
+ });
+
},
handleDelete(id) {
getAction(this.url.list, { parentId: id }).then((res) => {
@@ -301,24 +320,11 @@
}
})
},
- // onBeginTimeChange(date, dateString) {
- // this.queryParam.begin_time = dateString[0]
- // },
- // onEndTimeChange(date, dateString) {
- // this.queryParam.end_time = dateString[0]
- // },
searchReset() {
- const now = moment()
- const lastWeek = now.clone().subtract(7,'days')
this.queryParam = {
- beginTime: lastWeek.format('YYYY-MM-DD HH:mm'),
- endTime: now.format('YYYY-MM-DD HH:mm'),
- warehouseName: '',
- parentId: ''
+ parentId: this.treeSelected.key
}
- this.treeSelected = {}
this.loadData(1)
- this.$bus.$emit('clearTreeSelection')
},
modalFormOk() {
this.loadData()
--
Gitblit v1.9.3