Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
7be1a7cf by 田浩浩
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents c2c777bd 0c37d5ac
Inline Side-by-side
Showing 9 changed files with 38 additions and 67 deletions
...@@ -23,6 +23,7 @@ export default { ...@@ -23,6 +23,7 @@ export default {
23 this.queryClick() 23 this.queryClick()
24 }, 24 },
25 handleCurrentChange (val) { 25 handleCurrentChange (val) {
26 console.log(val, '222222222');
26 this.pageData.currentPage = val 27 this.pageData.currentPage = val
27 if (this.queryClick) { 28 if (this.queryClick) {
28 this.queryClick() 29 this.queryClick()
......
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
64 </el-form> 64 </el-form>
65 </div> 65 </div>
66 <div class="from-clues-content"> 66 <div class="from-clues-content">
67 <lb-table :page-size="pageData.size" :heightNum="340" :current-page.sync="pageData.current" 67 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
68 :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange" 68 @selection-change="handleSelectionChange" @size-change="handleSizeChange"
69 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 69 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
70 </lb-table> 70 </lb-table>
71 </div> 71 </div>
......
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
180 } 180 }
181 } catch (error) { 181 } catch (error) {
182 this.message = error 182 this.message = error
183 this.$refs.msg.messageShow() 183 // this.$refs.msg.messageShow()
184 } 184 }
185 }, 185 },
186 async handlDatadetails (index, row) { 186 async handlDatadetails (index, row) {
......
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
180 } 180 }
181 } catch (error) { 181 } catch (error) {
182 this.message = error 182 this.message = error
183 this.$refs.msg.messageShow() 183 // this.$refs.msg.messageShow()
184 } 184 }
185 }, 185 },
186 async handlDatadetails (index, row) { 186 async handlDatadetails (index, row) {
......
...@@ -47,16 +47,16 @@ ...@@ -47,16 +47,16 @@
47 <el-input v-model="form.YWH" placeholder="请输入海岛名称"></el-input> 47 <el-input v-model="form.YWH" placeholder="请输入海岛名称"></el-input>
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 <el-col :span="4" class="btnColRight mt-10" > 50 <el-col :span="4" class="btnColRight mt-10">
51 <btn nativeType="cx" @click="handleSubmit">查询结果</btn> 51 <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
52 </el-col> 52 </el-col>
53 </el-row> 53 </el-row>
54 </el-form> 54 </el-form>
55 </div> 55 </div>
56 <div class="from-clues-content"> 56 <div class="from-clues-content">
57 <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current" 57 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
58 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 58 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
59 :column="tableData.columns" :data="tableData.data"> 59 :data="tableData.data">
60 </lb-table> 60 </lb-table>
61 <message-tips ref="msg" :message="message" /> 61 <message-tips ref="msg" :message="message" />
62 </div> 62 </div>
...@@ -84,7 +84,6 @@ export default { ...@@ -84,7 +84,6 @@ export default {
84 }, 84 },
85 data () { 85 data () {
86 return { 86 return {
87 loading: false,
88 form: { 87 form: {
89 YWH: '', 88 YWH: '',
90 QLLX: '', 89 QLLX: '',
...@@ -138,7 +137,6 @@ export default { ...@@ -138,7 +137,6 @@ export default {
138 }, 137 },
139 async featchData () { 138 async featchData () {
140 try { 139 try {
141 this.loading = true
142 this.form = Object.assign(this.form, this.formData) 140 this.form = Object.assign(this.form, this.formData)
143 let { result: { list, total, pages: pageSize, pageNum: current } 141 let { result: { list, total, pages: pageSize, pageNum: current }
144 } = await business.getQlfQlHysyqByConditon(this.form) 142 } = await business.getQlfQlHysyqByConditon(this.form)
...@@ -152,7 +150,7 @@ export default { ...@@ -152,7 +150,7 @@ export default {
152 this.message = error 150 this.message = error
153 this.$refs.msg.messageShow() 151 this.$refs.msg.messageShow()
154 } 152 }
155 this.loading = false 153
156 }, 154 },
157 async handlDatadetails (index, row) { 155 async handlDatadetails (index, row) {
158 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB) 156 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
......
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
174 } 174 }
175 } catch (error) { 175 } catch (error) {
176 this.message = error 176 this.message = error
177 this.$refs.msg.messageShow() 177 // this.$refs.msg.messageShow()
178 } 178 }
179 }, 179 },
180 async handlDatadetails (index, row) { 180 async handlDatadetails (index, row) {
......
...@@ -77,13 +77,11 @@ import business from '@/api/business' ...@@ -77,13 +77,11 @@ import business from '@/api/business'
77 import dataReporting from '@/api/dataReporting' 77 import dataReporting from '@/api/dataReporting'
78 import tableMixin from '@/mixins/tableMixin.js' 78 import tableMixin from '@/mixins/tableMixin.js'
79 import treeSelect from '@/components/treeSelect/index.vue' 79 import treeSelect from '@/components/treeSelect/index.vue'
80 import editDialog from '@/components/dataDetails/edit-dialog.vue'
81 export default { 80 export default {
82 name: "ygdj", 81 name: "ygdj",
83 mixins: [tableMixin], 82 mixins: [tableMixin],
84 components: { 83 components: {
85 treeSelect, 84 treeSelect,
86 editDialog
87 }, 85 },
88 data () { 86 data () {
89 return { 87 return {
...@@ -131,25 +129,7 @@ export default { ...@@ -131,25 +129,7 @@ export default {
131 current: 1, 129 current: 1,
132 }, 130 },
133 diaData: null, 131 diaData: null,
134 bsmSjsb: '', 132 bsmSjsb: ''
135 DJLXOptions: [
136 {
137 label: '首次登记',
138 value: '100'
139 },
140 {
141 label: '转移登记',
142 value: '200'
143 },
144 {
145 label: '变更登记',
146 value: '300'
147 },
148 {
149 label: '更正登记',
150 value: '500'
151 }
152 ],
153 } 133 }
154 }, 134 },
155 methods: { 135 methods: {
......
...@@ -54,12 +54,9 @@ ...@@ -54,12 +54,9 @@
54 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 54 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
55 :data="tableData.data"> 55 :data="tableData.data">
56 </lb-table> 56 </lb-table>
57 <message-tips ref="msg" :message="message" />
58 </div> 57 </div>
59 <!-- XML报文 --> 58 <!-- 编辑 -->
60 <xml-message ref="dialog" :xml="xml" /> 59 <dataDetails ref="editLog" :title="title" />
61 <!-- 数据详情 -->
62 <edit-dialog ref="editLog" :bsmSjsb="bsmSjsb" :diaData="diaData" />
63 </div> 60 </div>
64 </template> 61 </template>
65 62
...@@ -70,13 +67,11 @@ import business from '@/api/business' ...@@ -70,13 +67,11 @@ import business from '@/api/business'
70 import dataReporting from '@/api/dataReporting' 67 import dataReporting from '@/api/dataReporting'
71 import tableMixin from '@/mixins/tableMixin.js' 68 import tableMixin from '@/mixins/tableMixin.js'
72 import treeSelect from '@/components/treeSelect/index.vue' 69 import treeSelect from '@/components/treeSelect/index.vue'
73 import editDialog from '@/components/dataDetails/edit-dialog.vue'
74 export default { 70 export default {
75 name: "yydj", 71 name: "yydj",
76 mixins: [tableMixin], 72 mixins: [tableMixin],
77 components: { 73 components: {
78 treeSelect, 74 treeSelect
79 editDialog
80 }, 75 },
81 data () { 76 data () {
82 return { 77 return {
...@@ -105,15 +100,14 @@ export default { ...@@ -105,15 +100,14 @@ export default {
105 <el-button 100 <el-button
106 type="primary" 101 type="primary"
107 size="mini" 102 size="mini"
108 onClick={() => { this.handledetails(scope.$index, scope.row) }} 103 onClick={() => { this.handleEdit(scope.row) }}
109 > 104 >
110 数据详情 105 详情
111 </el-button> 106 </el-button>
112 </div> 107 </div>
113 ); 108 )
114 }, 109 }
115 }, 110 }
116
117 ]), 111 ]),
118 data: [] 112 data: []
119 }, 113 },
......
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
111 components: { 111 components: {
112 dataDetails, 112 dataDetails,
113 }, 113 },
114 data() { 114 data () {
115 return { 115 return {
116 // 开始结束日期限制 116 // 开始结束日期限制
117 pickerOptionsStart: { 117 pickerOptionsStart: {
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
140 djlx: "", // 登记类型 140 djlx: "", // 登记类型
141 jcjg: "", // 检查结果 141 jcjg: "", // 检查结果
142 rkjg: "", //入库结果 142 rkjg: "", //入库结果
143 currentPage: 1, 143 currentPage: 1
144 }, 144 },
145 // 校验规则 145 // 校验规则
146 rules: { 146 rules: {
...@@ -187,27 +187,27 @@ export default { ...@@ -187,27 +187,27 @@ export default {
187 </el-button> 187 </el-button>
188 <el-button type="primary">结果</el-button> 188 <el-button type="primary">结果</el-button>
189 </div> 189 </div>
190 ); 190 )
191 }, 191 }
192 }, 192 }
193 ]), 193 ]),
194 // 表格列表数据 194 // 表格列表数据
195 total: 0, 195 total: 0,
196 data: [{}], 196 data: [],
197 }, 197 },
198 // 分页 198 // 分页
199 pageData: { 199 pageData: {
200 total: 0, 200 total: 0,
201 pageSize: 10, 201 pageSize: 10,
202 current: 1, 202 current: 1
203 }, 203 },
204 title: "", 204 title: "",
205 }; 205 };
206 }, 206 },
207 methods: { 207 methods: {
208 // 初始化数据 208 // 初始化数据
209 queryClick() { 209 queryClick () {
210 getReceiveDataReportPage({ ...this.form, ...this.pageData }).then( 210 getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
211 (res) => { 211 (res) => {
212 if (res.code === 200) { 212 if (res.code === 200) {
213 let { total, records } = res.result; 213 let { total, records } = res.result;
...@@ -215,22 +215,20 @@ export default { ...@@ -215,22 +215,20 @@ export default {
215 this.tableData.data = records ? records : []; 215 this.tableData.data = records ? records : [];
216 } 216 }
217 } 217 }
218 ); 218 )
219 }, 219 },
220 // 重置 220 // 重置
221 resetForm() { 221 resetForm () {
222 this.$refs.ruleForm.resetFields(); 222 this.$refs.ruleForm.resetFields();
223 }, 223 this.pageData.currentPage = 1
224 featchData() {
225 this.queryClick(); 224 this.queryClick();
226 }, 225 },
227 // 详情 226 featchData () {
228 handleEdit(row) { 227 this.pageData.currentPage = 1
229 this.title = row.rectypeName; 228 this.queryClick();
230 this.$refs.editLog.isShow(row); 229 }
231 }, 230 }
232 }, 231 }
233 };
234 </script> 232 </script>
235 <style scoped lang="scss"> 233 <style scoped lang="scss">
236 // 引入表单整体样式 234 // 引入表单整体样式
......