WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-07-02 10:57:02 +08:00
parent b37d28de24
commit 16979ff779
3 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+25 -1
View File
@@ -18,6 +18,7 @@
<!-- 无 --> <!-- 无 -->
<div v-if="item.controlVerify == '1'"> <div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -163,6 +164,7 @@
<!-- 无 --> <!-- 无 -->
<div v-if="item.controlVerify == '1'"> <div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -170,6 +172,7 @@
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -256,6 +259,7 @@
<!-- 无 --> <!-- 无 -->
<div v-if="item.controlVerify == '1'"> <div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -263,6 +267,7 @@
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -359,6 +364,7 @@
<!-- 无 --> <!-- 无 -->
<div v-if="item.controlVerify == '1'"> <div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -366,6 +372,7 @@
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -493,7 +500,7 @@
<a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
allowClear> allowClear>
<a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value"> <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" :title=" itemin.label "> <span style="display: inline-block;width: 100%" class="itemOption" :title=" itemin.label ">
{{ itemin.label }} {{ itemin.label }}
</span> </span>
</a-select-option> </a-select-option>
@@ -513,6 +520,7 @@
<!-- 无 --> <!-- 无 -->
<div v-if="item.controlVerify == '1'"> <div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -521,6 +529,7 @@
<div v-if="item.controlVerify == '2'"> <div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:maxLength="1000"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -694,6 +703,13 @@
.ant-table td { .ant-table td {
white-space: nowrap; white-space: nowrap;
} }
.selectWid .ant-select-selection--multiple {
overflow: auto;
}
.selectWid .ant-select-selection--multiple::-webkit-scrollbar {
display: none; /* Chrome Safari */
}
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
.box { .box {
@@ -747,4 +763,12 @@
.ant-select-disabled{ .ant-select-disabled{
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
} }
.itemOption {
display: inline-block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
</style> </style>
jero-web/src/components/tableCollection/index.vue
+2 -2
View File
@@ -375,10 +375,10 @@
this.areaVisible = true this.areaVisible = true
// this.$refs.ruleForm.clearValidate() // this.$refs.ruleForm.clearValidate()
this.$nextTick(() => { this.$nextTick(() => {
this.Dateline = {...this.Dateline}
this.getquerySdtList(record) this.getquerySdtList(record)
this.$refs.ruleForm.clearValidate()
}) })
this.$refs.ruleForm.clearValidate()
}, },
dataValueTobeinitiated() { 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')) this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+14 -13
View File
@@ -983,30 +983,31 @@
ishandleSubmit() { ishandleSubmit() {
let _this = this let _this = this
let postDate = [] 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 postDateobj = {}
let itemIn = Object.keys(this.selectedRowKeysValue[i]) let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) { for (let j = 0; j < itemIn.length; j++) {
if (itemIn[j] !== 'sdt') { if (itemIn[j] !== 'sdt') {
if (this.selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(this.selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = this.selectedRowKeysValue[i][itemIn[j]] postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < this.selectedRowKeysValue[i][itemIn[j]].list.length; k++) { for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { if (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(',') 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) { if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && 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() 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' if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
&& this.selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
this.$message.warning(this.selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
return return
} }
} }
} }
} }
} }
postDateobj.id = this.selectedRowKeysValue[i].id postDateobj.id = selectedRowKeysValue[i].id
postDate.push(postDateobj) postDate.push(postDateobj)
} }