Commit a0bd9c3a authored by miaojiale's avatar miaojiale

修改bug

parent 0b32814f
...@@ -283,7 +283,7 @@ export default { ...@@ -283,7 +283,7 @@ export default {
}, },
// 表单赋值 // 表单赋值
initforms(formEdit) { initforms(formEdit, flag) {
this.$nextTick(() => { this.$nextTick(() => {
const form = {} const form = {}
this.forms.forEach((item) => { this.forms.forEach((item) => {
...@@ -309,6 +309,9 @@ export default { ...@@ -309,6 +309,9 @@ export default {
if (this.$refs.form && this.$refs.form.clearValidate) { if (this.$refs.form && this.$refs.form.clearValidate) {
this.$refs.form.clearValidate() this.$refs.form.clearValidate()
} }
if (flag) {
this.$emit("handleSearch", this.form)
}
}) })
}, },
......
...@@ -100,7 +100,9 @@ ...@@ -100,7 +100,9 @@
}" }"
> >
<div>{{ index + 1 }}</div> <div>{{ index + 1 }}</div>
<div>{{ item.unionName }}</div> <div class="tooLong">
{{ item.unionName }}
</div>
<div>{{ item.nums }}</div> <div>{{ item.nums }}</div>
</li> </li>
</ul> </ul>
...@@ -158,7 +160,7 @@ ...@@ -158,7 +160,7 @@
</div> --> </div> -->
<!-- 科学研究 --> <!-- 科学研究 -->
<div class="scientificresearch"> <!-- <div class="scientificresearch">
<div class="title_box"> <div class="title_box">
<div class="title">科学研究</div> <div class="title">科学研究</div>
<div class="empty"></div> <div class="empty"></div>
...@@ -177,7 +179,7 @@ ...@@ -177,7 +179,7 @@
{{ item }} {{ item }}
</li> </li>
</ul> </ul>
</div> </div> -->
<!-- 粘性定位 --> <!-- 粘性定位 -->
<div v-show="showFixed" class="fixed_box"> <div v-show="showFixed" class="fixed_box">
<ul class="f_list"> <ul class="f_list">
...@@ -430,6 +432,9 @@ export default { ...@@ -430,6 +432,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
#con { #con {
.tooLong {
white-space: nowrap;
}
.flex { .flex {
height: 100%; height: 100%;
display: flex; display: flex;
...@@ -599,7 +604,7 @@ export default { ...@@ -599,7 +604,7 @@ export default {
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
li { li {
width: 40%; width: 46%;
margin-bottom: 15px; margin-bottom: 15px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
...@@ -310,7 +310,13 @@ export default { ...@@ -310,7 +310,13 @@ export default {
}, },
checkStatus(val) { checkStatus(val) {
if (val) { if (val) {
this.handleSearch() this.$refs.form.initforms(
{
checkStatus: val,
},
true
)
// this.handleSearch()
} }
}, },
}, },
...@@ -417,7 +423,7 @@ export default { ...@@ -417,7 +423,7 @@ export default {
...this.$refs.form.form, ...this.$refs.form.form,
...form, ...form,
} }
params = Object.assign(this.cacheForm, params) // params = Object.assign(this.cacheForm, params)
for (let key in params) { for (let key in params) {
if (params[key] !== "" && params[key] !== null) { if (params[key] !== "" && params[key] !== null) {
if (key.includes("Time") && params[key]) { if (key.includes("Time") && params[key]) {
......
...@@ -374,6 +374,7 @@ export default { ...@@ -374,6 +374,7 @@ export default {
this.initForm = { this.initForm = {
checkStatus: this.$route.query.checkStatus + "", checkStatus: this.$route.query.checkStatus + "",
} }
this.cacheForm = {}
// console.log(this.searchForm) // console.log(this.searchForm)
this.handleSearch(this.initForm) this.handleSearch(this.initForm)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment