From fa3a13b43cdcd3bcc42abae4d9c0a67e48ebea41 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 16:05:41 +0800
Subject: [PATCH] feat: bug修复 12536
---
admin-web/src/views/foundation/classification/edit.vue | 1 -
admin-web/src/components/upload/index.vue | 5 +++--
admin-web/src/views/foundation/classification/index.vue | 10 +---------
admin-web/src/views/stock/transfer/transferApplication/edit.vue | 1 -
admin-web/src/views/stock/scrap/itemScrapping/edit.vue | 1 -
admin-web/src/views/stock/procure/purchaseOrder/edit.vue | 2 --
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 1 -
admin-web/src/components/myTree/index.vue | 3 ++-
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 3 +--
admin-web/src/views/departmentitem/itemdis/distribution/edit.vue | 1 -
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 1 -
admin-web/src/views/stock/accessStock/outbound/edit.vue | 1 -
admin-web/src/views/systemSetting/department/index.vue | 1 -
13 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/admin-web/src/components/myTree/index.vue b/admin-web/src/components/myTree/index.vue
index 6f5a7f7..bdd1b93 100644
--- a/admin-web/src/components/myTree/index.vue
+++ b/admin-web/src/components/myTree/index.vue
@@ -23,6 +23,7 @@
@node-click='onSelect'
:expand-on-click-node='false'
:default-expand-all='autoExpandParent'
+ :default-expanded-keys="expandedKeys"
:filter-node-method='filterNode'
:highlight-current='true'
>
@@ -80,7 +81,7 @@
},
methods: {
onExpand(expandedKeys) {
- this.expandedKeys = expandedKeys;
+ this.expandedKeys.push(expandedKeys.id);
this.autoExpandParent = false;
},
filterNode(value, data) {
diff --git a/admin-web/src/components/upload/index.vue b/admin-web/src/components/upload/index.vue
index d3ef5d8..ae445bd 100644
--- a/admin-web/src/components/upload/index.vue
+++ b/admin-web/src/components/upload/index.vue
@@ -85,12 +85,13 @@
title: '闄勪欢涓婁紶',
max: 100, // 鏈�澶уぇ灏忥紝鍗曚綅M
num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
- accept: '.jpg,.jpeg,.png,.pdf,.doc,.docx,.xls,.xlsx', // 闄愬埗鏍煎紡
+ // accept: '.jpg,.jpeg,.png,.pdf,.doc,.docx,.xls,.xlsx', // 闄愬埗鏍煎紡
+ accept: '.jpg,.jpeg,.png,.webp,.bmp', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: '', // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'text' // text/picture
+ type: 'picture' // text/picture
}
}
},
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
index 0e53b54..48eb5fe 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
@@ -364,7 +364,6 @@
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index 82818b4..bda50a4 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -172,7 +172,6 @@
qryType: 1,
pageNum: this.pageNum,
pageSize: this.pageSize,
- departmentId: this.userInfo.tenantId,
outAgencyId: this.userInfo.tenantId,
...this.filterFrom,
}).then((res) => {
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index 7389571..a07c354 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -303,12 +303,11 @@
title: '涓婁紶',
max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
- accept: '.jpg,.png', // 闄愬埗鏍煎紡
+ accept: '', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index ca66e15..fe8b798 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -331,7 +331,6 @@
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
scrapReasonOptions: [] // 鎶ュ簾鍘熷洜
};
diff --git a/admin-web/src/views/foundation/classification/edit.vue b/admin-web/src/views/foundation/classification/edit.vue
index 7227f2c..4e1b579 100644
--- a/admin-web/src/views/foundation/classification/edit.vue
+++ b/admin-web/src/views/foundation/classification/edit.vue
@@ -134,7 +134,6 @@
});
} else {
params.orgId = this.setting.orgId;
- console.log(params);
finsystenant
.add(params)
.then((res) => {
diff --git a/admin-web/src/views/foundation/classification/index.vue b/admin-web/src/views/foundation/classification/index.vue
index b2705c7..115890d 100644
--- a/admin-web/src/views/foundation/classification/index.vue
+++ b/admin-web/src/views/foundation/classification/index.vue
@@ -208,11 +208,7 @@
initTreeData() {
getTree().then((res) => {
const content = res || [];
- // this.treeDataList.splice(0, this.treeDataList.length)
this.treeDataList = content;
- // if (content.length > 0) {
- // this.importSetting.fileSettings.data = {pid: content[0].id}
- // }
});
},
updState(row) {
@@ -238,14 +234,11 @@
})
.then((res) => {
this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
+ this.refreshData();
})
.catch(() => {});
},
showAdd() {
- // if (!this.editSetting.orgId) {
- // this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
- // } else {
if (this.p && this.p) {
this.editSetting.pid = this.p.id;
}
@@ -253,7 +246,6 @@
this.editSetting.info = null;
this.editSetting.title = '鏂板';
this.editSetting.show = true;
- // }
},
showAudit(row) {
this.editSetting.id = row.id;
diff --git a/admin-web/src/views/stock/accessStock/outbound/edit.vue b/admin-web/src/views/stock/accessStock/outbound/edit.vue
index f6477e9..dc4bd7a 100644
--- a/admin-web/src/views/stock/accessStock/outbound/edit.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -259,7 +259,6 @@
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/edit.vue b/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
index 360821c..e08e183 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
@@ -326,8 +326,6 @@
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
- disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index acc8c73..3f020cd 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -257,7 +257,6 @@
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index ddd4033..ee03a15 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -255,7 +255,6 @@
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'picture', // text/picture
},
};
},
diff --git a/admin-web/src/views/systemSetting/department/index.vue b/admin-web/src/views/systemSetting/department/index.vue
index 676cb7d..c82fc3f 100644
--- a/admin-web/src/views/systemSetting/department/index.vue
+++ b/admin-web/src/views/systemSetting/department/index.vue
@@ -187,7 +187,6 @@
});
},
nodeClick(param) {
- console.log(param, 'param');
this.p = Object.assign(
{},
{
--
Gitblit v1.9.1