Skip to content

bdc / bdcdj-web

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

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

2 parents 889bde25 5e8cee37
Inline Side-by-side
Showing 9 changed files with 58 additions and 91 deletions
/*
* @Description: 材料信息
* @Autor: renchao
* @LastEditTime: 2023-09-13 15:39:37
* @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
})
......
/*
* @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-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-07-18 14:26:54
* @LastEditTime: 2023-09-13 16:16:08
-->
<template>
<canvas id="mxcad">
</canvas>
<div>
<canvas id="mxcad" style="width:100%;height:100%">
</canvas>
</div>
</template>
<script>
import Mx from "mxdraw"
......@@ -31,7 +33,7 @@
console.log(listLayer)
})
},
isNewFile: true // 是否新建文件
isNewFile: false // 是否新建文件
})
})
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 13:46:03
* @LastEditTime: 2023-09-13 17:08:53
-->
<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: {
......@@ -58,7 +58,8 @@
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 +82,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) => {
......@@ -157,6 +140,8 @@
},
mounted () {
this.initSort()
this.tableData = _.cloneDeep(this.formData.data)
console.log(this.formData.bsmCompany);
},
beforeDestroy () {
if (this.sortable) {
......@@ -176,26 +161,17 @@
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()
ywPopupCacel()
store.dispatch('user/reWorkFresh', true)
}
}).catch(() => {
......@@ -203,29 +179,6 @@
})
},
/**
* @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
......@@ -238,17 +191,7 @@
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-11 13:52:42
* @LastEditTime: 2023-09-13 17:05:49
-->
<template>
<div class="clxx">
......@@ -91,7 +91,7 @@
}
},
created () {
this.clmlInitList();
this.clmlInitList()
},
methods: {
/**
......@@ -274,6 +274,7 @@
store.dispatch("user/reWorkFresh", false);
ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
data: this.tableData,
bsmCompany: this.formData.bsmCompany
}, "60%", true, false)
},
//设置tableData
......
......@@ -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) => {
......
......@@ -89,12 +89,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": //一并国有房屋转移
......