0756338e by renchao@pashanhoo.com

Merge branch 'dev'

2 parents efadb4ce 281aeab7
/*
* @Description: 不动产权证
* @Autor: renchao
* @LastEditTime: 2023-09-05 13:24:14
* @LastEditTime: 2023-09-13 16:06:55
*/
import request from '@/utils/request';
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -146,3 +146,17 @@ export function getBdcqzDetail (bsmBdcqz) {
}
})
}
/**
* @description: 根据bsmBdcqz获取权利人信息
* @param {*} bsmBdcqz
* @author: renchao
*/
export function getBdcqzQlr (bsmBdcqz) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getBdcqzQlr',
method: 'get',
params: {
bsmBdcqz: bsmBdcqz
}
})
}
......
/*
* @Description: 材料信息
* @Autor: renchao
* @LastEditTime: 2023-09-13 11:09:48
* @LastEditTime: 2023-09-13 15:56:03
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -49,9 +49,9 @@ export function saveClml (data) {
* @param {*} data
* @author: renchao
*/
export function updateClml (data, bsmSldy) {
export function updateClml (data, bsmSldy, bsmSlsq) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy,
url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy + '/' + bsmSlsq,
method: 'post',
data
})
......@@ -115,6 +115,22 @@ export function deleteClmx (bsmClmx) {
}
/**
* @description: 材料移动
* @param {*} data
* @author: renchao
*/
export function move (direction, clmxBsm) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/clxx/move',
method: 'post',
params: {
direction: direction,
clmxBsm: clmxBsm
}
})
}
/**
* @description: 材料导入
* @param {*} data
* @author: renchao
......
/*
* @Description: 企业银行接口
* @Autor: renchao
* @LastEditTime: 2023-09-12 08:35:25
* @LastEditTime: 2023-09-13 17:08:10
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -11,7 +11,6 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
* @description: 获取材料目录
* @author: renchao
*/
export function getCompanyMaterialList (bsmCompany) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/company/getCompanyMaterialList',
......@@ -97,4 +96,16 @@ export function move (bsmFile, direction) {
direction: direction
}
})
}
/**
* @description: 编辑材料目录
* @param {*} data
* @author: renchao
*/
export function editCompanyMaterialList (data, bsmCompany) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/company/editCompanyMaterialList/' + bsmCompany,
method: 'post',
data
})
}
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-11 10:01:32
* @LastEditTime: 2023-09-14 16:21:51
-->
<template>
<el-image-viewer :on-close="closeViewer" :url-list="urlList">
<el-image-viewer :on-close="closeViewer" :url-list="urlList" :initial-index="initialIndex">
</el-image-viewer>
</template>
<script>
......@@ -19,6 +19,10 @@
default: function () {
return []
}
},
initialIndex: {
type: Number,
default: 0
}
},
data () {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 09:10:29
* @LastEditTime: 2023-09-14 16:16:57
-->
<template>
<div class="rlPopup">
......@@ -53,7 +53,7 @@
<script>
import PhotoZoom from '@/components/PhotoZoom'
import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
import { uploadBatch, deleteClmx } from "@/api/clxx.js";
import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
import publicPicture from '@/components/publicPicture/index.vue'
export default {
name: 'PreviewImage',
......@@ -141,7 +141,23 @@
},
// 左右移动
handleMove (direction) {
move(direction, this.previewImg.imgList[this.previewImg.index].bsmClmx).then(res => {
if (res.code == 200) {
if (direction == 'left') {
this.previewImg.index = this.previewImg.index - 1
} else {
this.previewImg.index = this.previewImg.index + 1
}
this.initialIndex = this.previewImg.index
this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
this.$message({
message: '移动成功!',
type: 'success'
})
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 拍照
......@@ -219,6 +235,7 @@
*/
showCurrent (index) {
this.previewImg.index = index
this.initialIndex = index
},
/**
* @description: closeViewer
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 15:47:12
* @LastEditors: yangwei
* @LastEditTime: 2023-07-21 14:39:12
* @LastEditTime: 2023-09-14 15:04:20
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
* @Description:
*
......@@ -108,13 +108,15 @@ export default {
// 边框颜色
borderColor:'rgb(230, 230, 230)',
// 申请单元列表数据
unitIdList:[]
unitIdList:[],
// 组件标识
compFlag:Math.random()
};
},
mounted() {
// 根据申请单元列表数据处理选中户
console.log("window.unitData",window.unitData);
if(window.unitData.length){
if(window.unitData && window.unitData.length){
window.unitData.forEach(e => {
this.unitIdList.push(e.bdcdyid)
})
......@@ -256,24 +258,27 @@ export default {
immediate: true,
deep: true,
},
hbsmList(val){
hbsmList(val){
let list = []
val.length && val.forEach((i)=>{
this.ch.forEach((c) => {
c.hs.forEach((h) => {
if (i == h.bsm) {
list.push(
{
bdcdyh:h.bdcdyh,
bsm:h.bsm,
dyhbsm:h.dyhbsm
}
)
}
c.hs.forEach((h) => {
if (i == h.bsm) {
list.push(
{
bdcdyh:h.bdcdyh,
bsm:h.bsm,
dyhbsm:h.dyhbsm,
bdcdyid:h.dyhbsm,
bdcdylx:'7',
flag:this.compFlag
}
)
}
});
});
});
})
this.getBsmList(list)
this.getBsmList(list,this.compFlag)
},
changeChoosedObj: {
handler(val) {
......
......@@ -37,7 +37,11 @@ import chCpn from "./ch.vue";
import zdyCpn from "./zdys.vue";
import ljzsCpn from "./ljzs.vue";
import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
import jump from "../../ywbl/ywsq/components/mixin/jump";
import store from '@/store/index.js'
import { ywPopupCacel } from "@/utils/popup.js";
export default {
mixins: [jump],
provide() {
return {
openMenu: this.openMenu,
......@@ -74,6 +78,7 @@ export default {
type: Object,
default: () => { }
},
isJump: { type: Boolean, default: false },
},
data() {
return {
......@@ -111,8 +116,12 @@ export default {
* @param {Array} bsmList
* @author: renchao
*/
getBsmList(bsmList){
this.bsmList = bsmList;
getBsmList(bsmList,compFlag){
// 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
// 合并本次数据
this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
// })
},
/**
* @description: 保存当前楼盘表
......@@ -229,10 +238,7 @@ export default {
this.$message.error("请至少选择一条数据");
return;
}
this.loading = true
this.bsmList.forEach(item=>{
item['bdcdyid'] = item.dyhbsm
})
this.loading = true;
startBusinessFlow({
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bsmList,
......@@ -249,7 +255,7 @@ export default {
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
this.close()
} else {
if (res.result && res.result.length > 0) {
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
......@@ -261,6 +267,14 @@ export default {
this.loading = false
})
},
/**
* @description: close
* @param {*} val
* @author: renchao
*/
close(){
ywPopupCacel()
},
},
computed:{
lpbContentHeight(){
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 17:25:45
* @LastEditors: yangwei
* @LastEditTime: 2023-07-21 14:59:46
* @LastEditTime: 2023-09-14 14:35:19
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
* @Description:
*
......@@ -21,12 +21,14 @@
>
<!-- 逻辑幢名称 -->
<p class="lpb-xmmc ljz-xmmc">
<span>{{ljz.ljzmc}}</span>
<el-checkbox @change="zdySelectAll($event,ljz.bsm)">{{
ljz.ljzmc
}}</el-checkbox>
</p>
<!-- 独立层户 -->
<ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" />
<ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" />
<!-- 幢单元 -->
<zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
<zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
</div>
</div>
</div>
......@@ -38,11 +40,15 @@
v-else
>
<!-- 逻辑幢名称 -->
<p class="lpb-xmmc ljz-xmmc">{{ ljzarr[0].ljzmc }}</p>
<p class="lpb-xmmc ljz-xmmc">
<el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
ljzarr[0].ljzmc
}}</el-checkbox>
</p>
<!-- 独立层户 -->
<ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" />
<ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" />
<!-- 幢单元 -->
<zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
<zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
</div>
</div>
</div>
......@@ -90,7 +96,20 @@ export default {
return tempArr.filter(Boolean)
},
},
methods: {},
methods: {
/**
* @description: 逻辑幢全选
* @param {*} val
* @param {*} r
* @return {*}
*/
zdySelectAll(val,r) {
// 逻辑幢下的独立层户全选
this.$refs[r] && this.$refs[r][0].zdySelectAll(val)
// 逻辑幢下的幢单元全选
this.$refs['zdy' + r] && this.$refs['zdy' + r][0].selectAll(val)
}
},
};
</script>
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 16:29:04
* @LastEditors: yangwei
* @LastEditTime: 2023-07-21 14:55:30
* @LastEditTime: 2023-09-14 14:36:51
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
* @Description:
*
......@@ -13,10 +13,9 @@
<div v-for="zdy in realZdys" :key="zdy.bsm">
<!-- 幢单元名称 -->
<p class="lpb-xmmc">
<el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{
<el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
zdy.zdymc
}}</el-checkbox>
<span v-else>aaa{{zdy.zdymc}}</span>
</p>
<!-- 每个幢单元下的层户 -->
<ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
......@@ -58,6 +57,16 @@ export default {
zdySelectAll(val,r) {
this.$refs[r][0].zdySelectAll(val)
},
/**
* @description: 逻辑幢全选点击后逻辑幢下的幢单元全选
* @param {*} val
* @return {*}
*/
selectAll(val){
this.realZdys.forEach(i=>{
this.zdySelectAll(val,i.bsm)
})
}
},
computed: {
realZdys() {
......
......@@ -6,7 +6,7 @@
<template>
<div class="djxxTable">
<div v-show="false">
<printTemplate id="boxcfdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
<printTemplate id="boxcfdj" :tableData="tableData" :render="render"/>
</div>
<div class="tableBox">
<div class="title">
......
......@@ -12,6 +12,7 @@
style="page-break-after: always"
>
<div class="title">{{ title }}</div>
<div class="num">{{ datass.length }}页,第{{ indexx + 1 }}</div>
<table class="xxTable">
<tr v-for="item in columns" :key="item.name">
<td>
......@@ -50,18 +51,14 @@ export default {
};
},
props: {
propsParam: {
type: Object,
default: () => {},
},
tableData: {
type: Array,
default: () => [],
},
render:{
render: {
type: Boolean,
default: false,
}
default: false,
},
},
created() {},
watch: {
......@@ -70,11 +67,11 @@ export default {
this.tableData = newValue;
},
},
render: {
render: {
handler(newValue, oldValue) {
if(newValue){
if (newValue) {
this.loadData();
}
}
},
},
immediate: true,
......@@ -87,13 +84,13 @@ export default {
*/
loadData() {
getFieldListByQlxx({
qllx: this.propsParam.qllx,
qllx: this.tableData[0].qllx,
}).then((res) => {
if (res.code === 200) {
this.columns = res.result;
}
});
if (this.tableData.length&&this.datass.length==0) {
if (this.tableData.length && this.datass.length == 0) {
for (let i = 0; i < this.tableData.length; i += 4) {
this.datass.push(this.tableData.slice(i, i + 4));
}
......@@ -113,8 +110,13 @@ export default {
<style lang="scss" scoped>
.tbalede {
width: 100%;
// height: 1123px;
margin: auto;
position: relative;
.num {
position: absolute;
right: 10px;
top: 0px;
}
.title {
width: 100%;
font-weight: 700;
......@@ -140,16 +142,15 @@ export default {
padding: 5px;
}
td {
width: 20px!important;
width: 20px !important;
word-break: break-all;
// /* 方法一:使用 word-break */
// word-break: break-all;
// // /* 方法二:使用 white-space */
// // white-space: pre-wrap;
// // /* 方法三:使用 overflow-wrap */
// // overflow-wrap: break-word;
// word-break: break-all;
// // /* 方法二:使用 white-space */
// // white-space: pre-wrap;
// // /* 方法三:使用 overflow-wrap */
// // overflow-wrap: break-word;
}
}
}
</style>
......
......@@ -6,7 +6,7 @@
<template>
<div class="djxxTable">
<div v-show="false">
<printTemplate id="boxdiyaq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
<printTemplate id="boxdiyaq" :tableData="tableData" :render="render"/>
</div>
<div class="tableBox">
<div class="title">
......
......@@ -6,7 +6,7 @@
<template>
<div class="djxxTable">
<div v-show="false">
<printTemplate id="boxdiyiq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
<printTemplate id="boxdiyiq" :tableData="tableData" :render="render"/>
</div>
<div class="tableBox">
<div class="title">
......
......@@ -8,7 +8,7 @@
<div v-show="false">
<printTemplate
id="boxfdcq"
:propsParam="propsParam" :tableData="tableData" :render="render"/>
:tableData="tableData" :render="render"/>
</div>
<div class="tableBox">
<div class="title">
......
......@@ -5,10 +5,9 @@
-->
<template>
<div class="djxxTable">
<div>
<div v-show="false">
<printTemplate
id="boxfdcq"
:propsParam="propsParam"
:tableData="tableData"
:render="render"
/>
......
......@@ -8,7 +8,6 @@
<div v-show="false">
<printTemplate
id="boxjsydsyq"
:propsParam="propsParam"
:tableData="tableData"
:render="render"
/>
......
......@@ -8,7 +8,6 @@
<div v-show="false">
<printTemplate
id="boxldsyq"
:propsParam="propsParam"
:tableData="tableData"
:render="render"
/>
......
......@@ -8,7 +8,6 @@
<div v-show="false">
<printTemplate
id="boxnydsyq"
:propsParam="propsParam"
:tableData="tableData"
:render="render"
/>
......
......@@ -18,7 +18,6 @@
<div v-show="false">
<printTemplate
id="boxsllmsyq"
:propsParam="propsParam"
:tableData="tableData"
:render="render"
/>
......
......@@ -6,7 +6,7 @@
<template>
<div class="djxxTable">
<div v-show="false">
<printTemplate id="boxtdsyq" :propsParam="propsParam" :tableData="tableData" :render="render"/>
<printTemplate id="boxtdsyq" :tableData="tableData" :render="render"/>
</div>
<div class="tableBox">
<div class="title">
......
......@@ -6,7 +6,7 @@
<template>
<div class="djxxTable">
<div v-show="false">
<printTemplate id="boxygdj" :propsParam="propsParam" :tableData="tableData" :render="render"/>
<printTemplate id="boxygdj" :tableData="tableData" :render="render"/>
</div>
<div class="tableBox">
<div class="title">
......
......@@ -8,7 +8,6 @@
<div v-show="false">
<printTemplate
id="boxyydj"
:propsParam="propsParam"
:tableData="tableData"
:render="render"
/>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-14 10:53:42
-->
<template>
<div>
<div class="fieldcheck">
<div class="left">
<div class="header">
<el-checkbox
class="check"
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange">待选合集</el-checkbox>
<div class="num">/</div>
</div>
<el-checkbox-group
class="concent"
v-model="checkedCities"
@change="handleCheckedCitiesChange">
<el-checkbox
v-for="city in cities"
:label="city.name"
:key="city.name">{{ city.despriction }}({{ city.name }})</el-checkbox>
</el-checkbox-group>
</div>
<div class="right">
<el-table
class="tablelist"
:data="datalist"
ref="listTable"
:key="key"
row-key="name"
:pagination="false"
:header-cell-style="{ 'text-align': 'center' }"
:heightNumSetting="true"
:minHeight="150"
height="590"
style="width: 100%">
<el-table-column label="字段" prop="name" min-width="100">
</el-table-column>
<el-table-column
label="字段名称"
prop="desprictionor"
min-width="100">
</el-table-column>
<el-table-column label="字段别名" min-width="100">
<template slot-scope="scope">
<el-input
v-model="scope.row.despriction"
placeholder="请输入内容"
@input="sumTime(scope.$index, scope.row.tdsyqx)">
></el-input>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div class="btn">
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" @click="submitForm" plain>确定</el-button>
</div>
</div>
</template>
<script>
import Sortable from 'sortablejs'
import { getFieldList, getFieldListByQlxx, save } from "@/api/SysDjbFieldDO";
export default {
props: {
formData: {
type: Object,
default: () => { },
},
},
data () {
return {
checkAll: false,
sortable: null,
checkedCities: [],
cities: [],
datalist: [],
tablelist: [],
key: 0,
isIndeterminate: true,
};
},
mounted () {
this.generateData()
},
beforeDestroy () {
if (this.sortable) {
this.sortable.destroy();
}
},
watch: {
key: {
handler (newName, oldName) {
this.initSort()
}
}
},
methods: {
changeIndex (array, index1, index2) {
array[index1] = array.splice(index2, 1, array[index1])[0];
},
initSort () {
const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
// const sortable = new Sortable(el, options);
// 根据具体需求配置options配置项
const sortable = new Sortable(el, {
onEnd: (evt) => { // 监听拖动结束事件
console.log(this) // this是当前vue上下文
console.log(evt.oldIndex) // 当前行的被拖拽前的顺序
console.log(evt.newIndex) // 当前行的被拖拽后的顺序
// 这里就可以写我们需要传给后台的逻辑代码
// 我们有了 evt.oldIndex 和 evt.newIndex 这两个参数做索引,我们可以根据绑定在表格上面的 data 这个 Array 找到两个相应的记录。就可以针对数据进行操作啦。
// 下面将拖拽后的顺序进行修改
const currRow = this.datalist.splice(evt.oldIndex, 1)[0]
this.datalist.splice(evt.newIndex, 0, currRow)
}
})
},
/**
* @description: 初始数据集
* @author: renchao
*/
generateData () {
let that = this
getFieldList({ qllx: this.formData.qllx }).then((res) => {
if (res.code === 200) {
let listss = res.result;
listss.forEach((item, index) => {
that.cities.push({
name: item.name,
despriction: item.despriction,
desprictionor: item.despriction,
});
});
getFieldListByQlxx({ qllx: this.formData.qllx }).then((res) => {
if (res.code === 200) {
let listss = res.result;
listss.forEach((item, index) => {
that.tablelist.push({
name: item.name,
despriction: item.despriction,
desprictionor: item.despriction,
});
that.$nextTick(() => {
that.datalist = this.tablelist
that.checkedCities.push(item.name);
})
})
that.initSort()
}
});
}
});
},
handleCheckAllChange (val) {
let checkedlist = []
let orlist = []
checkedlist = val ? this.cities : [];
this.isIndeterminate = false;
console.log("this.checkedCities", this.checkedCities);
let lists = [];
this.cities.forEach((item, index) => {
checkedlist.forEach((el) => {
orlist.push(el.name)
if (item.name == el.name) {
lists.push(this.cities[index]);
}
});
});
this.checkedCities = orlist
this.datalist = lists;
// 其他排序逻辑
this.initSort()
},
handleCheckedCitiesChange (value) {
console.log("value", value, this.checkedCities);
let checkedCount = value.length;
this.checkAll = checkedCount === this.cities.length;
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.cities.length;
let lists = [];
this.cities.forEach((item, index) => {
this.checkedCities.forEach((el) => {
if (item.name == el) {
console.log("1");
lists.push(this.cities[index]);
}
});
});
this.datalist = lists;
// 其他排序逻辑
this.initSort()
},
submitForm () {
save(this.formData.bsmMb, this.datalist).then((res) => {
if (res.code == 200) {
this.$popupCacel();
this.$message({
message: "保存成功",
type: "success",
});
} else {
this.$message({
message: "保存失败",
type: "error",
});
}
});
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/dialogBoxheader.scss";
.fieldcheck {
width: 100%;
height: 650px;
display: flex;
justify-content: space-between;
.left,
.right {
width: 47%;
height: 650px;
border: 1px solid rgb(230, 230, 230);
}
.left {
.header {
width: 100%;
height: 50px;
line-height: 50px;
background-color: rgba(243, 242, 242, 0.897);
display: flex;
justify-content: space-around;
align-items:center .check {
height: 20px;
margin: auto;
}
.num {
height: 20px;
}
}
.concent {
padding: 10px;
width: 100%;
display: inline-block;
padding-left: 20px;
overflow-x: hidden;
height: 600px;
.el-checkbox {
width: 100%;
padding: 10px;
}
.el-checkbox:hover {
padding: 10px;
background-color: rgba(243, 242, 242, 0.897);
}
}
}
.right {
.header {
width: 100%;
height: 50px;
line-height: 50px;
background-color: rgba(243, 242, 242, 0.897);
}
.tablelist {
margin-top: 10px;
height: 680px;
}
}
}
.btn {
margin-top: 10px;
width: 100%;
text-align: center;
}
</style>
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-04-11 13:53:12
* @LastEditTime: 2023-09-14 10:51:36
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -61,11 +61,11 @@ class data extends filter {
},
{
label: '操作',
width: '160',
width: '130',
render: (h, scope) => {
return (
<div>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.djbdisposition(scope.row) }}>配置</el-button>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.djbdisposition(scope.row) }}>配置</el-button>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.editClick(scope.row) }}>修改</el-button>
</div>
)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-09 10:09:12
* @LastEditTime: 2023-09-14 10:02:08
-->
<template>
<div class="from-clues">
......@@ -89,8 +89,8 @@
editClick (row) {
this.$popupDialog("其他及附记模板", "system/qtjfjmb/components/editDialog", row, '60%')
},
djbdisposition(row){
this.$popupDialog("配置登记簿打印字段", "system/qtjfjmb/components/djbdisposition", row, '60%')
djbdisposition (row) {
this.$popupDialog("配置登记簿打印字段", "system/qtjfjmb/components/djbdispositions", row, '70%')
}
}
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 13:48:47
* @LastEditTime: 2023-09-13 15:58:06
-->
<template>
<div class="clmlmx-box">
......@@ -182,7 +182,7 @@
handleSubmit () {
this.loading = true
store.dispatch('user/reWorkFresh', false)
updateClml(this.tableData, this.formData.bsmSldy).then(res => {
updateClml(this.tableData, this.formData.bsmSldy, Vue.prototype.$currentRoute.query.bsmSlsq).then(res => {
this.loading = false
if (res.code == 200) {
this.$message({
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-28 12:53:50
* @LastEditTime: 2023-09-13 17:08:19
-->
<template>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
......@@ -22,7 +22,6 @@
</el-form-item>
</el-col>
</el-row>
<lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange"
:data="tableData.data"
:pagination="false"
......@@ -37,7 +36,7 @@
<el-col :span="6">
<el-form-item label="证件类型" prop="lzrzjlb">
<el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
<el-option v-for="item in zjzlData" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</el-form-item>
......@@ -63,7 +62,7 @@
import Vue from 'vue'
import store from '@/store/index.js'
import table from "@/utils/mixin/table";
import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js";
import { datas } from "../../javascript/fzxxdata";
import { log } from 'bpmn-js-token-simulation';
export default {
......@@ -78,7 +77,7 @@
mixins: [table],
data () {
return {
zjzlData: store.getters.dictData['A30'],
lzrzjlbData: store.getters.dictData['A30'],
ruleForm: {
fzrmc: '',
fzsj: '',
......@@ -134,6 +133,21 @@
this.ruleForm.fzsj = res.result.fzsj
this.ruleForm.fzsl = res.result.fzsl
this.ruleForm.bdcqzList = res.result.list;
res.result.list.length && this.getQlr(res.result.list[0].bsmBdcqz)
}
})
},
/**
* @description: 获取权利人信息
* @author: renchao
*/
getQlr (bsmBdcqz) {
getBdcqzQlr(bsmBdcqz).then(res => {
if (res.code === 200) {
this.ruleForm.lzrxm = res.result.qlrmc;
this.ruleForm.lzrzjlb = res.result.zjzl;
this.ruleForm.lzrzjh = res.result.zjh;
this.ruleForm.lzrdh = res.result.dh;
}
})
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-18 14:26:54
* @LastEditTime: 2023-09-14 16:06:51
-->
<template>
<canvas id="mxcad">
</canvas>
<div style="width:90%;height:100%;">
<canvas id="mxcad" style="width:90%;height:80%; position: relative;top:0">
</canvas>
</div>
</template>
<script>
import Mx from "mxdraw"
......@@ -18,14 +20,11 @@
Mx.MxFun.createMxObject({
canvasId: "mxcad", // canvas元素的id
cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸
// cadFile: "test2.dwg", // socket通信方式请直接提供图纸名称 如:text.dwg
callback: (mxDraw, {
canvas,
canvasParent
}) => {
// 可以拿到canvas元素和它的父级元素
console.log(canvas, canvasParent)
console.log(mxDraw)
// 拿到图层数据
mxDraw.addEvent('uiSetLayerData', (listLayer) => {
console.log(listLayer)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 13:46:03
* @LastEditTime: 2023-09-14 11:14:54
-->
<template>
<div class="clmlmx-box">
......@@ -15,10 +15,10 @@
</div>
</template>
<script>
import Vue from 'vue'
import store from '@/store/index.js'
import Sortable from 'sortablejs'
import { ywPopupCacel } from "@/utils/popup.js";
import { InitClml, updateClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { editCompanyMaterialList } from "@/api/company.js";
export default {
props: {
formData: {
......@@ -34,31 +34,11 @@
sortable: null,
column: [
{
prop: "isrequired",
label: "是否必选",
width: "80",
render: (h, scope) => {
if (scope.row.isrequired === "1") {
return (
<div>
<span>必选</span>
</div>
);
}
else {
return (
<div>
<span>可选</span>
</div>
)
}
}
},
{
label: "材料名称",
render: (h, scope) => {
return (
<el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input>
(scope.row.sfxjcl == '1') ?
<el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> : <span>{scope.row.clmc}</span>
)
}
},
......@@ -81,24 +61,6 @@
}
},
{
label: "份数",
width: "50",
render: (h, scope) => {
return (
<el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input>
)
}
},
{
label: "扫描时间",
width: "140",
render: (h, scope) => {
return (
<span>{scope.row.sjsj}</span>
)
}
},
{
label: "页数",
width: "80",
render: (h, scope) => {
......@@ -118,21 +80,6 @@
},
},
{
label: "是否新建材料",
width: "80",
render: (h, scope) => {
if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
return (
<span></span>
);
} else {
return (
<span></span>
);
}
},
},
{
label: "操作",
width: "100",
render: (h, scope) => {
......@@ -140,7 +87,7 @@
<el-button
type="text"
icon="el-icon-delete"
disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
disabled={scope.row.count != 0}
onClick={() => {
this.handleDelete(scope.$index, scope.row);
}}
......@@ -157,6 +104,7 @@
},
mounted () {
this.initSort()
this.tableData = _.cloneDeep(this.formData.data)
},
beforeDestroy () {
if (this.sortable) {
......@@ -176,79 +124,36 @@
handleCancel () {
ywPopupCacel()
},
handleAdd () {
this.tableData.push({
clmc: '',
cllx: '1',
sjsl: '',
smzt: '',
count: 0
})
},
handleSubmit () {
this.loading = true
store.dispatch('user/reWorkFresh', false)
updateClml(this.tableData).then(res => {
editCompanyMaterialList(this.tableData, this.formData.bsmCompany).then(res => {
this.loading = false
if (res.code == 200) {
this.$message({
message: '保存成功',
type: 'success'
})
this.$popupCacel()
store.dispatch('user/reWorkFresh', true)
ywPopupCacel()
}
}).catch(() => {
this.loading = false
})
},
/**
* @description: 材料目录明细初始化
* @author: renchao
*/
clmlInitList () {
return new Promise(resolve => {
this.unitData = this.$parent.unitData;
var formdata = new FormData();
formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
if (res.result && res.result.length > 0) {
this.tableData = res.result;
} else {
this.tableData = []
}
} else {
this.$message.error(res.message)
}
})
})
},
/**
* @description: 材料目录删除
* @param {*} index
* @param {*} row
* @author: renchao
*/
handleDelete (index, row) {
let that = this
this.$confirm('此操作将永久删除该 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => {
if (res.code == 200) {
let res = await that.clmlInitList()
if (res == 200) {
that.$message({
message: "删除成功",
type: "success"
})
}
}
})
this.tableData.splice(index, 1);
}).catch(() => {
this.$message({
type: 'info',
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-12 13:46:29
* @LastEditTime: 2023-09-14 16:24:07
-->
<template>
<div class="rlPopup">
......@@ -86,7 +86,7 @@
// 缩略图
thumbnailImages: [],
showViewer: false,
initialIndex: undefined,
initialIndex: 0,
allLi: [],
}
},
......@@ -152,6 +152,7 @@
} else {
this.previewImg.index = this.previewImg.index + 1
}
this.initialIndex = this.previewImg.index
this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
this.$message({
message: '移动成功!',
......@@ -238,6 +239,7 @@
*/
showCurrent (index) {
this.previewImg.index = index
this.initialIndex = index
},
/**
* @description: closeViewer
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-11 13:52:42
* @LastEditTime: 2023-09-14 14:23:19
-->
<template>
<div class="clxx">
......@@ -58,10 +58,10 @@
</template>
<script>
import store from '@/store/index.js'
import { ywPopupDialog, ywPopupCacel } from "@/utils/popup.js";
import { ywPopupDialog } from "@/utils/popup.js";
import imagePreview from "./dialog/imagePreview.vue";
import clxxAddDialog from "./dialog/clxxAddDialog.vue";
import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
import imagePreview from "./dialog/imagePreview.vue";
import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js";
export default {
components: { clxxAddDialog, imagePreview, clxxDetailDialog },
......@@ -90,8 +90,22 @@
}
}
},
computed: {
workFresh () {
return store.state.user.workFresh
}
},
watch: {
workFresh: {
handler (newValue, oldValue) {
this.clmlInitList()
},
deep: true,
immediate: true
}
},
created () {
this.clmlInitList();
this.clmlInitList()
},
methods: {
/**
......@@ -274,6 +288,7 @@
store.dispatch("user/reWorkFresh", false);
ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
data: this.tableData,
bsmCompany: this.formData.bsmCompany
}, "60%", true, false)
},
//设置tableData
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-11 11:23:49
* @LastEditTime: 2023-09-14 11:11:10
-->
<template>
<div class="from-clues">
......@@ -39,7 +39,6 @@
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import table from "@/utils/mixin/table"
import { datas, sendThis } from "./data"
import { queryQyByPage, addQy, remove } from "@/api/xxba.js";
......@@ -53,17 +52,6 @@
activated () {
this.queryClick()
},
computed: {
...mapGetters(['workFresh'])
},
watch: {
workFresh: {
handler (newVal, oldVal) {
console.log(newVal, 'newVal');
if (newVal) this.queryClick()
}
}
},
data () {
return {
queryForm: {
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-09-12 09:55:25
* @LastEditTime: 2023-09-13 14:41:34
-->
<template>
<div class="slxx">
......@@ -69,7 +69,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
<el-input maxlength="100" disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -103,18 +103,46 @@
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.fdcq1">
<el-col :span="8">
<el-col :span="8">
<el-form-item label="独用土地面积:">
<el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.dytdmj"></el-input>
<div class="flex">
<el-input
maxlength="12"
v-model="ruleForm.fdcq1.dytdmj"
:disabled="!viewEdit"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分摊土地面积:">
<el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.fttdmj"></el-input>
<div class="flex">
<el-input
maxlength="12"
v-model="ruleForm.fdcq1.fttdmj"
:disabled="!viewEdit"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房地产交易价格:">
<div class="flex">
<el-input
......@@ -298,6 +326,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
mjdw: "1",
czr: "",
ruleForm: {
flow: {
......
......@@ -69,7 +69,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input maxlength="100" v-model="ruleForm.sldy.zl" disabled></el-input>
<el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -37,7 +37,7 @@
</div>
<!-- 表格 -->
<div class="from-clues-content loadingtext">
国有房屋变更信息
预告买卖登记信息
<el-table
:data="tableData.data"
height="210"
......@@ -168,7 +168,7 @@
@current-change="handleCurrentChange"></el-pagination>
</div>
<div class="from-clues-content loadingtext">
抵押变更信息
预告抵押信息
<lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns"
:data="tableData.dataList">
</lb-table>
......@@ -185,10 +185,10 @@
import store from '@/store/index.js'
import table from "@/utils/mixin/table";
import { ywPopupDialog } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selectFwbjDybgSplitMerge.js";
import { datas, sendThis } from "../javascript/selectYgdy.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import { selectYgdj200, selectDiyaq } from "@/api/ywsq.js";
import { startBusinessFlow } from "@/api/workFlow.js";
import { selectYgdj200, selectYgdy } from "@/api/ywsq.js";
import { startTogetherFlow } from "@/api/workFlow.js";
export default {
mixins: [table, jump],
props: {
......@@ -266,7 +266,7 @@
getCurrentRow (row) {
this.radioVal = row.bdcdyh;
this.bdcdysz = [row]
selectDiyaq({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => {
selectYgdy({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => {
if (res.code === 200) {
this.tableData.dataList = res.result.records
this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList]
......@@ -305,7 +305,7 @@
*/
submitForm () {
this.loading = true
startBusinessFlow({
startTogetherFlow({
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bdcdysz,
}).then((res) => {
......
......@@ -45,6 +45,17 @@ class data extends filter {
}
},
{
label: "业务号",
width: '120',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.ywh} placement="top" popper-class="tooltip-width">
<span class="ellipsis-table"> {scope.row.ywh}</span>
</el-tooltip>
)
}
},
{
label: "权利类型",
width: '120',
render: (h, scope) => {
......
......@@ -3,6 +3,9 @@ export function queueDjywmc (djywbm, djqxbm) {
if (djqxbm == "A0320099" || djqxbm == "A0330099") {
return "selectJsydsyqSplitMerge";
}
if (djqxbm == "A37100S2") {
return "selectYgdy";
}
if (djqxbm == "DJBBL001") {
return "selectDjbbl";
}
......@@ -89,12 +92,11 @@ export function queueDjywmc (djywbm, djqxbm) {
case "B41400": //预告抵押注销
vm = "selectYgdy";
break;
case "C40100": //一并申请首次
case "C40100": //预告买卖抵押首次一并申请
vm = "selectYbsc";
break;
case "C40300": //一并申请变更
case "C40400": //一并申请注销
// vm = "selectYbbg";
case "C40300": //预告买卖变更+预告抵押变更一并申请
case "C40400": //预告买卖注销+预告抵押注销一并申请
vm = "selectYbbgSplitMerge"
break;
case "C04371": //一并国有房屋转移
......