36d104a2 by 单帅旗

Merge remote-tracking branch 'origin/dev' into dev

2 parents 5decaa34 99463226
......@@ -135,10 +135,22 @@ export function getZtQlxx (params) {
* @author: renchao
*/
export function getShList (data) {
console.log(data);
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/getShList?bsmRepair='+data.bsmRepair,
method: 'post',
data
})
}
/**
* @description:初始化内容
* @param {*} data
* @author: renchao
*/
export function getQlxxByQlxxBsm (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/getQlxxByQlxxBsm',
method: 'get',
params
})
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-25 16:08:30
* @LastEditTime: 2023-08-03 14:50:08
-->
<template>
<transition name="msgbox-fade">
......@@ -136,7 +136,6 @@
}
.ls-mask-window {
background: white;
position: relative;
left: 50%;
top: 50%;
......@@ -162,6 +161,7 @@
}
.mask-content {
background: #ffffff;
padding: 20px;
width: 100%;
min-height: 30%;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-28 09:34:54
-->
<template>
<div class="clmlmx-box">
<div class="title">申请材料目录</div>
<lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
</lb-table>
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
</div>
</div>
</template>
<script>
import store from '@/store/index.js'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
export default {
props: {
formData: {
type: Object,
default: () => {
return {}
}
}
},
data () {
return {
column: [
{
width: "50",
label: '序号',
type: 'index'
},
{
prop: "isrequired",
label: "是否必选",
width: "80",
render: (h, scope) => {
if (scope.row.sfxjcl === "1") {
return (
<div>
<span>可选</span>
</div>
);
}
else {
return (
<div>
<span>必选</span>
</div>
);
}
},
},
{
prop: "sjmc",
label: "材料名称",
},
{
prop: "sjlx",
label: "材料类型",
width: "80",
render: (h, scope) => {
return (
<div>
<span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
</div>
);
},
},
{
prop: "sjsl",
label: "份数",
width: "50"
},
{
prop: "smzt",
label: "扫描状态",
width: "80",
render: (h, scope) => {
if (scope.row.children && scope.row.children.length > 0) {
return (
<div>
<span>已扫描</span>
</div>
);
} else {
return (
<div>
<span>未扫描</span>
</div>
);
}
},
},
{
label: "扫描页数",
width: "80",
render: (h, scope) => {
if (scope.row.children && scope.row.children.length > 0) {
return (
<div>
<span>{scope.row.children.length}</span>
</div>
);
} else {
return (
<div>
<span>0</span>
</div>
);
}
},
},
{
label: "操作",
width: "80",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
disabled={scope.$index == 0}
onClick={() => {
this.moveUpward(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>
);
},
},
],
key: 0,
tableData: []
}
},
created () {
console.log(this.formData.data, 'formData');
},
methods: {
// 材料目录明细初始化
/**
* @description: 材料目录明细初始化
* @author: renchao
*/
clmlInitList () {
return new Promise(resolve => {
this.unitData = this.$parent.unitData;
var formdata = new FormData();
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
formdata.append("clfl", 2);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
if (res.result && res.result.length > 0) {
this.data = res.result;
} else {
this.data = []
}
} else {
this.$message.error(res.message)
}
})
})
},
// 上移
/**
* @description: 上移
* @param {*} index
* @param {*} row
* @author: renchao
*/
moveUpward (index, row) {
let obj = {
xh: row.xh,
bsmSlsq: row.bsmSlsq,
moveDirection: "UP",
};
// 接口待调
/**
* @description: 接口待调
* @param {*} obj
* @author: renchao
*/
moveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList()
if (res == 200) {
this.$message({
message: '上移成功',
type: 'success'
})
this.$parent.setTableData(this.data)
}
} 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",
}
// 接口待调
/**
* @description: 接口待调
* @param {*} obj
* @author: renchao
*/
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
*/
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.$parent.setTableData(this.data)
}
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
// 字典
/**
* @description: 字典
* @param {*} val
* @param {*} code
* @author: renchao
*/
dicStatus (val, code) {
let data = store.getters.dictData[code],
name = "暂无";
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname;
}
});
return name;
}
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/mixin.scss";
.clmlmx-box {
margin: 0 auto;
.title {
text-align: center;
height: 60px;
line-height: 60px;
border: 1px solid #dfe6ec;
font-size: 20px;
background: #81d3f81a;
margin-bottom: -1px;
}
}
</style>
export function deleteCollectBiz (bsmSqyw) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
method: 'post'
})
}
......@@ -71,7 +71,7 @@
</el-col>
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息:">
<el-form-item label="上手权利信息:" prop="ssQlxx.bdcqzh" :rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
......@@ -433,7 +433,7 @@
<script>
import { mapGetters } from "vuex";
import ywmix from "@/views/ywbl/mixin/index"
import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbRepair.js";
import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm,save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
......@@ -510,6 +510,9 @@
ableOperation: false,
//传递参数\
rules: {
ssQlxxrules: [
{ required: true, message: "上手权利信息", trigger: "blur" },
],
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "blur" },
],
......@@ -546,7 +549,65 @@
ssQlxxchange (val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog (val)
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了",this.ruleForm)
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
type: "warning",
}).then(() => {
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.dyiq) {
if (
this.ruleForm.dyiq[key] == "" ||
this.ruleForm.dyiq[key] == null
) {
this.ruleForm.dyiq[key] = this.nowlist.dyiq[key];
}
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
this.ruleForm.tdytqxList = this.nowlist.tdytqxList;
}
if (!this.ruleForm.qlrData.length) {
this.ruleForm.qlrData = this.nowlist.qlrData;
}
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
});
}
});
}).catch(() => {
this.$message({
type: "info",
message: "已取消同步",
});
});
},
/**
* @description: djlxchange
* @param {*} val
......@@ -576,24 +637,29 @@
}
this.$endLoading();
this.isShow = true;
}
});
//获取主体信息
getSsQlxx({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
}).then((res) => {
if (res.code == 200) {
this.ssQlxxList = res.result;
}
});
//获取上手信息
getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
if (res.code == 200) {
this.ztQlxxList = res.result;
}
});
},
//获取主体信息
getSsQlxx({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
}).then((res) => {
if (res.code == 200) {
this.ssQlxxList = res.result;
}
});
//获取上手信息
getZtQlxx({
bdcdyid: this.propsParam.bdcdyid,
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
}).then((res) => {
if (res.code == 200) {
this.ztQlxxList = res.result;
}
});
}
});
},
// 更新土地用途信息
/**
* @description: 更新土地用途信息
......
......@@ -97,6 +97,8 @@ export default {
yjsqOptions: {
handler(val) {
console.log("val", val);
console.log("this.tableData[this.currentindex]",this.tableData[this.currentindex]);
this.add(val);
},
deep: true,
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-28 15:46:24
* @LastEditTime: 2023-08-03 14:13:59
-->
<template>
<div class="szxx">
......@@ -202,10 +202,9 @@
width: 300px;
margin-top: 10px;
margin-right: 10px;
.szxx_body {
height: 240px;
}
// .szxx_body {
// height: 240px;
// }
}
}
......