Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
10 changed files
with
82 additions
and
82 deletions
... | @@ -66,7 +66,7 @@ | ... | @@ -66,7 +66,7 @@ |
66 | </el-col> | 66 | </el-col> |
67 | <el-col :span="6"> | 67 | <el-col :span="6"> |
68 | <el-form-item label="坐落"> | 68 | <el-form-item label="坐落"> |
69 | <el-input placeholder="如需要模糊查询,前后输入%" v-model="queryForm.zl" clearable class="width100"> | 69 | <el-input placeholder="如需要模糊查询,前后输入%" v-model.trim="queryForm.zl" clearable class="width100"> |
70 | </el-input> | 70 | </el-input> |
71 | </el-form-item> | 71 | </el-form-item> |
72 | </el-col> | 72 | </el-col> | ... | ... |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | </el-col> | 12 | </el-col> |
13 | <el-col :span="10"> | 13 | <el-col :span="10"> |
14 | <el-form-item label="坐落"> | 14 | <el-form-item label="坐落"> |
15 | <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width300px"> | 15 | <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width300px"> |
16 | </el-input> | 16 | </el-input> |
17 | </el-form-item> | 17 | </el-form-item> |
18 | </el-col> | 18 | </el-col> | ... | ... |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | </el-col> | 12 | </el-col> |
13 | <el-col :span="10"> | 13 | <el-col :span="10"> |
14 | <el-form-item label="坐落"> | 14 | <el-form-item label="坐落"> |
15 | <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width100"> | 15 | <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100"> |
16 | </el-input> | 16 | </el-input> |
17 | </el-form-item> | 17 | </el-form-item> |
18 | </el-col> | 18 | </el-col> | ... | ... |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | </el-col> | 19 | </el-col> |
20 | <el-col :span="8"> | 20 | <el-col :span="8"> |
21 | <el-form-item label="坐落"> | 21 | <el-form-item label="坐落"> |
22 | <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width100"> | 22 | <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100"> |
23 | </el-input> | 23 | </el-input> |
24 | </el-form-item> | 24 | </el-form-item> |
25 | </el-col> | 25 | </el-col> | ... | ... |
... | @@ -26,7 +26,7 @@ | ... | @@ -26,7 +26,7 @@ |
26 | </el-col> | 26 | </el-col> |
27 | <el-col :span="10"> | 27 | <el-col :span="10"> |
28 | <el-form-item label="坐落"> | 28 | <el-form-item label="坐落"> |
29 | <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width100"> | 29 | <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100"> |
30 | </el-input> | 30 | </el-input> |
31 | </el-form-item> | 31 | </el-form-item> |
32 | </el-col> | 32 | </el-col> | ... | ... |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | </el-col> | 12 | </el-col> |
13 | <el-col :span="10"> | 13 | <el-col :span="10"> |
14 | <el-form-item label="坐落"> | 14 | <el-form-item label="坐落"> |
15 | <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width300px"> | 15 | <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width300px"> |
16 | </el-input> | 16 | </el-input> |
17 | </el-form-item> | 17 | </el-form-item> |
18 | </el-col> | 18 | </el-col> | ... | ... |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | </el-col> | 19 | </el-col> |
20 | <el-col :span="6"> | 20 | <el-col :span="6"> |
21 | <el-form-item label="坐落"> | 21 | <el-form-item label="坐落"> |
22 | <el-input placeholder="" v-model="queryForm.zl" clearable class="width200px"> | 22 | <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width200px"> |
23 | </el-input> | 23 | </el-input> |
24 | </el-form-item> | 24 | </el-form-item> |
25 | </el-col> | 25 | </el-col> | ... | ... |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | </el-col> | 19 | </el-col> |
20 | <el-col :span="6"> | 20 | <el-col :span="6"> |
21 | <el-form-item label="坐落"> | 21 | <el-form-item label="坐落"> |
22 | <el-input placeholder="" v-model="queryForm.zl" clearable class="width200px"> | 22 | <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width200px"> |
23 | </el-input> | 23 | </el-input> |
24 | </el-form-item> | 24 | </el-form-item> |
25 | </el-col> | 25 | </el-col> | ... | ... |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | </el-col> | 19 | </el-col> |
20 | <el-col :span="6"> | 20 | <el-col :span="6"> |
21 | <el-form-item label="坐落"> | 21 | <el-form-item label="坐落"> |
22 | <el-input placeholder="" v-model="queryForm.zl" clearable class="width200px"> | 22 | <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width200px"> |
23 | </el-input> | 23 | </el-input> |
24 | </el-form-item> | 24 | </el-form-item> |
25 | </el-col> | 25 | </el-col> | ... | ... |
... | @@ -63,7 +63,7 @@ | ... | @@ -63,7 +63,7 @@ |
63 | </el-col> | 63 | </el-col> |
64 | <el-col :span="5"> | 64 | <el-col :span="5"> |
65 | <el-form-item label="坐落"> | 65 | <el-form-item label="坐落"> |
66 | <el-input placeholder="如需要模糊查询,前后输入%" v-model="queryForm.zl" clearable class="width100"> | 66 | <el-input placeholder="如需要模糊查询,前后输入%" v-model.trim="queryForm.zl" clearable class="width100"> |
67 | </el-input> | 67 | </el-input> |
68 | </el-form-item> | 68 | </el-form-item> |
69 | </el-col> | 69 | </el-col> |
... | @@ -80,82 +80,82 @@ | ... | @@ -80,82 +80,82 @@ |
80 | </div> | 80 | </div> |
81 | </template> | 81 | </template> |
82 | <script> | 82 | <script> |
83 | import { mapGetters } from 'vuex' | 83 | import { mapGetters } from 'vuex' |
84 | import table from "@/utils/mixin/table"; | 84 | import table from "@/utils/mixin/table"; |
85 | import { datas, sendThis } from "./jdcxdata"; | 85 | import { datas, sendThis } from "./jdcxdata"; |
86 | import { getJdcxBysearch } from "@/api/zhcx.js" | 86 | import { getJdcxBysearch } from "@/api/zhcx.js" |
87 | export default { | 87 | export default { |
88 | name: "jdcx", | 88 | name: "jdcx", |
89 | components: {}, | 89 | components: {}, |
90 | mixins: [table], | 90 | mixins: [table], |
91 | mounted () { | 91 | mounted () { |
92 | sendThis(this); | 92 | sendThis(this); |
93 | }, | 93 | }, |
94 | computed: { | 94 | computed: { |
95 | ...mapGetters(['dictData']) | 95 | ...mapGetters(['dictData']) |
96 | }, | ||
97 | data () { | ||
98 | return { | ||
99 | queryForm: { | ||
100 | ywly: "", | ||
101 | qllx: "", | ||
102 | djlx: "", | ||
103 | ywh: "", | ||
104 | }, | ||
105 | // pageData: { | ||
106 | // currentPage: 1, | ||
107 | // pageSize: 10, | ||
108 | // total: 0, | ||
109 | // }, | ||
110 | tableData: { | ||
111 | total: 0, | ||
112 | columns: datas.columns(), | ||
113 | data: [] | ||
114 | } | ||
115 | } | ||
116 | }, | ||
117 | methods: { | ||
118 | // 初始化数据 | ||
119 | queryClick () { | ||
120 | this.$startLoading() | ||
121 | getJdcxBysearch({ ...this.queryForm, ...this.pageData }).then(res => { | ||
122 | this.$endLoading() | ||
123 | if (res.code === 200) { | ||
124 | let { total, records } = res.result | ||
125 | // let str = '' | ||
126 | // records.forEach(item => { | ||
127 | // if (item.userNameList.length != 0) { | ||
128 | // str = String(item.userNameList) | ||
129 | // item.blStatus = item.zbhj + '(' + str.replace(/,/g, "+") + ')' | ||
130 | // } | ||
131 | // if (item.qlrmc.length != 0) { | ||
132 | // item.qlrmcStr = String(item.qlrmc) | ||
133 | // } | ||
134 | // if (item.ywrmc.length != 0) { | ||
135 | // item.ywrmcStr = String(item.ywrmc) | ||
136 | // } | ||
137 | // if (item.zlList.length != 0) { | ||
138 | // item.zlStr = String(item.zlList) | ||
139 | // } | ||
140 | // }) | ||
141 | // this.pageData.total = total; | ||
142 | // this.tableData.data = records | ||
143 | this.tableData.total = total ? total : 0; | ||
144 | this.tableData.data = records ? records : []; | ||
145 | } | ||
146 | }) | ||
147 | }, | 96 | }, |
148 | handleSort (name, sort) { | 97 | data () { |
149 | console.log(name, sort); | 98 | return { |
99 | queryForm: { | ||
100 | ywly: "", | ||
101 | qllx: "", | ||
102 | djlx: "", | ||
103 | ywh: "", | ||
104 | }, | ||
105 | // pageData: { | ||
106 | // currentPage: 1, | ||
107 | // pageSize: 10, | ||
108 | // total: 0, | ||
109 | // }, | ||
110 | tableData: { | ||
111 | total: 0, | ||
112 | columns: datas.columns(), | ||
113 | data: [] | ||
114 | } | ||
115 | } | ||
150 | }, | 116 | }, |
151 | openDialog (item) { | 117 | methods: { |
152 | const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3') | 118 | // 初始化数据 |
153 | // window.open(href, '_blank'); | 119 | queryClick () { |
154 | window.open(href, `urlname${item.bsmSlsq}`); | 120 | this.$startLoading() |
121 | getJdcxBysearch({ ...this.queryForm, ...this.pageData }).then(res => { | ||
122 | this.$endLoading() | ||
123 | if (res.code === 200) { | ||
124 | let { total, records } = res.result | ||
125 | // let str = '' | ||
126 | // records.forEach(item => { | ||
127 | // if (item.userNameList.length != 0) { | ||
128 | // str = String(item.userNameList) | ||
129 | // item.blStatus = item.zbhj + '(' + str.replace(/,/g, "+") + ')' | ||
130 | // } | ||
131 | // if (item.qlrmc.length != 0) { | ||
132 | // item.qlrmcStr = String(item.qlrmc) | ||
133 | // } | ||
134 | // if (item.ywrmc.length != 0) { | ||
135 | // item.ywrmcStr = String(item.ywrmc) | ||
136 | // } | ||
137 | // if (item.zlList.length != 0) { | ||
138 | // item.zlStr = String(item.zlList) | ||
139 | // } | ||
140 | // }) | ||
141 | // this.pageData.total = total; | ||
142 | // this.tableData.data = records | ||
143 | this.tableData.total = total ? total : 0; | ||
144 | this.tableData.data = records ? records : []; | ||
145 | } | ||
146 | }) | ||
147 | }, | ||
148 | handleSort (name, sort) { | ||
149 | console.log(name, sort); | ||
150 | }, | ||
151 | openDialog (item) { | ||
152 | const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3') | ||
153 | // window.open(href, '_blank'); | ||
154 | window.open(href, `urlname${item.bsmSlsq}`); | ||
155 | } | ||
155 | } | 156 | } |
156 | } | 157 | } |
157 | } | ||
158 | </script> | 158 | </script> |
159 | <style scoped lang="scss"> | 159 | <style scoped lang="scss"> |
160 | @import "~@/styles/public.scss"; | 160 | @import "~@/styles/public.scss"; |
161 | </style> | 161 | </style> | ... | ... |
-
Please register or sign in to post a comment