Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
ca78c913 by yangwei
Options

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

2 parents 5389708c 3edaaf1d
Inline Side-by-side
Showing 15 changed files with 234 additions and 144 deletions
/*
* @Description: 材料信息
* @Autor: renchao
* @LastEditTime: 2023-09-13 11:09:48
* @LastEditTime: 2023-09-13 15:39:37
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -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-13 09:10:29
* @LastEditTime: 2023-09-13 15:36:42
-->
<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,22 @@
},
// 左右移动
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.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
this.$message({
message: '移动成功!',
type: 'success'
})
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 拍照
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 11:10:27
* @LastEditTime: 2023-09-13 13:48:47
-->
<template>
<div class="clmlmx-box">
......@@ -58,7 +58,7 @@
label: "材料名称",
render: (h, scope) => {
return (
(this.formData.ableOperation && scope.row.isrequired != '1') ?
(this.formData.ableOperation && scope.row.sfxjcl == '1') ?
<el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
)
}
......@@ -143,7 +143,6 @@
width: "100",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
icon="el-icon-delete"
......@@ -154,8 +153,6 @@
>
删除
</el-button>
</div >
)
}
}
......
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-09-12 13:29:54
* @LastEditTime: 2023-09-13 14:21:14
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -104,7 +104,7 @@
that.currentSelectProps = res.result[0];
that.$emit('getCurrentSelectProps', this.currentSelectProps);
that.judgeBatchShow();
if (sessionStorage.getItem('keyPath')) {
if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
that.unitClick(0)
......@@ -123,7 +123,7 @@
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.judgeBatchShow();
if (sessionStorage.getItem('keyPath')) {
if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
that.unitClick(sessionStorage.getItem('keyPath') - 0)
} else {
that.unitClick(0)
......@@ -208,6 +208,7 @@
this.currentSelectProps.batchOperation = true;
this.activeIndex = "-1";
this.$parent.stepForm(0);
sessionStorage.setItem('keyPath', this.activeIndex);
},
/**
* @description: 批量操作
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-12 16:39:53
* @LastEditTime: 2023-09-13 13:57:48
-->
<template>
<div class="container">
......@@ -258,6 +258,9 @@
} else {
this.tabName = res.result[0].value;
}
if (sessionStorage.getItem('activeName') == this.tabName) {
this.fresh++;
}
this.ableOperation = this.tabList[0].ableOperation;
//批量操作无分屏按钮
if (index != null) {
......@@ -298,7 +301,6 @@
true
);
},
//选项卡切换事件
/**
* @description: 右侧表单选项卡事件
* @param {*} handleClick
......@@ -311,8 +313,8 @@
if (p) {
this.ableOperation = this.tabList[a.index].ableOperation;
}
},
},
}
}
};
</script>
<style scoped lang="scss">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 09:18:13
* @LastEditTime: 2023-09-13 13:46:03
-->
<template>
<div class="clmlmx-box">
<lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="500" :pagination="false" :data="tableData">
<lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false"
:data="tableData">
</lb-table>
<div class="text-center">
<el-button @click="handleCancel">取消</el-button>
......@@ -30,24 +31,28 @@
data () {
return {
loading: false,
sortable: null,
column: [
{
width: '50',
renderHeader: (h, scope) => {
return <div> {
<i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
}
</div>
},
prop: "isrequired",
label: "是否必选",
width: "80",
render: (h, scope) => {
if (scope.row.isrequired === "1") {
return (
<div>
{
<i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i>
<span>必选</span>
</div>
);
}
else {
return (
<div>
<span>可选</span>
</div>
)
}
}
},
{
label: "材料名称",
......@@ -85,6 +90,15 @@
}
},
{
label: "扫描时间",
width: "140",
render: (h, scope) => {
return (
<span>{scope.row.sjsj}</span>
)
}
},
{
label: "页数",
width: "80",
render: (h, scope) => {
......@@ -104,30 +118,35 @@
},
},
{
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) => {
return (
<div>
<el-button
type="text"
disabled={scope.$index == 0}
icon="el-icon-delete"
disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
onClick={() => {
this.moveUpward(scope.$index, scope.row);
this.handleDelete(scope.$index, scope.row);
}}
>
上移
删除
</el-button>
<el-button
type="text"
disabled={scope.$index + 1 == this.tableData.length}
onClick={() => {
this.moveDown(scope.$index, scope.row);
}}
>
下移
</el-button>
</div >
)
}
}
......@@ -136,6 +155,14 @@
tableData: []
}
},
mounted () {
this.initSort()
},
beforeDestroy () {
if (this.sortable) {
this.sortable.destroy();
}
},
watch: {
'formData.data': {
handler: function (val, oldVal) {
......@@ -160,6 +187,7 @@
},
handleSubmit () {
this.loading = true
store.dispatch('user/reWorkFresh', false)
updateClml(this.tableData).then(res => {
this.loading = false
if (res.code == 200) {
......@@ -198,60 +226,6 @@
})
},
/**
* @description: 上移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveUpward (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "UP",
};
// 接口待调
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '上移成功',
type: 'success'
})
}
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 下移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveDown (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "DOWN",
}
// 接口待调
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '下移成功',
type: 'success'
})
}
} else {
this.$message.error(res.message);
}
})
},
/**
* @description: 材料目录删除
* @param {*} index
* @param {*} row
......@@ -281,6 +255,19 @@
message: '已取消删除'
})
})
},
initSort () {
const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
this.sortable = Sortable.create(el, {
ghostClass: 'sortable-ghost',
setData: function (dataTransfer) {
dataTransfer.setData('Text', '')
},
onEnd: evt => {
const targetRow = this.tableData.splice(evt.oldIndex, 1)[0];
this.tableData.splice(evt.newIndex, 0, targetRow);
}
})
}
}
}
......
<!--
* @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>
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-09-12 09:56:07
* @LastEditTime: 2023-09-13 14:16:46
-->
<template>
<div class="slxx">
......@@ -410,9 +410,19 @@
* @author: renchao
*/
upDateQlrxxList (val) {
if (!_.isEqual(val, this.ruleForm.qlrList)) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
}
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
this.num++
}
})
if (this.num == 0) {
this.czr = ''
}
},
// 更新权利人信息
/**
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-17 14:14:53
* @LastEditTime: 2023-09-13 14:17:15
-->
<template>
<div class="slxx">
......@@ -336,11 +336,20 @@
* @author: renchao
*/
upDateQlrxxList (val) {
if (!_.isEqual(val, this.ruleForm.qlrList)) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
}
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
this.num++
}
})
if (this.num == 0) {
this.czr = ''
}
},
// 是否持证人变化
/**
* @description: 是否持证人变化
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-17 13:38:12
* @LastEditTime: 2023-09-13 14:05:26
-->
<template>
<!-- 受理信息 -->
......@@ -10,6 +10,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
v-Loading="loading"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px">
......@@ -243,11 +244,13 @@
export default {
mixins: [ywmix],
mounted () {
this.loading = true
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
Init(formdata).then((res) => {
this.loading = false
if (res.code === 200 && res.result) {
this.ruleForm = {
...res.result,
......@@ -262,7 +265,9 @@
});
this.czrOptions = this.ruleForm.qlrList;
}
});
}).catch(() => {
this.loading = false
})
},
components: { qlrCommonTable, tdytTable },
computed: {
......@@ -270,6 +275,7 @@
},
data () {
return {
loading: false,
//表单是否可操作
viewEdit: false,
disabled: true,
......@@ -314,7 +320,6 @@
};
},
methods: {
// 更新土地用途信息
/**
* @description: 更新土地用途信息
* @param {*} val
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-11 16:28:26
* @LastEditTime: 2023-09-13 14:06:17
-->
<template>
<!-- 受理信息 -->
......@@ -10,7 +10,7 @@
:model="ruleForm"
:rules="rules"
:class="{ readonly: editDisabled }"
class="loadingtext"
v-Loading="loading"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -252,14 +252,14 @@
this.propsParam = this.$attrs;
var formdata = new FormData();
let that = this;
this.$startLoading();
this.loading = true
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
this.loading = false
this.$nextTick(() => {
that.ruleForm = res.result;
that.$endLoading();
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
......@@ -267,9 +267,11 @@
this.czr = item.zjh
console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr);
}
});
});
});
})
})
}).catch(() => {
this.loading = false
})
},
components: { qlrCommonTable, tdytTable, ywrCommonTable },
computed: {
......@@ -285,6 +287,7 @@
},
data () {
return {
loading: false,
mjdw: "1",
//表单是否可操作
viewEdit: true,
......
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-22 16:25:54
* @LastEditTime: 2023-09-13 14:17:49
-->
<template>
<!-- 受理信息 -->
......@@ -286,9 +286,19 @@
* @author: renchao
*/
upDateQlrxxList (val) {
if (!_.isEqual(val, this.ruleForm.qlrList)) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
}
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
this.num++
}
})
if (this.num == 0) {
this.czr = ''
}
},
// 是否持证人变化
/**
......
......@@ -4,7 +4,7 @@
<el-form
:model="ruleForm"
:rules="rules"
class="loadingtext"
v-Loading="loading"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -324,21 +324,23 @@
mounted () {
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
this.$startLoading();
this.loading = true
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
this.loading = false
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.czr = item.zjh
}
});
this.$endLoading();
});
})
}).catch(() => {
this.loading = false
})
},
components: { qlrCommonTable, JtcyTable },
computed: {
......@@ -346,6 +348,7 @@
},
data () {
return {
loading: false,
disabled: true,
//持证人选项
czrOptions: [],
......@@ -446,10 +449,20 @@
* @author: renchao
*/
upDateQlrxxList (val) {
if (!_.isEqual(val, this.ruleForm.qlrList)) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
}
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
this.num++
}
})
if (this.num == 0) {
this.czr = ''
}
},
// 是否持证人变化
/**
* @description: 是否持证人变化
* @param {*} val
......
......@@ -2,7 +2,7 @@
<!-- 受理信息 -->
<div class="slxx">
<el-form
class="loadingtext"
v-Loading="loading"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="140px">
......@@ -211,8 +211,8 @@
v-model="ruleForm.sldyList[0].sqfbcz"
:disabled="!viewEdit"
@input="updaterow()">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
......@@ -229,9 +229,9 @@
:disabled="!viewEdit">
<el-option
v-for="item in czrOptions"
:key="item.value"
:label="item.label"
:value="item.value">
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh">
</el-option>
</el-select>
</el-form-item>
......@@ -303,12 +303,12 @@
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
this.loading = true
formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
bacthInit(formdata).then((res) => {
this.$endLoading();
this.loading = false
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
......@@ -316,11 +316,13 @@
if (item.sfczr == 1) {
this.czr = item.zjh
}
});
})
} else {
this.$message.error(res.message);
this.$message.error(res.message)
}
});
}).catch(() => {
this.loading = false
})
},
components: { qlrCommonTable, qjhTable },
computed: {
......@@ -328,6 +330,7 @@
},
data () {
return {
loading: false,
//表单是否可操作
viewEdit: true,
disabled: true,
......@@ -355,7 +358,7 @@
});
return false;
}
if (ruleForm.sldyList[0].gyfs == "0") {
if (this.ruleForm.sldyList[0].gyfs == "0") {
if (this.ruleForm.qlrList.length > 1) {
this.$message({
showClose: true,
......@@ -379,8 +382,8 @@
if (this.ruleForm.sldyList[0].sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
item.sfczr = "1";
});
item.sfczr = "1"
})
} else {
if (!that.czr) {
that.$message({
......@@ -416,7 +419,6 @@
}
});
},
// 是否持证人变化
/**
* @description: 是否持证人变化
* @param {*} val
......@@ -435,6 +437,15 @@
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
}
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
this.num++
}
})
if (this.num == 0) {
this.czr = ''
}
},
/**
* @description: 更新义务人信息
......@@ -445,9 +456,9 @@
if (!_.isEqual(val, this.ruleForm.ywrList)) {
this.ruleForm.ywrList = _.cloneDeep(val);
}
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
......@@ -4,7 +4,7 @@
<el-form
:model="ruleForm"
:rules="rules"
class="loadingtext"
v-Loading="loading"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -331,11 +331,12 @@
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
this.loading = true
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
this.loading = false
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
......@@ -343,10 +344,11 @@
if (item.sfczr == 1) {
this.czr = item.zjh
}
});
this.$endLoading();
})
}
});
}).catch(() => {
this.loading = false
})
},
components: { qlrCommonTable },
computed: {
......@@ -354,6 +356,7 @@
},
data () {
return {
loading: false,
//表单是否可操作
viewEdit: true,
disabled: true,
......@@ -453,7 +456,6 @@
}
});
},
/**
* @description: 更新权利人信息
* @param {*} val
......@@ -464,6 +466,15 @@
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
}
this.num = 0
this.ruleForm.qlrList.forEach(item => {
if (item.zjh == this.czr) {
this.num++
}
})
if (this.num == 0) {
this.czr = ''
}
},
// 是否持证人变化
/**
......