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 60 additions and 89 deletions
......@@ -23,6 +23,7 @@ export default {
this.queryClick()
},
handleCurrentChange (val) {
console.log(val, '222222222');
this.pageData.currentPage = val
if (this.queryClick) {
this.queryClick()
......
......@@ -64,8 +64,8 @@
</el-form>
</div>
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :heightNum="340" :current-page.sync="pageData.current"
:total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange"
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
@selection-change="handleSelectionChange" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
......
......@@ -180,7 +180,7 @@ export default {
}
} catch (error) {
this.message = error
this.$refs.msg.messageShow()
// this.$refs.msg.messageShow()
}
},
async handlDatadetails (index, row) {
......
......@@ -180,7 +180,7 @@ export default {
}
} catch (error) {
this.message = error
this.$refs.msg.messageShow()
// this.$refs.msg.messageShow()
}
},
async handlDatadetails (index, row) {
......
......@@ -3,9 +3,9 @@
<div class="from-clues-header">
<el-form ref="form" :model="form" label-width="105px">
<el-row>
<el-col :span="5">
<el-col :span="5">
<el-form-item label="行政区">
<el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
<el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
<el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
</el-option>
</el-select>
......@@ -19,7 +19,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="5">
<el-form-item label="坐落">
<el-input v-model="form.YWH" placeholder="请输入坐落"></el-input>
</el-form-item>
......@@ -29,14 +29,14 @@
<el-input v-model="form.BDCDYH" placeholder="请输入不动产权证号"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" class="mt-10">
<el-col :span="5" class="mt-10">
<el-form-item label="权利人">
<el-input v-model="form.YWH" placeholder="请输入权利人"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" class="mt-10">
<el-col :span="5" class="mt-10">
<el-form-item label="登记类型">
<el-select v-model="form.pcode" class="width100" clearable placeholder="登记类型">
<el-select v-model="form.pcode" class="width100" clearable placeholder="登记类型">
<el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
</el-option>
</el-select>
......@@ -47,16 +47,16 @@
<el-input v-model="form.YWH" placeholder="请输入海岛名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight mt-10" >
<btn nativeType="cx" @click="handleSubmit">查询结果</btn>
<el-col :span="4" class="btnColRight mt-10">
<btn nativeType="cx" @click="handleSubmit">查询结果</btn>
</el-col>
</el-row>
</el-form>
</div>
<div class="from-clues-content">
<lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current"
:total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
<message-tips ref="msg" :message="message" />
</div>
......@@ -84,7 +84,6 @@ export default {
},
data () {
return {
loading: false,
form: {
YWH: '',
QLLX: '',
......@@ -102,20 +101,20 @@ export default {
{
label: "操作",
width: 170,
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
</el-button>
</div>
);
},
render: (h, scope) => {
return (
<div>
<el-button
type="primary"
onClick={() => {
this.handleEdit(scope.row);
}}
>
详情
</el-button>
</div>
);
},
},
]),
......@@ -138,7 +137,6 @@ export default {
},
async featchData () {
try {
this.loading = true
this.form = Object.assign(this.form, this.formData)
let { result: { list, total, pages: pageSize, pageNum: current }
} = await business.getQlfQlHysyqByConditon(this.form)
......@@ -152,7 +150,7 @@ export default {
this.message = error
this.$refs.msg.messageShow()
}
this.loading = false
},
async handlDatadetails (index, row) {
let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
......@@ -164,7 +162,7 @@ export default {
this.$message(message)
}
},
// 详情
// 详情
handleEdit (row) {
this.title = row.rectypeName
this.$refs.editLog.isShow(row);
......
......@@ -174,7 +174,7 @@ export default {
}
} catch (error) {
this.message = error
this.$refs.msg.messageShow()
// this.$refs.msg.messageShow()
}
},
async handlDatadetails (index, row) {
......
......@@ -77,13 +77,11 @@ import business from '@/api/business'
import dataReporting from '@/api/dataReporting'
import tableMixin from '@/mixins/tableMixin.js'
import treeSelect from '@/components/treeSelect/index.vue'
import editDialog from '@/components/dataDetails/edit-dialog.vue'
export default {
name: "ygdj",
mixins: [tableMixin],
components: {
treeSelect,
editDialog
},
data () {
return {
......@@ -131,25 +129,7 @@ export default {
current: 1,
},
diaData: null,
bsmSjsb: '',
DJLXOptions: [
{
label: '首次登记',
value: '100'
},
{
label: '转移登记',
value: '200'
},
{
label: '变更登记',
value: '300'
},
{
label: '更正登记',
value: '500'
}
],
bsmSjsb: ''
}
},
methods: {
......
......@@ -54,12 +54,9 @@
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
<message-tips ref="msg" :message="message" />
</div>
<!-- XML报文 -->
<xml-message ref="dialog" :xml="xml" />
<!-- 数据详情 -->
<edit-dialog ref="editLog" :bsmSjsb="bsmSjsb" :diaData="diaData" />
<!-- 编辑 -->
<dataDetails ref="editLog" :title="title" />
</div>
</template>
......@@ -70,13 +67,11 @@ import business from '@/api/business'
import dataReporting from '@/api/dataReporting'
import tableMixin from '@/mixins/tableMixin.js'
import treeSelect from '@/components/treeSelect/index.vue'
import editDialog from '@/components/dataDetails/edit-dialog.vue'
export default {
name: "yydj",
mixins: [tableMixin],
components: {
treeSelect,
editDialog
treeSelect
},
data () {
return {
......@@ -105,15 +100,14 @@ export default {
<el-button
type="primary"
size="mini"
onClick={() => { this.handledetails(scope.$index, scope.row) }}
onClick={() => { this.handleEdit(scope.row) }}
>
数据详情
详情
</el-button>
</div>
);
},
},
)
}
}
]),
data: []
},
......
......@@ -111,7 +111,7 @@ export default {
components: {
dataDetails,
},
data() {
data () {
return {
// 开始结束日期限制
pickerOptionsStart: {
......@@ -140,7 +140,7 @@ export default {
djlx: "", // 登记类型
jcjg: "", // 检查结果
rkjg: "", //入库结果
currentPage: 1,
currentPage: 1
},
// 校验规则
rules: {
......@@ -187,27 +187,27 @@ export default {
</el-button>
<el-button type="primary">结果</el-button>
</div>
);
},
},
)
}
}
]),
// 表格列表数据
total: 0,
data: [{}],
data: [],
},
// 分页
pageData: {
total: 0,
pageSize: 10,
current: 1,
current: 1
},
title: "",
};
},
methods: {
// 初始化数据
queryClick() {
getReceiveDataReportPage({ ...this.form, ...this.pageData }).then(
queryClick () {
getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
(res) => {
if (res.code === 200) {
let { total, records } = res.result;
......@@ -215,22 +215,20 @@ export default {
this.tableData.data = records ? records : [];
}
}
);
)
},
// 重置
resetForm() {
resetForm () {
this.$refs.ruleForm.resetFields();
},
featchData() {
this.pageData.currentPage = 1
this.queryClick();
},
// 详情
handleEdit(row) {
this.title = row.rectypeName;
this.$refs.editLog.isShow(row);
},
},
};
featchData () {
this.pageData.currentPage = 1
this.queryClick();
}
}
}
</script>
<style scoped lang="scss">
// 引入表单整体样式
......