diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 2b1172fe2..34ab134c9 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -46,15 +46,15 @@
- {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}
- {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}
+ {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}
- {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}
+ {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}
@@ -438,7 +438,7 @@
if (res.data.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.areaVisiblezr = false
- this.getTableList()
+ this.getLoginUserType()
} else {
_this.$message.warning(_this.$t('operationFailed'))
}
@@ -637,6 +637,7 @@
console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
},
getTableListReset() {
+ this.formInline = {}
let params = {
paramsManifestId: this.$route.query.id,
pageNo: this.pageNo,
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 39e5754e7..50832f377 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -608,6 +608,8 @@
},
mounted() {
this.GetgetLoginUserType()
+ console.log(this.currentPersonRole)
+ // this.LoginUserType()
setTimeout(() => {
if (this.currentPersonRole == 'dre') {
this.handlePreservation()
@@ -1183,6 +1185,7 @@
let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) {
if (itemIn[j] !== 'sdt') {
+ console.log(selectedRowKeysValue[i][itemIn[j]])
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1436,9 +1439,10 @@
this.$refs.CollectionTabel.getTableList()
},
searchReset() {
+ this.formInline = {}
this.$refs.CollectionTabel.getTableListReset()
- this.$refs.globalAdvancedQueryRef.resetLine()
- this.$refs.globalAdvancedQueryRef.emitCallback()
+ this.$refs.globalAdvancedQueryRef.handleReset()
+ // this.$refs.globalAdvancedQueryRef.emitCallback()
},
// 批量删除 -- 与下发收集一致
handleDelJurisdiction() {