@@ -694,6 +703,13 @@
.ant-table td {
white-space: nowrap;
}
+ .selectWid .ant-select-selection--multiple {
+ overflow: auto;
+ }
+
+ .selectWid .ant-select-selection--multiple::-webkit-scrollbar {
+ display: none; /* Chrome Safari */
+ }
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index fe68141ec..5aec4838b 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -375,10 +375,10 @@
this.areaVisible = true
// this.$refs.ruleForm.clearValidate()
this.$nextTick(() => {
+ this.Dateline = {...this.Dateline}
this.getquerySdtList(record)
+ this.$refs.ruleForm.clearValidate()
})
- this.$refs.ruleForm.clearValidate()
-
},
dataValueTobeinitiated() {
this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 79b133147..9bc09aff5 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -983,30 +983,31 @@
ishandleSubmit() {
let _this = this
let postDate = []
- for (let i = 0; i < this.selectedRowKeysValue.length; i++) {
+ let selectedRowKeysValue = JSON.parse(JSON.stringify(this.selectedRowKeysValue))
+ for (let i = 0; i < selectedRowKeysValue.length; i++) {
let postDateobj = {}
- let itemIn = Object.keys(this.selectedRowKeysValue[i])
+ let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) {
if (itemIn[j] !== 'sdt') {
- if (this.selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(this.selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
- postDateobj[itemIn[j]] = this.selectedRowKeysValue[i][itemIn[j]]
- for (let k = 0; k < this.selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
- if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
- this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
+ 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++) {
+ if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
+ selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
}
- if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
- this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
+ if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
+ selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
}
- if (!this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && this.selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
- && this.selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
- this.$message.warning(this.selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
+ if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
+ && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
+ this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
return
}
}
}
}
}
- postDateobj.id = this.selectedRowKeysValue[i].id
+ postDateobj.id = selectedRowKeysValue[i].id
postDate.push(postDateobj)
}