Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
66f57e60 by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents bcf4fcfe 90618714
Inline Side-by-side
Showing 10 changed files with 77 additions and 116 deletions
......@@ -26,7 +26,7 @@
</tr>
<tr>
<td style="width:15%">宗地面积</td>
<td style="width:30%">{{ zdjbxx.zdmj }}</td>
<td style="width:30%">{{ zdjbxx.zdmj }}m²</td>
<td style="width:15%">用途</td>
<td style="width:30%">{{ zdjbxx.ghytmc }}</td>
</tr>
......@@ -193,11 +193,11 @@
},
methods: {
loadData () {
console.log("this.$attrs",this.$attrs);
console.log("this.propsParam",this.propsParam);
if(this.propsParam.bsmSldy){
console.log("this.$attrs", this.$attrs);
console.log("this.propsParam", this.propsParam);
if (this.propsParam.bsmSldy) {
console.log("宗地基本信息");
}else{
} else {
console.log("登记簿里宗地基本信息");
getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
if (res.code === 200) {
......
......@@ -26,7 +26,7 @@
</tr>
<tr>
<td style="width:15%">宗地面积</td>
<td style="width:30%">{{ zdjbxx.zdmj }}</td>
<td style="width:30%">{{ zdjbxx.zdmj }}m²</td>
<td style="width:15%">用途</td>
<td style="width:30%">{{ zdjbxx.ghytmc }}</td>
</tr>
......
......@@ -42,7 +42,7 @@
</template>
<script>
import { mapGetters } from "vuex";
import clxxAddDialog from "./dialog/clxxAddDialog.vue";
import clxxAddDialog from "../dialog/clxxAddDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
export default {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:38
* @LastEditTime: 2023-06-19 13:15:13
-->
<template>
<div class="clxx">
......@@ -24,18 +24,17 @@
</div>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
</div>
<image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
<clxxAddDialog v-model="isDialog" />
<!-- <clxxDetailDialog v-model="detailDialog" :data="tableData" /> -->
</div>
</template>
<script>
import { mapGetters } from "vuex";
import clxxAddDialog from "./dialog/clxxAddDialog.vue";
import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
import clxxAddDialog from "../dialog/clxxAddDialog.vue";
import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { popupDialog } from "@/utils/popup.js";
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-07 13:32:24
* @LastEditTime: 2023-06-19 13:16:53
*/
//流程环节操作按钮
export function getForm (tabName, djywbm) {
......@@ -42,7 +42,7 @@ export function getForm (tabName, djywbm) {
form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
break;
case "clxx":
form = require("@/views/workflow/components/clxxUnify.vue");
form = require("@/views/workflow/components/clxx/clxxUnify.vue");
break;
case "spyj":
form = require("@/views/workflow/components/spyj.vue");
......
......@@ -6,8 +6,7 @@
:model="queryForm"
ref="queryForm"
@submit.native.prevent
label-width="80px"
>
label-width="80px">
<el-row>
<el-col :span="5">
<el-form-item label="业务来源" label-width="70px">
......@@ -18,14 +17,12 @@
class="width100"
filterable
clearable
placeholder="请选择业务来源"
>
placeholder="请选择业务来源">
<el-option
v-for="item in dictData['ywly']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
......@@ -39,14 +36,12 @@
class="width100"
filterable
clearable
placeholder="请选择权利类型"
>
placeholder="请选择权利类型">
<el-option
v-for="item in dictData['A8']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
......@@ -60,14 +55,12 @@
class="width100"
filterable
clearable
placeholder="请选择登记类型"
>
placeholder="请选择登记类型">
<el-option
v-for="item in dictData['A21']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
......@@ -78,17 +71,14 @@
placeholder="请输入业务号"
v-model="queryForm.ywh"
clearable
class="width200px"
>
class="width200px">
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch"
>查询</el-button
>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
<el-button @click="moreQueryClick">高级查询</el-button>
</el-form-item>
</el-col>
......@@ -100,16 +90,14 @@
{{ item.name }}:{{ item.value }}
<i
class="el-icon-circle-close"
@click="handelItem(item, index)"
></i>
@click="handelItem(item, index)"></i>
</li>
</ul>
<el-button
class="clean-btn"
type="text"
v-if="searchList.length > 0"
@click.native="hanldeCleanAll"
>清除全部
@click.native="hanldeCleanAll">清除全部
</el-button>
</el-row>
</el-form>
......@@ -126,25 +114,24 @@
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
:column="tableData.columns"
:data="tableData.data"
>
:data="tableData.data">
</lb-table>
</div>
<searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
</div>
</template>
<script>
import { mapGetters } from "vuex";
import searchMin from "../components/mixin/index";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./ybxdata";
import { searchTaskDone } from "@/api/ywbl";
import searchBox from "../components/search.vue";
export default {
import { mapGetters } from "vuex";
import searchMin from "../components/mixin/index";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./ybxdata";
import { searchTaskDone } from "@/api/ywbl";
import searchBox from "../components/search.vue";
export default {
name: "ybx",
components: { searchBox },
mixins: [table, searchMin],
mounted() {
mounted () {
window["getBpageList"] = () => {
this.queryClick();
};
......@@ -153,7 +140,7 @@ export default {
computed: {
...mapGetters(["dictData"]),
},
data() {
data () {
return {
queryForm: {
ywly: "",
......@@ -176,7 +163,7 @@ export default {
},
methods: {
// 列表渲染接口
queryClick() {
queryClick () {
this.$startLoading();
this.searchForm.ywh = this.queryForm.ywh;
this.iterationData();
......@@ -199,12 +186,12 @@ export default {
}
});
},
handleSort(val) {
handleSort (val) {
this.queryForm.sortField = val.prop;
this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
this.queryClick();
},
ywhClick(item) {
ywhClick (item) {
const { href } = this.$router.resolve(
"/workFrameView?bsmSlsq=" +
item.bsmSlsq +
......@@ -216,8 +203,8 @@ export default {
window.open(href, `urlname${item.bsmSlsq}`);
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
......@@ -102,11 +102,6 @@
djlx: "",
ywh: "",
},
// pageData: {
// currentPage: 1,
// pageSize: 10,
// total: 0,
// },
tableData: {
total: 0,
columns: datas.columns(),
......@@ -122,24 +117,6 @@
this.$endLoading()
if (res.code === 200) {
let { total, records } = res.result
// let str = ''
// records.forEach(item => {
// if (item.userNameList.length != 0) {
// str = String(item.userNameList)
// item.blStatus = item.zbhj + '(' + str.replace(/,/g, "+") + ')'
// }
// if (item.qlrmc.length != 0) {
// item.qlrmcStr = String(item.qlrmc)
// }
// if (item.ywrmc.length != 0) {
// item.ywrmcStr = String(item.ywrmc)
// }
// if (item.zlList.length != 0) {
// item.zlStr = String(item.zlList)
// }
// })
// this.pageData.total = total;
// this.tableData.data = records
this.tableData.total = total ? total : 0;
this.tableData.data = records ? records : [];
}
......@@ -148,10 +125,10 @@
handleSort (name, sort) {
console.log(name, sort);
},
moreQueryClick () { },
openDialog (item) {
const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
// window.open(href, '_blank');
window.open(href, `urlname${item.bsmSlsq}`);
window.open(href, `urlname${item.bsmSlsq}`)
}
}
}
......
......@@ -48,10 +48,10 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./lpcxdata";
import { getLpZrz } from "@/api/lpb.js";
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./lpcxdata";
import { getLpZrz } from "@/api/lpb.js";
export default {
name: "lpcx",
components: {},
mixins: [table],
......@@ -66,16 +66,12 @@ export default {
zddm: "",
zrzh: "",
},
pageData: {
currentPage: 1,
pageSize: 10,
total: 0,
},
tableData: {
total: 0,
columns: datas.columns(),
data: [],
},
};
}
}
},
methods: {
// 初始化数据
......@@ -84,7 +80,7 @@ export default {
getLpZrz({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
this.pageData.total = res.result.total;
this.tableData.total = total ? total : 0;
this.tableData.data = res.result.records;
}
});
......@@ -92,9 +88,9 @@ export default {
handleSort (name, sort) {
console.log(name, sort);
},
moreQueryClick () { },
//打开楼盘表
openlpbClick (scope) {
// var zrzbsm = scope.row.bsm;
this.$popup('楼盘表', 'lpb/index', {
width: '90%',
height: "92%",
......@@ -102,10 +98,10 @@ export default {
bsm: scope.row.bsm
}
})
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
......@@ -40,22 +40,19 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
<lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current" :total="tableData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
</div>
<!-- <el-dialog :visible.sync="dialogVisible" width="52%" :before-close="handleClose">
</el-dialog> -->
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zslqcx";
import { getBdcqzReceiveList } from "@/api/zhcx"
import { bdcqzPreview } from "@/api/bdcqz"
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zslqcx";
import { getBdcqzReceiveList } from "@/api/zhcx"
import { bdcqzPreview } from "@/api/bdcqz"
export default {
components: {},
mixins: [table],
mounted () {
......@@ -103,8 +100,8 @@ export default {
this.dialogVisible = false;
}
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-19 13:32:04
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
......@@ -33,7 +38,7 @@
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
<lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current" :total="tableData.total"
@size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
:data="tableData.data">
</lb-table>
......@@ -41,10 +46,10 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zxgcdycx";
import { getZjgcdyList } from "@/api/zhcx"
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zxgcdycx";
import { getZjgcdyList } from "@/api/zhcx"
export default {
components: {},
mixins: [table],
mounted () {
......@@ -72,15 +77,15 @@ export default {
this.$endLoading()
if (res.code === 200) {
let { total, records } = res.result
this.tableData.total = total;
this.tableData.total = total ? total : 0
this.tableData.data = records ? records : []
}
})
},
},
};
moreQueryClick () { }
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......