bac1a803 by xiaomiao

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

2 parents 5c9211a4 a1ee1ead
1 /* 1 /*
2 * @Description: 不动产权证 2 * @Description: 不动产权证
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-05 13:24:14 4 * @LastEditTime: 2023-09-13 16:06:55
5 */ 5 */
6 import request from '@/utils/request'; 6 import request from '@/utils/request';
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -146,3 +146,17 @@ export function getBdcqzDetail (bsmBdcqz) { ...@@ -146,3 +146,17 @@ export function getBdcqzDetail (bsmBdcqz) {
146 } 146 }
147 }) 147 })
148 } 148 }
149 /**
150 * @description: 根据bsmBdcqz获取权利人信息
151 * @param {*} bsmBdcqz
152 * @author: renchao
153 */
154 export function getBdcqzQlr (bsmBdcqz) {
155 return request({
156 url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getBdcqzQlr',
157 method: 'get',
158 params: {
159 bsmBdcqz: bsmBdcqz
160 }
161 })
162 }
......
1 /* 1 /*
2 * @Description: 材料信息 2 * @Description: 材料信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 15:39:37 4 * @LastEditTime: 2023-09-13 15:56:03
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -49,9 +49,9 @@ export function saveClml (data) { ...@@ -49,9 +49,9 @@ export function saveClml (data) {
49 * @param {*} data 49 * @param {*} data
50 * @author: renchao 50 * @author: renchao
51 */ 51 */
52 export function updateClml (data, bsmSldy) { 52 export function updateClml (data, bsmSldy, bsmSlsq) {
53 return request({ 53 return request({
54 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy, 54 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy + '/' + bsmSlsq,
55 method: 'post', 55 method: 'post',
56 data 56 data
57 }) 57 })
......
1 /* 1 /*
2 * @Description: 企业银行接口 2 * @Description: 企业银行接口
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 08:35:25 4 * @LastEditTime: 2023-09-13 17:08:10
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 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 ...@@ -11,7 +11,6 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
11 * @description: 获取材料目录 11 * @description: 获取材料目录
12 * @author: renchao 12 * @author: renchao
13 */ 13 */
14
15 export function getCompanyMaterialList (bsmCompany) { 14 export function getCompanyMaterialList (bsmCompany) {
16 return request({ 15 return request({
17 url: SERVER.SERVERAPI + '/rest/sys/company/getCompanyMaterialList', 16 url: SERVER.SERVERAPI + '/rest/sys/company/getCompanyMaterialList',
...@@ -98,3 +97,15 @@ export function move (bsmFile, direction) { ...@@ -98,3 +97,15 @@ export function move (bsmFile, direction) {
98 } 97 }
99 }) 98 })
100 } 99 }
100 /**
101 * @description: 编辑材料目录
102 * @param {*} data
103 * @author: renchao
104 */
105 export function editCompanyMaterialList (data, bsmCompany) {
106 return request({
107 url: SERVER.SERVERAPI + '/rest/sys/company/editCompanyMaterialList/' + bsmCompany,
108 method: 'post',
109 data
110 })
111 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 13:48:47 4 * @LastEditTime: 2023-09-13 15:58:06
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
182 handleSubmit () { 182 handleSubmit () {
183 this.loading = true 183 this.loading = true
184 store.dispatch('user/reWorkFresh', false) 184 store.dispatch('user/reWorkFresh', false)
185 updateClml(this.tableData, this.formData.bsmSldy).then(res => { 185 updateClml(this.tableData, this.formData.bsmSldy, Vue.prototype.$currentRoute.query.bsmSlsq).then(res => {
186 this.loading = false 186 this.loading = false
187 if (res.code == 200) { 187 if (res.code == 200) {
188 this.$message({ 188 this.$message({
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-28 12:53:50 4 * @LastEditTime: 2023-09-13 17:08:19
5 --> 5 -->
6 <template> 6 <template>
7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> 7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 </el-row> 24 </el-row>
25
26 <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange" 25 <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange"
27 :data="tableData.data" 26 :data="tableData.data"
28 :pagination="false" 27 :pagination="false"
...@@ -37,7 +36,7 @@ ...@@ -37,7 +36,7 @@
37 <el-col :span="6"> 36 <el-col :span="6">
38 <el-form-item label="证件类型" prop="lzrzjlb"> 37 <el-form-item label="证件类型" prop="lzrzjlb">
39 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> 38 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
40 <el-option v-for="item in zjzlData" :key="item.dcode" :label="item.dname" :value="item.dcode"> 39 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
41 </el-option> 40 </el-option>
42 </el-select> 41 </el-select>
43 </el-form-item> 42 </el-form-item>
...@@ -63,7 +62,7 @@ ...@@ -63,7 +62,7 @@
63 import Vue from 'vue' 62 import Vue from 'vue'
64 import store from '@/store/index.js' 63 import store from '@/store/index.js'
65 import table from "@/utils/mixin/table"; 64 import table from "@/utils/mixin/table";
66 import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js"; 65 import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js";
67 import { datas } from "../../javascript/fzxxdata"; 66 import { datas } from "../../javascript/fzxxdata";
68 export default { 67 export default {
69 props: { 68 props: {
...@@ -77,7 +76,7 @@ ...@@ -77,7 +76,7 @@
77 mixins: [table], 76 mixins: [table],
78 data () { 77 data () {
79 return { 78 return {
80 zjzlData: store.getters.dictData['A30'], 79 lzrzjlbData: store.getters.dictData['A30'],
81 ruleForm: { 80 ruleForm: {
82 fzrmc: '', 81 fzrmc: '',
83 fzsj: '', 82 fzsj: '',
...@@ -133,6 +132,21 @@ ...@@ -133,6 +132,21 @@
133 this.ruleForm.fzsj = res.result.fzsj 132 this.ruleForm.fzsj = res.result.fzsj
134 this.ruleForm.fzsl = res.result.fzsl 133 this.ruleForm.fzsl = res.result.fzsl
135 this.ruleForm.bdcqzList = res.result.list; 134 this.ruleForm.bdcqzList = res.result.list;
135 res.result.list.length && this.getQlr(res.result.list[0].bsmBdcqz)
136 }
137 })
138 },
139 /**
140 * @description: 获取权利人信息
141 * @author: renchao
142 */
143 getQlr (bsmBdcqz) {
144 getBdcqzQlr(bsmBdcqz).then(res => {
145 if (res.code === 200) {
146 this.ruleForm.lzrxm = res.result.qlrmc;
147 this.ruleForm.lzrzjlb = res.result.zjzl;
148 this.ruleForm.lzrzjh = res.result.zjh;
149 this.ruleForm.lzrdh = res.result.dh;
136 } 150 }
137 }) 151 })
138 }, 152 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-18 14:26:54 4 * @LastEditTime: 2023-09-13 16:16:08
5 --> 5 -->
6 <template> 6 <template>
7 <canvas id="mxcad"> 7 <div>
8 <canvas id="mxcad" style="width:100%;height:100%">
8 </canvas> 9 </canvas>
10 </div>
9 </template> 11 </template>
10 <script> 12 <script>
11 import Mx from "mxdraw" 13 import Mx from "mxdraw"
...@@ -31,7 +33,7 @@ ...@@ -31,7 +33,7 @@
31 console.log(listLayer) 33 console.log(listLayer)
32 }) 34 })
33 }, 35 },
34 isNewFile: true // 是否新建文件 36 isNewFile: false // 是否新建文件
35 }) 37 })
36 }) 38 })
37 } 39 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 13:46:03 4 * @LastEditTime: 2023-09-13 17:08:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
15 </div> 15 </div>
16 </template> 16 </template>
17 <script> 17 <script>
18 import Vue from 'vue'
19 import store from '@/store/index.js' 18 import store from '@/store/index.js'
19 import Sortable from 'sortablejs'
20 import { ywPopupCacel } from "@/utils/popup.js"; 20 import { ywPopupCacel } from "@/utils/popup.js";
21 import { InitClml, updateClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 21 import { editCompanyMaterialList } from "@/api/company.js";
22 export default { 22 export default {
23 props: { 23 props: {
24 formData: { 24 formData: {
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
58 label: "材料名称", 58 label: "材料名称",
59 render: (h, scope) => { 59 render: (h, scope) => {
60 return ( 60 return (
61 <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> 61 (scope.row.sfxjcl == '1') ?
62 <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> : <span>{scope.row.clmc}</span>
62 ) 63 )
63 } 64 }
64 }, 65 },
...@@ -81,24 +82,6 @@ ...@@ -81,24 +82,6 @@
81 } 82 }
82 }, 83 },
83 { 84 {
84 label: "份数",
85 width: "50",
86 render: (h, scope) => {
87 return (
88 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input>
89 )
90 }
91 },
92 {
93 label: "扫描时间",
94 width: "140",
95 render: (h, scope) => {
96 return (
97 <span>{scope.row.sjsj}</span>
98 )
99 }
100 },
101 {
102 label: "页数", 85 label: "页数",
103 width: "80", 86 width: "80",
104 render: (h, scope) => { 87 render: (h, scope) => {
...@@ -157,6 +140,8 @@ ...@@ -157,6 +140,8 @@
157 }, 140 },
158 mounted () { 141 mounted () {
159 this.initSort() 142 this.initSort()
143 this.tableData = _.cloneDeep(this.formData.data)
144 console.log(this.formData.bsmCompany);
160 }, 145 },
161 beforeDestroy () { 146 beforeDestroy () {
162 if (this.sortable) { 147 if (this.sortable) {
...@@ -176,26 +161,17 @@ ...@@ -176,26 +161,17 @@
176 handleCancel () { 161 handleCancel () {
177 ywPopupCacel() 162 ywPopupCacel()
178 }, 163 },
179 handleAdd () {
180 this.tableData.push({
181 clmc: '',
182 cllx: '1',
183 sjsl: '',
184 smzt: '',
185 count: 0
186 })
187 },
188 handleSubmit () { 164 handleSubmit () {
189 this.loading = true 165 this.loading = true
190 store.dispatch('user/reWorkFresh', false) 166 store.dispatch('user/reWorkFresh', false)
191 updateClml(this.tableData).then(res => { 167 editCompanyMaterialList(this.tableData, this.formData.bsmCompany).then(res => {
192 this.loading = false 168 this.loading = false
193 if (res.code == 200) { 169 if (res.code == 200) {
194 this.$message({ 170 this.$message({
195 message: '保存成功', 171 message: '保存成功',
196 type: 'success' 172 type: 'success'
197 }) 173 })
198 this.$popupCacel() 174 ywPopupCacel()
199 store.dispatch('user/reWorkFresh', true) 175 store.dispatch('user/reWorkFresh', true)
200 } 176 }
201 }).catch(() => { 177 }).catch(() => {
...@@ -203,29 +179,6 @@ ...@@ -203,29 +179,6 @@
203 }) 179 })
204 }, 180 },
205 /** 181 /**
206 * @description: 材料目录明细初始化
207 * @author: renchao
208 */
209 clmlInitList () {
210 return new Promise(resolve => {
211 this.unitData = this.$parent.unitData;
212 var formdata = new FormData();
213 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
214 InitClml(formdata).then((res) => {
215 if (res.code == 200) {
216 resolve(res.code)
217 if (res.result && res.result.length > 0) {
218 this.tableData = res.result;
219 } else {
220 this.tableData = []
221 }
222 } else {
223 this.$message.error(res.message)
224 }
225 })
226 })
227 },
228 /**
229 * @description: 材料目录删除 182 * @description: 材料目录删除
230 * @param {*} index 183 * @param {*} index
231 * @param {*} row 184 * @param {*} row
...@@ -238,17 +191,7 @@ ...@@ -238,17 +191,7 @@
238 cancelButtonText: '取消', 191 cancelButtonText: '取消',
239 type: 'warning' 192 type: 'warning'
240 }).then(() => { 193 }).then(() => {
241 deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => { 194 this.tableData.splice(index, 1);
242 if (res.code == 200) {
243 let res = await that.clmlInitList()
244 if (res == 200) {
245 that.$message({
246 message: "删除成功",
247 type: "success"
248 })
249 }
250 }
251 })
252 }).catch(() => { 195 }).catch(() => {
253 this.$message({ 196 this.$message({
254 type: 'info', 197 type: 'info',
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 13:52:42 4 * @LastEditTime: 2023-09-13 17:05:49
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 } 91 }
92 }, 92 },
93 created () { 93 created () {
94 this.clmlInitList(); 94 this.clmlInitList()
95 }, 95 },
96 methods: { 96 methods: {
97 /** 97 /**
...@@ -274,6 +274,7 @@ ...@@ -274,6 +274,7 @@
274 store.dispatch("user/reWorkFresh", false); 274 store.dispatch("user/reWorkFresh", false);
275 ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", { 275 ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
276 data: this.tableData, 276 data: this.tableData,
277 bsmCompany: this.formData.bsmCompany
277 }, "60%", true, false) 278 }, "60%", true, false)
278 }, 279 },
279 //设置tableData 280 //设置tableData
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 </div> 37 </div>
38 <!-- 表格 --> 38 <!-- 表格 -->
39 <div class="from-clues-content loadingtext"> 39 <div class="from-clues-content loadingtext">
40 国有房屋变更信息 40 预告买卖登记信息
41 <el-table 41 <el-table
42 :data="tableData.data" 42 :data="tableData.data"
43 height="210" 43 height="210"
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 @current-change="handleCurrentChange"></el-pagination> 168 @current-change="handleCurrentChange"></el-pagination>
169 </div> 169 </div>
170 <div class="from-clues-content loadingtext"> 170 <div class="from-clues-content loadingtext">
171 抵押变更信息 171 预告抵押信息
172 <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns" 172 <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns"
173 :data="tableData.dataList"> 173 :data="tableData.dataList">
174 </lb-table> 174 </lb-table>
...@@ -185,10 +185,10 @@ ...@@ -185,10 +185,10 @@
185 import store from '@/store/index.js' 185 import store from '@/store/index.js'
186 import table from "@/utils/mixin/table"; 186 import table from "@/utils/mixin/table";
187 import { ywPopupDialog } from "@/utils/popup.js"; 187 import { ywPopupDialog } from "@/utils/popup.js";
188 import { datas, sendThis } from "../javascript/selectFwbjDybgSplitMerge.js"; 188 import { datas, sendThis } from "../javascript/selectYgdy.js";
189 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 189 import { defaultParameters } from "../javascript/publicDefaultPar.js";
190 import { selectYgdj200, selectDiyaq } from "@/api/ywsq.js"; 190 import { selectYgdj200, selectYgdy } from "@/api/ywsq.js";
191 import { startBusinessFlow } from "@/api/workFlow.js"; 191 import { startTogetherFlow } from "@/api/workFlow.js";
192 export default { 192 export default {
193 mixins: [table, jump], 193 mixins: [table, jump],
194 props: { 194 props: {
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
266 getCurrentRow (row) { 266 getCurrentRow (row) {
267 this.radioVal = row.bdcdyh; 267 this.radioVal = row.bdcdyh;
268 this.bdcdysz = [row] 268 this.bdcdysz = [row]
269 selectDiyaq({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => { 269 selectYgdy({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => {
270 if (res.code === 200) { 270 if (res.code === 200) {
271 this.tableData.dataList = res.result.records 271 this.tableData.dataList = res.result.records
272 this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList] 272 this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList]
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
305 */ 305 */
306 submitForm () { 306 submitForm () {
307 this.loading = true 307 this.loading = true
308 startBusinessFlow({ 308 startTogetherFlow({
309 bsmSqyw: this.sqywInfo.bsmSqyw, 309 bsmSqyw: this.sqywInfo.bsmSqyw,
310 bdcdysz: this.bdcdysz, 310 bdcdysz: this.bdcdysz,
311 }).then((res) => { 311 }).then((res) => {
......
...@@ -45,6 +45,17 @@ class data extends filter { ...@@ -45,6 +45,17 @@ class data extends filter {
45 } 45 }
46 }, 46 },
47 { 47 {
48 label: "业务号",
49 width: '120',
50 render: (h, scope) => {
51 return (
52 <el-tooltip effect="dark" content={scope.row.ywh} placement="top" popper-class="tooltip-width">
53 <span class="ellipsis-table"> {scope.row.ywh}</span>
54 </el-tooltip>
55 )
56 }
57 },
58 {
48 label: "权利类型", 59 label: "权利类型",
49 width: '120', 60 width: '120',
50 render: (h, scope) => { 61 render: (h, scope) => {
......
...@@ -3,6 +3,9 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -3,6 +3,9 @@ export function queueDjywmc (djywbm, djqxbm) {
3 if (djqxbm == "A0320099" || djqxbm == "A0330099") { 3 if (djqxbm == "A0320099" || djqxbm == "A0330099") {
4 return "selectJsydsyqSplitMerge"; 4 return "selectJsydsyqSplitMerge";
5 } 5 }
6 if (djqxbm == "A37100S2") {
7 return "selectYgdy";
8 }
6 if (djqxbm == "DJBBL001") { 9 if (djqxbm == "DJBBL001") {
7 return "selectDjbbl"; 10 return "selectDjbbl";
8 } 11 }
...@@ -89,12 +92,11 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -89,12 +92,11 @@ export function queueDjywmc (djywbm, djqxbm) {
89 case "B41400": //预告抵押注销 92 case "B41400": //预告抵押注销
90 vm = "selectYgdy"; 93 vm = "selectYgdy";
91 break; 94 break;
92 case "C40100": //一并申请首次 95 case "C40100": //预告买卖抵押首次一并申请
93 vm = "selectYbsc"; 96 vm = "selectYbsc";
94 break; 97 break;
95 case "C40300": //一并申请变更 98 case "C40300": //预告买卖变更+预告抵押变更一并申请
96 case "C40400": //一并申请注销 99 case "C40400": //预告买卖注销+预告抵押注销一并申请
97 // vm = "selectYbbg";
98 vm = "selectYbbgSplitMerge" 100 vm = "selectYbbgSplitMerge"
99 break; 101 break;
100 case "C04371": //一并国有房屋转移 102 case "C04371": //一并国有房屋转移
......