diff --git a/src/views/auditPages/assetsManagement/assetsAuth.vue b/src/views/auditPages/assetsManagement/assetsAuth.vue
index 0af6e14..c234c7f 100644
--- a/src/views/auditPages/assetsManagement/assetsAuth.vue
+++ b/src/views/auditPages/assetsManagement/assetsAuth.vue
@@ -10,19 +10,19 @@
-
+
-
+
-
+
@@ -90,7 +90,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
@@ -450,8 +450,8 @@
-
- 更多
+
+ {{ isMore ? '收起' : '更多' }}
@@ -778,7 +778,7 @@
-
+
添加其他联系人
@@ -1323,7 +1323,7 @@
-
+
@@ -1369,7 +1369,7 @@
-
+
@@ -1415,7 +1415,7 @@
-
+
@@ -1461,7 +1461,7 @@
-
+
@@ -1526,7 +1526,7 @@
-
+
@@ -1591,7 +1591,7 @@
-
+
@@ -1637,7 +1637,7 @@
-
+
@@ -1735,7 +1735,7 @@
-
+
添加服务器
@@ -1809,7 +1809,7 @@
-
+
添加网络设备
@@ -1883,7 +1883,7 @@
-
+
添加安全设备
@@ -2725,9 +2725,9 @@
-
+
取消
- 确认
+ 保存
@@ -2929,6 +2929,16 @@ export default {
this.getInfo(this.$route.query.id)
this.disabled = true;
this.isMore = true;
+ this.$nextTick(()=>{
+ const inputElements = document.querySelectorAll('.el-input__inner');
+ const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+ inputElements.forEach((input) => {
+ input.placeholder = '';
+ });
+ textareaInputElements.forEach((input) => {
+ input.placeholder = '';
+ });
+ })
} else if(this.$route.query.pageType == 'change') {
this.getInfo(this.$route.query.id)
this.disabled = false;
diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue
index 005ccbe..86547fa 100644
--- a/src/views/auditPages/assetsManagement/index.vue
+++ b/src/views/auditPages/assetsManagement/index.vue
@@ -280,12 +280,12 @@ export default {
handleExport(){
this.download('/tc/assetCurrent/export', {
...this.formInline
- }, `asset_${new Date().getTime()}.xlsx`)
+ }, `资产${new Date().getTime()}.xlsx`)
},
/** 下载模板操作 */
importTemplate() {
this.download('/tc/assetCurrent/importTemplate', {
- }, `asset${new Date().getTime()}.xlsx`)
+ }, `资产导入模板${new Date().getTime()}.xlsx`)
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
diff --git a/src/views/auditPages/unitManagement/index.vue b/src/views/auditPages/unitManagement/index.vue
index 5e31286..70d5dae 100644
--- a/src/views/auditPages/unitManagement/index.vue
+++ b/src/views/auditPages/unitManagement/index.vue
@@ -42,7 +42,7 @@
-
+
@@ -353,14 +353,14 @@
-
+
-
+
添加其他联系人
@@ -395,7 +395,7 @@
-
+
@@ -462,7 +462,7 @@
-
+
取消
确定
@@ -532,6 +532,16 @@ export default {
if(this.$route.query.pageType == 'look') {
this.getInfo(this.$route.query.id)
this.disabled = true;
+ this.$nextTick(()=>{
+ const inputElements = document.querySelectorAll('.el-input__inner');
+ const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+ inputElements.forEach((input) => {
+ input.placeholder = '';
+ });
+ textareaInputElements.forEach((input) => {
+ input.placeholder = '';
+ });
+ })
} else if(this.$route.query.pageType == 'change') {
this.getInfo(this.$route.query.id)
this.disabled = false;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 576b0d6..3810496 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -156,7 +156,7 @@
导入
@@ -208,7 +207,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:user:export']"
>导出
@@ -218,7 +216,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:user:add']"
>新增单位
@@ -238,7 +235,7 @@
{{ scope.row.userName }}
- {{ scope.row.ssqycity }}
+ {{ getSsqu(scope.row) }}
@@ -443,6 +440,17 @@ export default {
}
);
},
+ getSsqu(row) {
+ if(row.ssqyprovince && row.ssqycity && row.ssqycounty) {
+ return row.ssqyprovince + "/" + row.ssqycity + '/' + row.ssqycounty
+ } else if(row.ssqyprovince && row.ssqycity) {
+ return row.ssqyprovince + "/" + row.ssqycity
+ } else if(row.ssqyprovince) {
+ return row.ssqyprovince
+ } else {
+ return
+ }
+ },
// 页码获取
getPagination(pages){
this.queryParams.current = pages.page;
@@ -495,7 +503,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const userIds = row.id || this.ids;
- this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?').then(function() {
+ this.$modal.confirm('是否确认删除单位id为"' + userIds + '"的数据项?').then(function() {
return delUnit(userIds);
}).then(() => {
this.getList();
diff --git a/src/views/unitPages/myAssets/index.vue b/src/views/unitPages/myAssets/index.vue
index 5945a00..26ed63d 100644
--- a/src/views/unitPages/myAssets/index.vue
+++ b/src/views/unitPages/myAssets/index.vue
@@ -24,15 +24,13 @@
-
-
-
-
-
+
+
+