2282194a by renchao@pashanhoo.com

Merge branch 'dev'

2 parents f042a339 66ce7671
1 { 1 {
2 "TITLE": "不动产登记系统", 2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "/bdcdj", 3 "SERVERAPI": "/bdcdj-th",
4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0" 4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
5 } 5 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -49,7 +49,7 @@ export function deleteRepairRecord (params) { ...@@ -49,7 +49,7 @@ export function deleteRepairRecord (params) {
49 */ 49 */
50 export function init (params) { 50 export function init (params) {
51 return request({ 51 return request({
52 url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params, 52 url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params.bsmRepair+'&isEdit='+params.isEdit,
53 method: 'get', 53 method: 'get',
54 }) 54 })
55 } 55 }
...@@ -92,6 +92,31 @@ export function save (data) { ...@@ -92,6 +92,31 @@ export function save (data) {
92 } 92 }
93 93
94 /** 94 /**
95 * @description: 获取上手信息
96 * @param {*} data
97 * @author: renchao
98 */
99 export function getSsQlxx (params) {
100 return request({
101 url: SERVER.SERVERAPI + '/rest/djbRepair/getSsQlxx',
102 method: 'get',
103 params
104 })
105 }
106
107 /**
108 * @description: 获取主体信息
109 * @param {*} data
110 * @author: renchao
111 */
112 export function getZtQlxx (params) {
113 return request({
114 url: SERVER.SERVERAPI + '/rest/djbRepair/getZtQlxx',
115 method: 'get',
116 params
117 })
118 }
119 /**
95 * @description: 发起业务申请流程 120 * @description: 发起业务申请流程
96 * @param {*} data 121 * @param {*} data
97 * @author: renchao 122 * @author: renchao
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
4 * @Author: sakuya 4 * @Author: sakuya
5 * @Date: 2021年6月10日10:04:07 5 * @Date: 2021年6月10日10:04:07
6 * @LastEditors: Please set LastEditors 6 * @LastEditors: Please set LastEditors
7 * @LastEditTime: 2023-06-29 11:14:11 7 * @LastEditTime: 2023-07-05 10:39:17
8 --> 8 -->
9 9
10 <template> 10 <template>
11 <el-select ref="select" v-model="defaultValue" :size="size" :clearable="clearable" :multiple="multiple" :collapse-tags="collapseTags" 11 <el-select ref="select" v-model="defaultValue" :size="size" :clearable="clearable" :multiple="multiple" :collapse-tags="collapseTags"
12 :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled" :filter-method="filterMethod" 12 :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled"
13 @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear"> 13 @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
14 <template #empty> 14 <template #empty>
15 <div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading"> 15 <div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading">
...@@ -19,14 +19,10 @@ ...@@ -19,14 +19,10 @@
19 <el-table ref="table" :data="tableData" :height="245" :highlight-current-row="!multiple" @row-click="click" @select="select" @select-all="selectAll"> 19 <el-table ref="table" :data="tableData" :height="245" :highlight-current-row="!multiple" @row-click="click" @select="select" @select-all="selectAll">
20 <el-table-column v-if="multiple" type="selection" width="45"></el-table-column> 20 <el-table-column v-if="multiple" type="selection" width="45"></el-table-column>
21 <el-table-column v-else type="index" width="45"> 21 <el-table-column v-else type="index" width="45">
22 <template #default="scope"><span>{{scope.$index+(currentPage - 1) * pageSize + 1}}</span></template> 22 <template #default="scope"><span>{{scope.$index +1 }}</span></template>
23 </el-table-column> 23 </el-table-column>
24 <slot></slot> 24 <slot></slot>
25 </el-table> 25 </el-table>
26 <div class="sc-table-select__page">
27 <el-pagination small background layout="prev, pager, next" :total="total" :page-size="pageSize" v-model:currentPage="currentPage"
28 @current-change="reload"></el-pagination>
29 </div>
30 </div> 26 </div>
31 </template> 27 </template>
32 </el-select> 28 </el-select>
...@@ -48,29 +44,23 @@ ...@@ -48,29 +44,23 @@
48 disabled: { type: Boolean, default: false }, 44 disabled: { type: Boolean, default: false },
49 tableWidth: { type: Number, default: 400 }, 45 tableWidth: { type: Number, default: 400 },
50 mode: { type: String, default: "popover" }, 46 mode: { type: String, default: "popover" },
51 props: { type: Object, default: () => { } } 47 props: { type: Object, default: () => { } },
48 // 表格数据
49 tableData: { type: Array, default: () => { [] } },
52 }, 50 },
53 data () { 51 data () {
54 return { 52 return {
55 loading: false, 53 loading: false,
56 keyword: null, 54 keyword: null,
57 defaultValue: [], 55 defaultValue: [],
58 tableData: [],
59 pageSize: config.pageSize,
60 total: 0,
61 currentPage: 1,
62 defaultProps: { 56 defaultProps: {
63 label: config.props.label, 57 label: config.props.label,
64 value: config.props.value, 58 value: config.props.value
65 page: config.request.page,
66 pageSize: config.request.pageSize,
67 keyword: config.request.keyword
68 }, 59 },
69 formData: {} 60 formData: {}
70 } 61 }
71 }, 62 },
72 computed: { 63 computed: {
73
74 }, 64 },
75 watch: { 65 watch: {
76 modelValue: { 66 modelValue: {
...@@ -90,8 +80,6 @@ ...@@ -90,8 +80,6 @@
90 //表格显示隐藏回调 80 //表格显示隐藏回调
91 visibleChange (visible) { 81 visibleChange (visible) {
92 if (visible) { 82 if (visible) {
93 this.currentPage = 1
94 this.keyword = null
95 this.formData = {} 83 this.formData = {}
96 this.getData() 84 this.getData()
97 } else { 85 } else {
...@@ -100,58 +88,24 @@ ...@@ -100,58 +88,24 @@
100 }, 88 },
101 //获取表格数据 89 //获取表格数据
102 async getData () { 90 async getData () {
103 this.loading = true;
104 var reqData = {
105 [this.defaultProps.page]: this.currentPage,
106 [this.defaultProps.pageSize]: this.pageSize,
107 [this.defaultProps.keyword]: this.keyword
108 }
109 Object.assign(reqData, this.formData)
110 // var res = await this.apiObj.get(reqData);
111 let res = {
112 code: 200,
113 data: {
114 total: 2, rows: [
115 {
116 user: 11111111111,
117 id: 111111111111
118 },
119 {
120 user: 2222222222222,
121 id: 22222222222
122 }
123 ]
124 },
125 message: ""
126 }
127 var parseData = config.parseData(res)
128 this.tableData = parseData.rows;
129 this.total = parseData.total;
130 this.loading = false;
131 //表格默认赋值 91 //表格默认赋值
132 this.$nextTick(() => { 92 if (this.multiple) {
133 if (this.multiple) { 93 this.defaultValue.forEach(row => {
134 this.defaultValue.forEach(row => { 94 var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row[this.defaultProps.value])
135 var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row[this.defaultProps.value]) 95 if (setrow.length > 0) {
136 if (setrow.length > 0) { 96 this.$refs.table.toggleRowSelection(setrow[0], true);
137 this.$refs.table.toggleRowSelection(setrow[0], true); 97 }
138 } 98 })
139 }) 99 } else {
140 } else { 100 if (this.defaultValue) {
141 var setrow = this.tableData.filter(item => item[this.defaultProps.value] === this.defaultValue[this.defaultProps.value]) 101 var setrow = this.tableData.filter(item => item[this.defaultProps.value] === this.defaultValue[this.defaultProps.value])
142 this.$refs.table.setCurrentRow(setrow[0]); 102 // this.$refs.table.setCurrentRow(setrow[0]);
143 } 103 }
144 this.$refs.table.setScrollTop(0) 104 }
145 }) 105 // this.$refs.table.setScrollTop(0)
146 }, 106 },
147 //插糟表单提交 107 //插糟表单提交
148 formSubmit () { 108 formSubmit () {
149 this.currentPage = 1
150 this.keyword = null
151 this.getData()
152 },
153 //分页刷新表格
154 reload () {
155 this.getData() 109 this.getData()
156 }, 110 },
157 //自动模拟options赋值 111 //自动模拟options赋值
...@@ -162,7 +116,9 @@ ...@@ -162,7 +116,9 @@
162 item.currentLabel = item.value[this.defaultProps.label] 116 item.currentLabel = item.value[this.defaultProps.label]
163 }) 117 })
164 } else { 118 } else {
165 this.$refs.select.selectedLabel = this.defaultValue[this.defaultProps.label] 119 if (this.defaultValue) {
120 this.$refs.select.selectedLabel = this.defaultValue[this.defaultProps.label]
121 }
166 } 122 }
167 }) 123 })
168 }, 124 },
...@@ -207,6 +163,7 @@ ...@@ -207,6 +163,7 @@
207 this.defaultValue = row 163 this.defaultValue = row
208 this.$refs.select.blur() 164 this.$refs.select.blur()
209 this.autoCurrentLabel() 165 this.autoCurrentLabel()
166 this.$refs.table.setCurrentRow(row);
210 this.$emit('update:modelValue', this.defaultValue); 167 this.$emit('update:modelValue', this.defaultValue);
211 this.$emit('change', this.defaultValue); 168 this.$emit('change', this.defaultValue);
212 } 169 }
...@@ -225,14 +182,6 @@ ...@@ -225,14 +182,6 @@
225 findRowByKey (value) { 182 findRowByKey (value) {
226 return this.tableData.find(item => item[this.defaultProps.value] === value) 183 return this.tableData.find(item => item[this.defaultProps.value] === value)
227 }, 184 },
228 filterMethod (keyword) {
229 if (!keyword) {
230 this.keyword = null;
231 return false;
232 }
233 this.keyword = keyword;
234 this.getData()
235 },
236 // 触发select隐藏 185 // 触发select隐藏
237 blur () { 186 blur () {
238 this.$refs.select.blur(); 187 this.$refs.select.blur();
...@@ -244,7 +193,6 @@ ...@@ -244,7 +193,6 @@
244 } 193 }
245 } 194 }
246 </script> 195 </script>
247
248 <style scoped> 196 <style scoped>
249 .sc-table-select__table { 197 .sc-table-select__table {
250 padding: 12px; 198 padding: 12px;
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-29 11:05:49 4 * @LastEditTime: 2023-07-05 09:48:23
5 */ 5 */
6 //表格选择器配置 6 //表格选择器配置
7 7
...@@ -9,17 +9,12 @@ export default { ...@@ -9,17 +9,12 @@ export default {
9 pageSize: 10, //表格每一页条数 9 pageSize: 10, //表格每一页条数
10 parseData: function (res) { 10 parseData: function (res) {
11 return { 11 return {
12 data: res.data, 12 data: res.data
13 rows: res.data.rows, //分析行数据字段结构
14 total: res.data.total, //分析总数字段结构
15 msg: res.message, //分析描述字段结构
16 code: res.code //分析状态字段结构
17 } 13 }
18 }, 14 },
19 request: { 15 request: {
20 page: 'page', //规定当前分页字段 16 page: 'page', //规定当前分页字段
21 pageSize: 'pageSize', //规定一页条数字段 17 pageSize: 'pageSize', //规定一页条数字段
22 keyword: 'keyword' //规定搜索字段
23 }, 18 },
24 props: { 19 props: {
25 label: 'label', //映射label显示字段 20 label: 'label', //映射label显示字段
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-21 16:35:04 4 * @LastEditTime: 2023-07-04 16:07:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
26 <el-upload class="fileUpdate" ref="upload" action="" :show-file-list="false" :multiple="true" :auto-upload="false" 26 <el-upload class="fileUpdate" ref="upload" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
27 :on-change="handleChange" 27 :on-change="handleChange"
28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload"> 28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
29 <el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype">上传</el-button> 29 <el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype && ableOperation">上传</el-button>
30 </el-upload> 30 </el-upload>
31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete" 31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
32 v-if="!this.$route.query.viewtype && thumbnailImages.length>0">删除</el-button> 32 v-if="!this.$route.query.viewtype && thumbnailImages.length>0 && ableOperation">删除</el-button>
33 <div v-if="!this.$route.query.viewtype" class="pl-5"> 33 <div v-if="!this.$route.query.viewtype" class="pl-5">
34 <el-button type="primary" @click="handleOpenScan">{{scanTitle}}</el-button> 34 <el-button type="primary" @click="handleOpenScan" v-if="ableOperation">{{scanTitle}}</el-button>
35 <el-button type="primary" @click="handleViewScan" v-if="isScan">拍照</el-button> 35 <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
36 </div> 36 </div>
37 </div> 37 </div>
38 <ul> 38 <ul>
...@@ -58,6 +58,10 @@ ...@@ -58,6 +58,10 @@
58 previewImg: { 58 previewImg: {
59 type: Object, 59 type: Object,
60 default: () => { } 60 default: () => { }
61 },
62 ableOperation: {
63 type: Boolean,
64 default: true
61 } 65 }
62 }, 66 },
63 components: { 67 components: {
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="127px"> 16 label-width="127px"
17 >
17 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
18 <div class="slxx_title title-block"> 19 <div class="slxx_title title-block">
19 补录信息 20 补录信息
...@@ -37,6 +38,62 @@ ...@@ -37,6 +38,62 @@
37 </el-col> 38 </el-col>
38 </el-row> 39 </el-row>
39 <div class="slxx_title title-block"> 40 <div class="slxx_title title-block">
41 查封不动产情况
42 <div>请选择查封不动产信息,请选择上手权利信息</div>
43 <div class="triangle"></div>
44 </div>
45 <el-row :gutter="10" v-if="ruleForm.ztQlxx!=null">
46 <el-col :span="8">
47 <el-form-item label="权利人:">
48 <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
49 </el-form-item>
50 </el-col>
51 <el-col :span="8">
52 <el-form-item label="证件种类:">
53 <el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
54 </el-form-item>
55 </el-col>
56 <el-col :span="8">
57 <el-form-item label="证件号:">
58 <el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
59 </el-form-item>
60 </el-col>
61 </el-row>
62 <el-row :gutter="10" v-if="ruleForm.ztQlxx!=null">
63 <el-col :span="8">
64 <el-form-item label="权利类型:">
65 <el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
66 </el-form-item>
67 </el-col>
68 <el-col :span="8">
69 <el-form-item label="不动产权证号:">
70 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
71 </el-form-item>
72 </el-col>
73 <el-col :span="8">
74 <el-form-item label="坐落:">
75 <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
76 </el-form-item>
77 </el-col>
78 </el-row>
79 <el-row :gutter="10" v-if="ruleForm.ztQlxx!=null">
80 <el-col :span="8">
81 <el-form-item label="不动产单元号:">
82 <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
83 </el-form-item>
84 </el-col>
85 <el-col :span="8">
86 <el-form-item label="面积:">
87 <el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input>
88 </el-form-item>
89 </el-col>
90 <el-col :span="8">
91 <el-form-item label="用途:">
92 <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
93 </el-form-item>
94 </el-col>
95 </el-row>
96 <div class="slxx_title title-block">
40 房地产权(独幢、层、套、间房屋) 97 房地产权(独幢、层、套、间房屋)
41 <div class="triangle"></div> 98 <div class="triangle"></div>
42 </div> 99 </div>
...@@ -66,8 +123,12 @@ ...@@ -66,8 +123,12 @@
66 <el-col :span="8"> 123 <el-col :span="8">
67 <el-form-item label="登记类型:"> 124 <el-form-item label="登记类型:">
68 <el-select v-model="ruleForm.qlxx.djlx"> 125 <el-select v-model="ruleForm.qlxx.djlx">
69 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 126 <el-option
70 </el-option> 127 v-for="item in dictData['A21']"
128 :key="item.dcode"
129 :label="item.dname"
130 :value="item.dcode"
131 ></el-option>
71 </el-select> 132 </el-select>
72 </el-form-item> 133 </el-form-item>
73 </el-col> 134 </el-col>
...@@ -109,8 +170,7 @@ ...@@ -109,8 +170,7 @@
109 <el-row :gutter="10"> 170 <el-row :gutter="10">
110 <el-col :span="12"> 171 <el-col :span="12">
111 <el-form-item label="共有方式:"> 172 <el-form-item label="共有方式:">
112 <el-radio-group 173 <el-radio-group v-model="ruleForm.qlxx.gyqk">
113 v-model="ruleForm.qlxx.gyqk">
114 <el-radio label="0">单独所有</el-radio> 174 <el-radio label="0">单独所有</el-radio>
115 <el-radio label="1">共同共有</el-radio> 175 <el-radio label="1">共同共有</el-radio>
116 <el-radio label="2">按份所有</el-radio> 176 <el-radio label="2">按份所有</el-radio>
...@@ -123,7 +183,8 @@ ...@@ -123,7 +183,8 @@
123 :tableData="ruleForm.qlrData" 183 :tableData="ruleForm.qlrData"
124 @upDateQlrxxList="upDateQlrxxList" 184 @upDateQlrxxList="upDateQlrxxList"
125 :key="key" 185 :key="key"
126 :gyfs="ruleForm.qlxx.gyfs" /> 186 :gyfs="ruleForm.qlxx.gyfs"
187 />
127 188
128 <div> 189 <div>
129 <div class="slxx_title title-block"> 190 <div class="slxx_title title-block">
...@@ -134,7 +195,8 @@ ...@@ -134,7 +195,8 @@
134 v-if="ruleForm.ywrData" 195 v-if="ruleForm.ywrData"
135 :tableData="ruleForm.ywrData" 196 :tableData="ruleForm.ywrData"
136 :key="key" 197 :key="key"
137 @upDateQlrxxList="upDateYwrxxList" /> 198 @upDateQlrxxList="upDateYwrxxList"
199 />
138 </div> 200 </div>
139 </div> 201 </div>
140 <el-row class="btn"> 202 <el-row class="btn">
...@@ -147,12 +209,12 @@ ...@@ -147,12 +209,12 @@
147 </template> 209 </template>
148 <script> 210 <script>
149 import { mapGetters } from "vuex"; 211 import { mapGetters } from "vuex";
150 import { init,save } from "@/api/djbbl.js"; 212 import { init, save } from "@/api/djbbl.js";
151 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 213 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
152 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 214 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
153 import tdytTable from "@/views/workflow/components/tdytTable"; 215 import tdytTable from "@/views/workflow/components/tdytTable";
154 export default { 216 export default {
155 components: { qlrCommonTable,ywrCommonTable,tdytTable }, 217 components: { qlrCommonTable, ywrCommonTable, tdytTable },
156 computed: { 218 computed: {
157 ...mapGetters(["dictData", "flag"]), 219 ...mapGetters(["dictData", "flag"]),
158 }, 220 },
...@@ -175,26 +237,27 @@ export default { ...@@ -175,26 +237,27 @@ export default {
175 mounted() {}, 237 mounted() {},
176 methods: { 238 methods: {
177 loadData() { 239 loadData() {
178 console.log("预告登记",this.propsParam); 240 console.log("查封登记", this.propsParam);
179 init(this.propsParam.bsmRepair).then((res) => { 241 this.propsParam.isEdit = this.$parent.isEdit;
242 init(this.propsParam).then((res) => {
180 if (res.code == 200) { 243 if (res.code == 200) {
181 this.ruleForm = res.result; 244 this.ruleForm = res.result;
182 console.log("this.ruleForm",this.ruleForm); 245 console.log("this.ruleForm", this.ruleForm);
183 this.isShow = true; 246 this.isShow = true;
184 } 247 }
185 }); 248 });
186 }, 249 },
187 // 更新土地用途信息 250 // 更新土地用途信息
188 upDateTdytxxList(val) { 251 upDateTdytxxList(val) {
189 console.log("VAL",val); 252 console.log("VAL", val);
190 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 253 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
191 this.key++; 254 this.key++;
192 }, 255 },
193 // 更新权利人信息 256 // 更新权利人信息
194 upDateQlrxxList(val) { 257 upDateQlrxxList(val) {
195 console.log("val",val); 258 console.log("val", val);
196 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 259 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
197 console.log("this.ruleForm.qlrData",this.ruleForm.qlrData); 260 console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
198 this.czrOptions = this.ruleForm.qlrData; 261 this.czrOptions = this.ruleForm.qlrData;
199 this.key++; 262 this.key++;
200 }, 263 },
...@@ -204,7 +267,7 @@ export default { ...@@ -204,7 +267,7 @@ export default {
204 this.key++; 267 this.key++;
205 }, 268 },
206 onSubmit() { 269 onSubmit() {
207 console.log("this.ruleForm大信息",this.ruleForm); 270 console.log("this.ruleForm大信息", this.ruleForm);
208 if (this.ruleForm.qlrData.length == 0) { 271 if (this.ruleForm.qlrData.length == 0) {
209 this.$message({ 272 this.$message({
210 showClose: true, 273 showClose: true,
......
...@@ -303,8 +303,9 @@ ...@@ -303,8 +303,9 @@
303 mounted () { }, 303 mounted () { },
304 methods: { 304 methods: {
305 loadData () { 305 loadData () {
306 console.log("预告登记", this.propsParam); 306 console.log("地役权", this.propsParam);
307 init(this.propsParam.bsmRepair).then((res) => { 307 this.propsParam.isEdit=this.$parent.isEdit
308 init(this.propsParam).then((res) => {
308 if (res.code == 200) { 309 if (res.code == 200) {
309 this.ruleForm = res.result; 310 this.ruleForm = res.result;
310 console.log("this.ruleForm", this.ruleForm); 311 console.log("this.ruleForm", this.ruleForm);
......
...@@ -392,7 +392,9 @@ export default { ...@@ -392,7 +392,9 @@ export default {
392 mounted() {}, 392 mounted() {},
393 methods: { 393 methods: {
394 loadData() { 394 loadData() {
395 init(this.propsParam.bsmRepair).then((res) => { 395 console.log("房屋", this.propsParam);
396 this.propsParam.isEdit=this.$parent.isEdit
397 init(this.propsParam).then((res) => {
396 if (res.code == 200) { 398 if (res.code == 200) {
397 this.ruleForm = res.result; 399 this.ruleForm = res.result;
398 if( this.ruleForm.tdytqxList.length>0){ 400 if( this.ruleForm.tdytqxList.length>0){
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 </el-col> 38 </el-col>
39 </el-row> 39 </el-row>
40 <div class="slxx_title title-block"> 40 <div class="slxx_title title-block">
41 国有建设用地使用权信息 41 建设用地、宅基地使用权信息
42 <div class="triangle"></div> 42 <div class="triangle"></div>
43 </div> 43 </div>
44 <el-row :gutter="10"> 44 <el-row :gutter="10">
...@@ -90,16 +90,42 @@ ...@@ -90,16 +90,42 @@
90 </el-select> 90 </el-select>
91 </el-form-item> 91 </el-form-item>
92 </el-col> 92 </el-col>
93
93 <el-col :span="8"> 94 <el-col :span="8">
95 <el-form-item label="登记原因:">
96 <el-input v-model="ruleForm.jsydsyq.djyy"></el-input>
97 </el-form-item>
98 </el-col>
99 <!-- <el-col :span="8">
94 <el-form-item label="房地坐落:"> 100 <el-form-item label="房地坐落:">
95 <el-input v-model="ruleForm.qlxx.zl"></el-input> 101 <el-input v-model="ruleForm.qlxx.zl"></el-input>
96 </el-form-item> 102 </el-form-item>
97 </el-col> 103 </el-col> -->
98 <el-col :span="8"> 104 <el-col :span="8">
99 <el-form-item label="使用权面积:"> 105 <el-form-item label="使用权面积:">
100 <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input> 106 <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
101 </el-form-item> 107 </el-form-item>
102 </el-col> 108 </el-col>
109 <el-col :span="8">
110 <el-form-item label="使用权起始时间">
111 <el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
112 </el-form-item>
113 </el-col>
114 <el-col :span="8">
115 <el-form-item label="使用权结束时间">
116 <el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input>
117 </el-form-item>
118 </el-col>
119 <el-col :span="8">
120 <el-form-item label="土地使用期限">
121 <el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
122 </el-form-item>
123 </el-col>
124 <el-col :span="8">
125 <el-form-item label="土地用途">
126 <el-input v-model="ruleForm.jsydsyq.yt"></el-input>
127 </el-form-item>
128 </el-col>
103 <el-col :span="8"> 129 <el-col :span="8">
104 <el-form-item label="取得价格:"> 130 <el-form-item label="取得价格:">
105 <div style="display: flex"> 131 <div style="display: flex">
...@@ -292,7 +318,8 @@ export default { ...@@ -292,7 +318,8 @@ export default {
292 return store.getters.dictData[val]; 318 return store.getters.dictData[val];
293 }, 319 },
294 loadData() { 320 loadData() {
295 init(this.propsParam.bsmRepair).then((res) => { 321 this.propsParam.isEdit=this.$parent.isEdit
322 init(this.propsParam).then((res) => {
296 if (res.code == 200) { 323 if (res.code == 200) {
297 this.ruleForm = res.result; 324 this.ruleForm = res.result;
298 if( this.ruleForm.tdytqxList.length>0){ 325 if( this.ruleForm.tdytqxList.length>0){
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 </el-col> 38 </el-col>
39 </el-row> 39 </el-row>
40 <div class="slxx_title title-block"> 40 <div class="slxx_title title-block">
41 房地产权(独幢、层、套、间房屋) 41 预告买卖登记信息
42 <div class="triangle"></div> 42 <div class="triangle"></div>
43 </div> 43 </div>
44 <el-row :gutter="10"> 44 <el-row :gutter="10">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </el-col> 66 </el-col>
67 <el-col :span="8"> 67 <el-col :span="8">
68 <el-form-item label="登记原因:"> 68 <el-form-item label="登记原因:">
69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 69 <el-input disabled v-model="ruleForm.ygdj.djyy"></el-input>
70 </el-form-item> 70 </el-form-item>
71 </el-col> 71 </el-col>
72 <el-col :span="8"> 72 <el-col :span="8">
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
128 128
129 <el-col :span="8"> 129 <el-col :span="8">
130 <el-form-item label="预告登记种类"> 130 <el-form-item label="预告登记种类">
131 <el-select v-model="ruleForm.qlxx.djlx"> 131 <el-select v-model="ruleForm.ygdj.ygdjlx">
132 <el-option 132 <el-option
133 v-for="item in dictData['A29']" 133 v-for="item in dictData['A29']"
134 :key="item.dcode" 134 :key="item.dcode"
...@@ -141,12 +141,12 @@ ...@@ -141,12 +141,12 @@
141 </el-col> 141 </el-col>
142 <el-col :span="8"> 142 <el-col :span="8">
143 <el-form-item label="土地使用权人"> 143 <el-form-item label="土地使用权人">
144 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 144 <el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
145 </el-form-item> 145 </el-form-item>
146 </el-col> 146 </el-col>
147 <el-col :span="8"> 147 <el-col :span="8">
148 <el-form-item label="规划用途"> 148 <el-form-item label="规划用途">
149 <el-select v-model="ruleForm.qlxx.djlx"> 149 <el-select v-model="ruleForm.ygdj.ghyt">
150 <el-option 150 <el-option
151 v-for="item in dictData['A17']" 151 v-for="item in dictData['A17']"
152 :key="item.dcode" 152 :key="item.dcode"
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
159 </el-col> 159 </el-col>
160 <el-col :span="8"> 160 <el-col :span="8">
161 <el-form-item label="用途名称"> 161 <el-form-item label="用途名称">
162 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 162 <el-input v-model="ruleForm.ygdj.ytmc"></el-input>
163 </el-form-item> 163 </el-form-item>
164 </el-col> 164 </el-col>
165 <el-col :span="8"> 165 <el-col :span="8">
166 <el-form-item label="房屋性质"> 166 <el-form-item label="房屋性质">
167 <el-select v-model="ruleForm.qlxx.djlx"> 167 <el-select v-model="ruleForm.ygdj.fwxz">
168 <el-option 168 <el-option
169 v-for="item in dictData['A19']" 169 v-for="item in dictData['A19']"
170 :key="item.dcode" 170 :key="item.dcode"
...@@ -177,12 +177,12 @@ ...@@ -177,12 +177,12 @@
177 </el-col> 177 </el-col>
178 <el-col :span="8"> 178 <el-col :span="8">
179 <el-form-item label="房屋性质名称"> 179 <el-form-item label="房屋性质名称">
180 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 180 <el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
181 </el-form-item> 181 </el-form-item>
182 </el-col> 182 </el-col>
183 <el-col :span="8"> 183 <el-col :span="8">
184 <el-form-item label="房屋结构"> 184 <el-form-item label="房屋结构">
185 <el-select v-model="ruleForm.qlxx.djlx"> 185 <el-select v-model="ruleForm.ygdj.fwjg">
186 <el-option 186 <el-option
187 v-for="item in dictData['A46']" 187 v-for="item in dictData['A46']"
188 :key="item.dcode" 188 :key="item.dcode"
...@@ -195,62 +195,62 @@ ...@@ -195,62 +195,62 @@
195 </el-col> 195 </el-col>
196 <el-col :span="8"> 196 <el-col :span="8">
197 <el-form-item label="所在层"> 197 <el-form-item label="所在层">
198 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 198 <el-input v-model="ruleForm.ygdj.szc"></el-input>
199 </el-form-item> 199 </el-form-item>
200 </el-col> 200 </el-col>
201 <el-col :span="8"> 201 <el-col :span="8">
202 <el-form-item label="总层数"> 202 <el-form-item label="总层数">
203 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 203 <el-input v-model="ruleForm.ygdj.zcs"></el-input>
204 </el-form-item> 204 </el-form-item>
205 </el-col> 205 </el-col>
206 <el-col :span="8"> 206 <el-col :span="8">
207 <el-form-item label="建筑面积"> 207 <el-form-item label="建筑面积">
208 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 208 <el-input v-model="ruleForm.ygdj.jzmj"></el-input>
209 </el-form-item> 209 </el-form-item>
210 </el-col> 210 </el-col>
211 <el-col :span="8"> 211 <el-col :span="8">
212 <el-form-item label="注销预告业务号"> 212 <el-form-item label="注销预告业务号">
213 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 213 <el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
214 </el-form-item> 214 </el-form-item>
215 </el-col> 215 </el-col>
216 <el-col :span="8"> 216 <el-col :span="8">
217 <el-form-item label="注销预告原因"> 217 <el-form-item label="注销预告原因">
218 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 218 <el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
219 </el-form-item> 219 </el-form-item>
220 </el-col> 220 </el-col>
221 <el-col :span="8"> 221 <el-col :span="8">
222 <el-form-item label="注销时间"> 222 <el-form-item label="注销时间">
223 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 223 <el-input v-model="ruleForm.ygdj.zxsj"></el-input>
224 </el-form-item> 224 </el-form-item>
225 </el-col> 225 </el-col>
226 <el-col :span="8"> 226 <el-col :span="8">
227 <el-form-item label="取得价格/被担保主债权数额"> 227 <el-form-item label="取得价格/被担保主债权数额">
228 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 228 <el-input v-model="ruleForm.ygdj.qdjg"></el-input>
229 </el-form-item> 229 </el-form-item>
230 </el-col> 230 </el-col>
231 <el-col :span="8"> 231 <el-col :span="8">
232 <el-form-item label="金额单位"> 232 <el-form-item label="金额单位">
233 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 233 <el-input v-model="ruleForm.ygdj.jedw"></el-input>
234 </el-form-item> 234 </el-form-item>
235 </el-col> 235 </el-col>
236 <el-col :span="8"> 236 <el-col :span="8">
237 <el-form-item label="担保范围"> 237 <el-form-item label="担保范围">
238 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 238 <el-input v-model="ruleForm.ygdj.dbfw"></el-input>
239 </el-form-item> 239 </el-form-item>
240 </el-col> 240 </el-col>
241 <el-col :span="8"> 241 <el-col :span="8">
242 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定"> 242 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
243 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 243 <el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
244 </el-form-item> 244 </el-form-item>
245 </el-col> 245 </el-col>
246 <el-col :span="8"> 246 <el-col :span="8">
247 <el-form-item label="不动产登记证明号"> 247 <el-form-item label="不动产登记证明号">
248 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 248 <el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
249 </el-form-item> 249 </el-form-item>
250 </el-col> 250 </el-col>
251 <el-col :span="24"> 251 <el-col :span="24">
252 <el-form-item label="附记:"> 252 <el-form-item label="附记:">
253 <el-input v-model="ruleForm.qlxx.fj"></el-input> 253 <el-input v-model="ruleForm.ygdj.fj"></el-input>
254 </el-form-item> 254 </el-form-item>
255 </el-col> 255 </el-col>
256 </el-row> 256 </el-row>
...@@ -340,7 +340,8 @@ export default { ...@@ -340,7 +340,8 @@ export default {
340 methods: { 340 methods: {
341 loadData() { 341 loadData() {
342 console.log("预告登记", this.propsParam); 342 console.log("预告登记", this.propsParam);
343 init(this.propsParam.bsmRepair).then((res) => { 343 this.propsParam.isEdit=this.$parent.isEdit
344 init(this.propsParam).then((res) => {
344 if (res.code == 200) { 345 if (res.code == 200) {
345 this.ruleForm = res.result; 346 this.ruleForm = res.result;
346 console.log("this.ruleForm", this.ruleForm); 347 console.log("this.ruleForm", this.ruleForm);
......
...@@ -59,17 +59,17 @@ ...@@ -59,17 +59,17 @@
59 </el-col> 59 </el-col>
60 </el-row> 60 </el-row>
61 <el-row :gutter="10"> 61 <el-row :gutter="10">
62 <el-col :span="8"> 62 <!-- <el-col :span="8">
63 <el-form-item label="权利类型:"> 63 <el-form-item label="权利类型:">
64 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 64 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
65 </el-form-item> 65 </el-form-item>
66 </el-col> 66 </el-col> -->
67 <el-col :span="8"> 67 <!-- <el-col :span="8">
68 <el-form-item label="登记原因:"> 68 <el-form-item label="登记原因:">
69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
70 </el-form-item> 70 </el-form-item>
71 </el-col> 71 </el-col> -->
72 <el-col :span="8"> 72 <!-- <el-col :span="8">
73 <el-form-item label="登记类型:"> 73 <el-form-item label="登记类型:">
74 <el-select v-model="ruleForm.qlxx.djlx"> 74 <el-select v-model="ruleForm.qlxx.djlx">
75 <el-option 75 <el-option
...@@ -81,17 +81,17 @@ ...@@ -81,17 +81,17 @@
81 </el-option> 81 </el-option>
82 </el-select> 82 </el-select>
83 </el-form-item> 83 </el-form-item>
84 </el-col> 84 </el-col> -->
85 <el-col :span="8"> 85 <!-- <el-col :span="8">
86 <el-form-item label="不动产坐落:"> 86 <el-form-item label="不动产坐落:">
87 <el-input v-model="ruleForm.qlxx.zl"></el-input> 87 <el-input v-model="ruleForm.qlxx.zl"></el-input>
88 </el-form-item> 88 </el-form-item>
89 </el-col> 89 </el-col> -->
90 <el-col :span="8"> 90 <!-- <el-col :span="8">
91 <el-form-item label="不动产权证号:"> 91 <el-form-item label="不动产权证号:">
92 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 92 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
93 </el-form-item> 93 </el-form-item>
94 </el-col> 94 </el-col> -->
95 <el-col :span="8"> 95 <el-col :span="8">
96 <el-form-item label="区县代码:"> 96 <el-form-item label="区县代码:">
97 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 97 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
...@@ -128,42 +128,42 @@ ...@@ -128,42 +128,42 @@
128 128
129 <el-col :span="8"> 129 <el-col :span="8">
130 <el-form-item label="异议事项"> 130 <el-form-item label="异议事项">
131 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 131 <el-input v-model="ruleForm.yydj.yysx"></el-input>
132 </el-form-item> 132 </el-form-item>
133 </el-col> 133 </el-col>
134 <el-col :span="8"> 134 <el-col :span="8">
135 <el-form-item label="不动产登记证明号"> 135 <el-form-item label="不动产登记证明号">
136 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 136 <el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
137 </el-form-item> 137 </el-form-item>
138 </el-col> 138 </el-col>
139 <el-col :span="8"> 139 <el-col :span="8">
140 <el-form-item label="登记时间:"> 140 <el-form-item label="注销异议业务号">
141 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 141 <el-input v-model="ruleForm.yydj.zxyyywh"></el-input>
142 </el-form-item> 142 </el-form-item>
143 </el-col> 143 </el-col>
144 <el-col :span="8"> 144 <el-col :span="8">
145 <el-form-item label="登记时间:"> 145 <el-form-item label="注销异议原因">
146 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 146 <el-input v-model="ruleForm.yydj.zxyyyy"></el-input>
147 </el-form-item> 147 </el-form-item>
148 </el-col> 148 </el-col>
149 <el-col :span="8"> 149 <el-col :span="8">
150 <el-form-item label="登记时间:"> 150 <el-form-item label="注销异议登簿人">
151 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 151 <el-input v-model="ruleForm.yydj.zxyydbr"></el-input>
152 </el-form-item> 152 </el-form-item>
153 </el-col> 153 </el-col>
154 <el-col :span="8"> 154 <el-col :span="8">
155 <el-form-item label="登记时间:"> 155 <el-form-item label="注销异议登记时间">
156 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 156 <el-input v-model="ruleForm.yydj.zxyydjsj"></el-input>
157 </el-form-item> 157 </el-form-item>
158 </el-col> 158 </el-col>
159 <el-col :span="8"> 159 <el-col :span="8">
160 <el-form-item label="登记时间:"> 160 <el-form-item label="登记时间:">
161 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 161 <el-input v-model="ruleForm.yydj.djsj"></el-input>
162 </el-form-item> 162 </el-form-item>
163 </el-col> 163 </el-col>
164 <el-col :span="24"> 164 <el-col :span="24">
165 <el-form-item label="附记:"> 165 <el-form-item label="附记:">
166 <el-input v-model="ruleForm.qlxx.fj"></el-input> 166 <el-input v-model="ruleForm.yydj.fj"></el-input>
167 </el-form-item> 167 </el-form-item>
168 </el-col> 168 </el-col>
169 </el-row> 169 </el-row>
...@@ -252,8 +252,9 @@ export default { ...@@ -252,8 +252,9 @@ export default {
252 mounted() {}, 252 mounted() {},
253 methods: { 253 methods: {
254 loadData() { 254 loadData() {
255 console.log("预告登记", this.propsParam); 255 console.log("异议登记", this.propsParam);
256 init(this.propsParam.bsmRepair).then((res) => { 256 this.propsParam.isEdit=this.$parent.isEdit
257 init(this.propsParam).then((res) => {
257 if (res.code == 200) { 258 if (res.code == 200) {
258 this.ruleForm = res.result; 259 this.ruleForm = res.result;
259 console.log("this.ruleForm", this.ruleForm); 260 console.log("this.ruleForm", this.ruleForm);
......
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
109 qllx: this.$route.query.qllx, 109 qllx: this.$route.query.qllx,
110 //设置那个表单选中 110 //设置那个表单选中
111 tabName: "", 111 tabName: "",
112 isEdit:true,
112 // 弹框显示 113 // 弹框显示
113 dialogVisible: true, 114 dialogVisible: true,
114 //表单集合 115 //表单集合
...@@ -214,7 +215,7 @@ export default { ...@@ -214,7 +215,7 @@ export default {
214 }, 215 },
215 //切换选项卡内容组件 216 //切换选项卡内容组件
216 getFromRouter(tabname) { 217 getFromRouter(tabname) {
217 console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList); 218 console.log("切换选项卡内容组件", tabname,this.tabList);
218 this.componentTag = getForm(tabname); 219 this.componentTag = getForm(tabname);
219 }, 220 },
220 closefp() { 221 closefp() {
......
...@@ -111,6 +111,7 @@ export default { ...@@ -111,6 +111,7 @@ export default {
111 tabName: "", 111 tabName: "",
112 // 弹框显示 112 // 弹框显示
113 dialogVisible: true, 113 dialogVisible: true,
114 isEdit:false,
114 //表单集合 115 //表单集合
115 tabList: [], 116 tabList: [],
116 type: "READ_ONLY", 117 type: "READ_ONLY",
...@@ -216,11 +217,9 @@ export default { ...@@ -216,11 +217,9 @@ export default {
216 }, 217 },
217 //切换选项卡内容组件 218 //切换选项卡内容组件
218 getFromRouter(tabname) { 219 getFromRouter(tabname) {
219 console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList);
220 this.componentTag = getForm(tabname); 220 this.componentTag = getForm(tabname);
221 }, 221 },
222 closefp() { 222 closefp() {
223 console.log("点击分屏");
224 this.splitScreen = this.splitScreen ? false : true; 223 this.splitScreen = this.splitScreen ? false : true;
225 this.$store.dispatch("app/set1tScreen", this.splitScreen); 224 this.$store.dispatch("app/set1tScreen", this.splitScreen);
226 this.getFromRouter(this.tabList[0].value); 225 this.getFromRouter(this.tabList[0].value);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-21 15:34:44 4 * @LastEditTime: 2023-07-04 16:05:44
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </div> 33 </div>
34 </div> 34 </div>
35 </div> 35 </div>
36 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 36 <image-preview ref='imageRef' v-if="tableData.length>0" :ableOperation="ableOperation" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
37 @prevPriview="prevPriview" /> 37 @prevPriview="prevPriview" />
38 </div> 38 </div>
39 </div> 39 </div>
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
49 components: { clxxAddDialog, imagePreview }, 49 components: { clxxAddDialog, imagePreview },
50 data () { 50 data () {
51 return { 51 return {
52 //表单是否可操作
53 ableOperation: true,
52 isDialog: false, 54 isDialog: false,
53 menuList: [ 55 menuList: [
54 { 56 {
...@@ -214,6 +216,7 @@ ...@@ -214,6 +216,7 @@
214 ...mapGetters(["dictData"]) 216 ...mapGetters(["dictData"])
215 }, 217 },
216 created () { 218 created () {
219 this.ableOperation = this.$parent.currentSelectTab.ableOperation
217 this.clmlInitList() 220 this.clmlInitList()
218 }, 221 },
219 methods: { 222 methods: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-21 16:29:37 4 * @LastEditTime: 2023-07-05 09:55:42
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
22 </div> 22 </div>
23 </div> 23 </div>
24 </div> 24 </div>
25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button> 25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()"
26 v-if="!this.$route.query.viewtype && ableOperation">新增</el-button>
26 </div> 27 </div>
27 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 28 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" :ableOperation="ableOperation" @updateList="updateList"
29 @nextPriview="nextPriview"
28 @prevPriview="prevPriview" /> 30 @prevPriview="prevPriview" />
29 </div> 31 </div>
30 </div> 32 </div>
...@@ -42,6 +44,8 @@ ...@@ -42,6 +44,8 @@
42 components: { clxxAddDialog, imagePreview, clxxDetailDialog }, 44 components: { clxxAddDialog, imagePreview, clxxDetailDialog },
43 data () { 45 data () {
44 return { 46 return {
47 //表单是否可操作
48 ableOperation: true,
45 isDialog: false, 49 isDialog: false,
46 iclass: "", 50 iclass: "",
47 // 材料目录选中 51 // 材料目录选中
...@@ -63,6 +67,7 @@ ...@@ -63,6 +67,7 @@
63 ...mapGetters(["dictData"]) 67 ...mapGetters(["dictData"])
64 }, 68 },
65 created () { 69 created () {
70 this.ableOperation = this.$parent?.currentSelectTab?.ableOperation || false
66 this.clmlInitList(1) 71 this.clmlInitList(1)
67 }, 72 },
68 methods: { 73 methods: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-30 14:32:40 4 * @LastEditTime: 2023-07-04 15:04:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 <script> 20 <script>
21 import { datas } from "../../javascript/zsyl.js"; 21 import { datas } from "../../javascript/zsyl.js";
22 import { getSlsqBdcqzList } from "@/api/bdcqz.js" 22 import { getSlsqBdcqzList } from "@/api/bdcqz.js"
23 import { log } from 'bpmn-js-token-simulation';
23 export default { 24 export default {
24 name: "zsyl", 25 name: "zsyl",
25 props: { 26 props: {
...@@ -57,7 +58,6 @@ ...@@ -57,7 +58,6 @@
57 } 58 }
58 }, 59 },
59 mounted () { 60 mounted () {
60 debugger
61 this.columns = datas.columns(); 61 this.columns = datas.columns();
62 if (this.formData.bdcqz) { 62 if (this.formData.bdcqz) {
63 //从缮证进入 63 //从缮证进入
......
...@@ -65,9 +65,10 @@ ...@@ -65,9 +65,10 @@
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="创建时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
69 <el-table-column label="办结时间" prop="endTime" width="160" align="center" /> 69 <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
70 <el-table-column label="操作方式" prop="businessName" align="center"/> 70 <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
71 <el-table-column label="操作方式" prop="controls" align="center"/>
71 <el-table-column label="意见" prop="idea" align="center"/> 72 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 73 </el-table>
73 </div> 74 </div>
...@@ -118,6 +119,14 @@ ...@@ -118,6 +119,14 @@
118 this.clearViewer() 119 this.clearViewer()
119 }, 120 },
120 methods: { 121 methods: {
122 formatDate(row, column) {
123 let data = row[column.property]
124 if(data == null) {
125 return null
126 }
127 let dt = new Date(data)
128 return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
129 },
121 processReZoom () { 130 processReZoom () {
122 this.defaultZoom = 1 131 this.defaultZoom = 1
123 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto') 132 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
...@@ -240,6 +249,7 @@ ...@@ -240,6 +249,7 @@
240 item.comments.forEach(element => { 249 item.comments.forEach(element => {
241 if(element.type=="COMPLETE"){ 250 if(element.type=="COMPLETE"){
242 this.formData.allCommentList[index].idea=element.message 251 this.formData.allCommentList[index].idea=element.message
252 this.formData.allCommentList[index].controls="完成"
243 } 253 }
244 }); 254 });
245 this.formData.allCommentList[index].agent=item.assignee.name 255 this.formData.allCommentList[index].agent=item.assignee.name
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 14:42:24 4 * @LastEditTime: 2023-07-05 09:58:31
5 */ 5 */
6 import { getForm } from "../flowform"; 6 import { getForm } from "../flowform";
7 import { getHomeNoticeList } from "@/api/home.js" 7 import { getHomeNoticeList } from "@/api/home.js"
...@@ -38,6 +38,7 @@ export default { ...@@ -38,6 +38,7 @@ export default {
38 for (let item of this.tabList) { 38 for (let item of this.tabList) {
39 if (item.value === tabname) { 39 if (item.value === tabname) {
40 this.currentSelectTab = item 40 this.currentSelectTab = item
41 console.log(item, 'item11111111111');
41 break; 42 break;
42 } 43 }
43 } 44 }
......
...@@ -86,64 +86,64 @@ ...@@ -86,64 +86,64 @@
86 <el-row :gutter="10"> 86 <el-row :gutter="10">
87 <el-col :span="8"> 87 <el-col :span="8">
88 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:"> 88 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:">
89 <el-input disabled v-model="ruleForm.ssQlxx.qllxmc"></el-input> 89 <el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
90 </el-form-item> 90 </el-form-item>
91 </el-col> 91 </el-col>
92 92
93 <el-col :span="8"> 93 <el-col :span="8">
94 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号:" prop="qlxx.bdcqzh"> 94 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号:" prop="qlxx.bdcqzh">
95 <el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input> 95 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
96 </el-form-item> 96 </el-form-item>
97 </el-col> 97 </el-col>
98 <el-col :span="8"> 98 <el-col :span="8">
99 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有情况:"> 99 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有情况:">
100 <el-input disabled v-model="ruleForm.ssQlxx.gyqk"></el-input> 100 <el-input disabled v-model="ruleForm.ztQlxx.gyqk"></el-input>
101 </el-form-item> 101 </el-form-item>
102 </el-col> 102 </el-col>
103 </el-row> 103 </el-row>
104 <el-row :gutter="10"> 104 <el-row :gutter="10">
105 <el-col :span="8"> 105 <el-col :span="8">
106 <el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人:" prop="qlxx.qlrmc"> 106 <el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人:" prop="qlxx.qlrmc">
107 <el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input> 107 <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
108 </el-form-item> 108 </el-form-item>
109 </el-col> 109 </el-col>
110 <el-col :span="8"> 110 <el-col :span="8">
111 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类:"> 111 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类:">
112 <el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input> 112 <el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 <el-col :span="8"> 115 <el-col :span="8">
116 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号:"> 116 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号:">
117 <el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input> 117 <el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
120 </el-row> 120 </el-row>
121 <el-row :gutter="10"> 121 <el-row :gutter="10">
122 <el-col :span="8"> 122 <el-col :span="8">
123 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号:" prop="qlxx.bdcdyh"> 123 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号:" prop="qlxx.bdcdyh">
124 <el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input> 124 <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
125 </el-form-item> 125 </el-form-item>
126 </el-col> 126 </el-col>
127 <el-col :span="16"> 127 <el-col :span="16">
128 <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落:"> 128 <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落:">
129 <el-input disabled v-model="ruleForm.ssQlxx.zl"></el-input> 129 <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
130 </el-form-item> 130 </el-form-item>
131 </el-col> 131 </el-col>
132 </el-row> 132 </el-row>
133 <el-row :gutter="10"> 133 <el-row :gutter="10">
134 <el-col :span="8"> 134 <el-col :span="8">
135 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质:"> 135 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质:">
136 <el-input disabled v-model="ruleForm.ssQlxx.qlxzmc"></el-input> 136 <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
137 </el-form-item> 137 </el-form-item>
138 </el-col> 138 </el-col>
139 <el-col :span="8"> 139 <el-col :span="8">
140 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途:"> 140 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途:">
141 <el-input disabled v-model="ruleForm.ssQlxx.ytmc"></el-input> 141 <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
142 </el-form-item> 142 </el-form-item>
143 </el-col> 143 </el-col>
144 <el-col :span="8"> 144 <el-col :span="8">
145 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积:"> 145 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积:">
146 <el-input disabled v-model="ruleForm.ssQlxx.mjmc"></el-input> 146 <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
147 </el-form-item> 147 </el-form-item>
148 </el-col> 148 </el-col>
149 </el-row> 149 </el-row>
......
...@@ -274,10 +274,10 @@ ...@@ -274,10 +274,10 @@
274 formdata.append("isEdit", this.ableOperation); 274 formdata.append("isEdit", this.ableOperation);
275 Init(formdata).then((res) => { 275 Init(formdata).then((res) => {
276 if (res.code === 200 && res.result) { 276 if (res.code === 200 && res.result) {
277 this.ruleForm = res.result; 277 this.ruleForm = res.result;
278 this.$endLoading();
279 this.ruleForm.diyaq.sfczjzhxz = "0"; 278 this.ruleForm.diyaq.sfczjzhxz = "0";
280 } 279 }
280 this.$endLoading();
281 }) 281 })
282 }, 282 },
283 components: { qlrCommonTable }, 283 components: { qlrCommonTable },
......
...@@ -130,6 +130,14 @@ ...@@ -130,6 +130,14 @@
130 </el-form-item> 130 </el-form-item>
131 </el-col> 131 </el-col>
132 </el-row> 132 </el-row>
133 <div class="slxx_title title-block">
134 土地用途
135 <div class="triangle"></div>
136 </div>
137 <tdytTable
138 :tableData="ruleForm.tdytqxList"
139 @upDateTdytxxList="upDateTdytxxList"
140 />
133 <div class="slxx_title title-block"> 141 <div class="slxx_title title-block">
134 权利人信息 142 权利人信息
135 <div class="triangle"></div> 143 <div class="triangle"></div>
...@@ -207,6 +215,7 @@ ...@@ -207,6 +215,7 @@
207 </template> 215 </template>
208 <script> 216 <script>
209 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 217 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
218 import tdytTable from "@/views/workflow/components/tdytTable";
210 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js"; 219 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
211 import { mapGetters } from "vuex"; 220 import { mapGetters } from "vuex";
212 export default { 221 export default {
...@@ -228,7 +237,7 @@ ...@@ -228,7 +237,7 @@
228 } 237 }
229 }); 238 });
230 }, 239 },
231 components: { qlrCommonTable }, 240 components: { qlrCommonTable,tdytTable },
232 computed: { 241 computed: {
233 ...mapGetters(["dictData", "flag"]), 242 ...mapGetters(["dictData", "flag"]),
234 }, 243 },
...@@ -246,6 +255,12 @@ ...@@ -246,6 +255,12 @@
246 } 255 }
247 }, 256 },
248 methods: { 257 methods: {
258 // 更新土地用途信息
259 upDateTdytxxList(val) {
260 console.log("VAL", val);
261 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
262 this.key++;
263 },
249 // 更新权利人信息 264 // 更新权利人信息
250 upDateQlrxxList (val) { 265 upDateQlrxxList (val) {
251 this.ruleForm.qlrList = _.cloneDeep(val); 266 this.ruleForm.qlrList = _.cloneDeep(val);
...@@ -258,6 +273,7 @@ ...@@ -258,6 +273,7 @@
258 this.ruleForm.ywrList = _.cloneDeep(val); 273 this.ruleForm.ywrList = _.cloneDeep(val);
259 }, 274 },
260 onSubmit () { 275 onSubmit () {
276 console.log("this.ruleForm",);
261 saveData(this.ruleForm).then((res) => { 277 saveData(this.ruleForm).then((res) => {
262 if (res.code === 200) { 278 if (res.code === 200) {
263 this.$message({ 279 this.$message({
......
...@@ -133,6 +133,14 @@ ...@@ -133,6 +133,14 @@
133 </el-form-item> 133 </el-form-item>
134 </el-col> 134 </el-col>
135 </el-row> 135 </el-row>
136 <div class="slxx_title title-block">
137 土地用途
138 <div class="triangle"></div>
139 </div>
140 <tdytTable
141 :tableData="ruleForm.tdytqxList"
142 @upDateTdytxxList="upDateTdytxxList"
143 />
136 <div class="slxx_title title-block"> 144 <div class="slxx_title title-block">
137 权利人信息 145 权利人信息
138 <div class="triangle"></div> 146 <div class="triangle"></div>
...@@ -191,6 +199,7 @@ ...@@ -191,6 +199,7 @@
191 </template> 199 </template>
192 <script> 200 <script>
193 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 201 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
202 import tdytTable from "@/views/workflow/components/tdytTable";
194 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js"; 203 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
195 import { mapGetters } from "vuex"; 204 import { mapGetters } from "vuex";
196 export default { 205 export default {
...@@ -214,7 +223,7 @@ ...@@ -214,7 +223,7 @@
214 } 223 }
215 }); 224 });
216 }, 225 },
217 components: { qlrCommonTable }, 226 components: { qlrCommonTable,tdytTable },
218 computed: { 227 computed: {
219 ...mapGetters(["dictData", "flag"]), 228 ...mapGetters(["dictData", "flag"]),
220 }, 229 },
...@@ -272,6 +281,12 @@ ...@@ -272,6 +281,12 @@
272 } 281 }
273 }); 282 });
274 }, 283 },
284 // 更新土地用途信息
285 upDateTdytxxList(val) {
286 console.log("VAL", val);
287 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
288 this.key++;
289 },
275 // 更新权利人信息 290 // 更新权利人信息
276 upDateQlrxxList (val) { 291 upDateQlrxxList (val) {
277 this.ruleForm.qlrList = _.cloneDeep(val); 292 this.ruleForm.qlrList = _.cloneDeep(val);
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
139 <el-col> 139 <el-col>
140 <el-form-item v-if="ruleForm.slsq" label="登记原因:" prop="djyy"> 140 <el-form-item v-if="ruleForm.slsq" label="登记原因:" prop="djyy">
141 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" 141 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
142 v-model="ruleForm.slsq.djyy"> 142 v-model="ruleForm.fdcq2List[0].djyy">
143 </el-input> 143 </el-input>
144 </el-form-item> 144 </el-form-item>
145 </el-col> 145 </el-col>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-25 08:58:04 4 * @LastEditTime: 2023-05-25 08:58:04
5 --> 5 -->
...@@ -124,6 +124,14 @@ ...@@ -124,6 +124,14 @@
124 </el-form-item> 124 </el-form-item>
125 </el-col> 125 </el-col>
126 </el-row> 126 </el-row>
127 <div class="slxx_title title-block">
128 土地用途
129 <div class="triangle"></div>
130 </div>
131 <tdytTable
132 :tableData="ruleForm.tdytqxList"
133 @upDateTdytxxList="upDateTdytxxList"
134 />
127 <div class="slxx_title title-block"> 135 <div class="slxx_title title-block">
128 权利人信息 136 权利人信息
129 <div class="triangle"></div> 137 <div class="triangle"></div>
...@@ -179,6 +187,7 @@ ...@@ -179,6 +187,7 @@
179 </template> 187 </template>
180 <script> 188 <script>
181 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 189 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
190 import tdytTable from "@/views/workflow/components/tdytTable";
182 import { Init } from "@/api/workflow/fwsyqFlow.js"; 191 import { Init } from "@/api/workflow/fwsyqFlow.js";
183 import { mapGetters } from "vuex"; 192 import { mapGetters } from "vuex";
184 export default { 193 export default {
...@@ -198,7 +207,7 @@ ...@@ -198,7 +207,7 @@
198 } 207 }
199 }); 208 });
200 }, 209 },
201 components: { qlrCommonTable }, 210 components: { qlrCommonTable,tdytTable },
202 computed: { 211 computed: {
203 ...mapGetters(["dictData", "flag"]), 212 ...mapGetters(["dictData", "flag"]),
204 }, 213 },
...@@ -247,6 +256,12 @@ ...@@ -247,6 +256,12 @@
247 }; 256 };
248 }, 257 },
249 methods: { 258 methods: {
259 // 更新土地用途信息
260 upDateTdytxxList(val) {
261 console.log("VAL", val);
262 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
263 this.key++;
264 },
250 list (bsmSldy) { 265 list (bsmSldy) {
251 var formdata = new FormData(); 266 var formdata = new FormData();
252 formdata.append("bsmSldy", bsmSldy); 267 formdata.append("bsmSldy", bsmSldy);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-25 08:59:02 4 * @LastEditTime: 2023-05-25 08:59:02
5 --> 5 -->
...@@ -125,6 +125,14 @@ ...@@ -125,6 +125,14 @@
125 </el-form-item> 125 </el-form-item>
126 </el-col> 126 </el-col>
127 </el-row> 127 </el-row>
128 <div class="slxx_title title-block">
129 土地用途
130 <div class="triangle"></div>
131 </div>
132 <tdytTable
133 :tableData="ruleForm.tdytqxList"
134 @upDateTdytxxList="upDateTdytxxList"
135 />
128 <div class="slxx_title title-block"> 136 <div class="slxx_title title-block">
129 权利人信息 137 权利人信息
130 <div class="triangle"></div> 138 <div class="triangle"></div>
...@@ -194,6 +202,7 @@ ...@@ -194,6 +202,7 @@
194 <script> 202 <script>
195 import { mapGetters } from "vuex" 203 import { mapGetters } from "vuex"
196 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js" 204 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"
205 import tdytTable from "@/views/workflow/components/tdytTable";
197 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable" 206 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
198 export default { 207 export default {
199 mounted () { 208 mounted () {
...@@ -214,7 +223,7 @@ ...@@ -214,7 +223,7 @@
214 }) 223 })
215 }) 224 })
216 }, 225 },
217 components: { qlrCommonTable }, 226 components: { qlrCommonTable,tdytTable },
218 computed: { 227 computed: {
219 ...mapGetters(["dictData", "flag"]) 228 ...mapGetters(["dictData", "flag"])
220 }, 229 },
...@@ -233,6 +242,12 @@ ...@@ -233,6 +242,12 @@
233 } 242 }
234 }, 243 },
235 methods: { 244 methods: {
245 // 更新土地用途信息
246 upDateTdytxxList(val) {
247 console.log("VAL", val);
248 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
249 this.key++;
250 },
236 // 更新权利人信息 251 // 更新权利人信息
237 upDateQlrxxList (val) { 252 upDateQlrxxList (val) {
238 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)) 253 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
...@@ -281,6 +296,7 @@ ...@@ -281,6 +296,7 @@
281 }) 296 })
282 } 297 }
283 } 298 }
299 console.log("this.ruleFormmmmmmmmm",this.ruleForm);
284 saveData(this.ruleForm).then((res) => { 300 saveData(this.ruleForm).then((res) => {
285 if (res.code === 200) { 301 if (res.code === 200) {
286 this.$message({ 302 this.$message({
...@@ -304,4 +320,4 @@ ...@@ -304,4 +320,4 @@
304 <style scoped lang='scss'> 320 <style scoped lang='scss'>
305 @import "~@/styles/public.scss"; 321 @import "~@/styles/public.scss";
306 @import "~@/styles/slxx/slxx.scss"; 322 @import "~@/styles/slxx/slxx.scss";
307 </style>
...\ No newline at end of file ...\ No newline at end of file
323 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-25 08:59:49 4 * @LastEditTime: 2023-05-25 08:59:49
5 --> 5 -->
...@@ -127,6 +127,14 @@ ...@@ -127,6 +127,14 @@
127 </el-form-item> 127 </el-form-item>
128 </el-col> 128 </el-col>
129 </el-row> 129 </el-row>
130 <div class="slxx_title title-block">
131 土地用途
132 <div class="triangle"></div>
133 </div>
134 <tdytTable
135 :tableData="ruleForm.tdytqxList"
136 @upDateTdytxxList="upDateTdytxxList"
137 />
130 <div class="slxx_title title-block"> 138 <div class="slxx_title title-block">
131 权利人信息 139 权利人信息
132 <div class="triangle"></div> 140 <div class="triangle"></div>
...@@ -189,6 +197,7 @@ ...@@ -189,6 +197,7 @@
189 <script> 197 <script>
190 import { mapGetters } from "vuex"; 198 import { mapGetters } from "vuex";
191 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 199 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
200 import tdytTable from "@/views/workflow/components/tdytTable";
192 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"; 201 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
193 export default { 202 export default {
194 mounted () { 203 mounted () {
...@@ -206,7 +215,7 @@ ...@@ -206,7 +215,7 @@
206 this.$endLoading(); 215 this.$endLoading();
207 }); 216 });
208 }, 217 },
209 components: { qlrCommonTable }, 218 components: { qlrCommonTable,tdytTable },
210 computed: { 219 computed: {
211 ...mapGetters(["dictData", "flag"]) 220 ...mapGetters(["dictData", "flag"])
212 }, 221 },
...@@ -228,6 +237,12 @@ ...@@ -228,6 +237,12 @@
228 }; 237 };
229 }, 238 },
230 methods: { 239 methods: {
240 // 更新土地用途信息
241 upDateTdytxxList(val) {
242 console.log("VAL", val);
243 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
244 this.key++;
245 },
231 // 更新权利人信息 246 // 更新权利人信息
232 upDateQlrxxList (val) { 247 upDateQlrxxList (val) {
233 this.ruleForm.qlrList = _.cloneDeep(val); 248 this.ruleForm.qlrList = _.cloneDeep(val);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-29 11:13:35 4 * @LastEditTime: 2023-07-04 16:23:54
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -88,41 +88,41 @@ ...@@ -88,41 +88,41 @@
88 <el-row :gutter="10"> 88 <el-row :gutter="10">
89 <el-col :span="8"> 89 <el-col :span="8">
90 <el-form-item label="农用地面积:"> 90 <el-form-item label="农用地面积:">
91 <el-input v-model="ruleForm.tdsyq.nydmj"></el-input> 91 <el-input v-model="ruleForm.tdsyq.nydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 <el-col :span="8"> 94 <el-col :span="8">
95 <el-form-item label="耕地面积:"> 95 <el-form-item label="耕地面积:">
96 <el-input v-model="ruleForm.tdsyq.gdmj"></el-input> 96 <el-input v-model="ruleForm.tdsyq.gdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
97 </el-form-item> 97 </el-form-item>
98 </el-col> 98 </el-col>
99 <el-col :span="8"> 99 <el-col :span="8">
100 <el-form-item label="林地面积:"> 100 <el-form-item label="林地面积:">
101 <el-input v-model="ruleForm.tdsyq.ldmj"></el-input> 101 <el-input v-model="ruleForm.tdsyq.ldmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
102 </el-form-item> 102 </el-form-item>
103 </el-col> 103 </el-col>
104 </el-row> 104 </el-row>
105 <el-row :gutter="10"> 105 <el-row :gutter="10">
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="草地面积:"> 107 <el-form-item label="草地面积:">
108 <el-input v-model="ruleForm.tdsyq.cdmj"></el-input> 108 <el-input v-model="ruleForm.tdsyq.cdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
109 </el-form-item> 109 </el-form-item>
110 </el-col> 110 </el-col>
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="其他农用地面积:"> 112 <el-form-item label="其他农用地面积:">
113 <el-input v-model="ruleForm.tdsyq.qtnydmj"></el-input> 113 <el-input v-model="ruleForm.tdsyq.qtnydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
114 </el-form-item> 114 </el-form-item>
115 </el-col> 115 </el-col>
116 <el-col :span="8"> 116 <el-col :span="8">
117 <el-form-item label="建筑使用面积:"> 117 <el-form-item label="建筑使用面积:">
118 <el-input v-model="ruleForm.tdsyq.jsydmj"></el-input> 118 <el-input v-model="ruleForm.tdsyq.jsydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
119 </el-form-item> 119 </el-form-item>
120 </el-col> 120 </el-col>
121 </el-row> 121 </el-row>
122 <el-row :gutter="10"> 122 <el-row :gutter="10">
123 <el-col :span="8"> 123 <el-col :span="8">
124 <el-form-item label="未利用地面积:"> 124 <el-form-item label="未利用地面积:">
125 <el-input v-model="ruleForm.tdsyq.wlydmj"></el-input> 125 <el-input v-model="ruleForm.tdsyq.wlydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
126 </el-form-item> 126 </el-form-item>
127 </el-col> 127 </el-col>
128 <el-col :span="8"> 128 <el-col :span="8">
...@@ -141,7 +141,14 @@ ...@@ -141,7 +141,14 @@
141 </el-col> 141 </el-col>
142 142
143 </el-row> 143 </el-row>
144 144 <div class="slxx_title title-block">
145 土地用途
146 <div class="triangle"></div>
147 </div>
148 <tdytTable
149 :tableData="ruleForm.tdytqxList"
150 @upDateTdytxxList="upDateTdytxxList"
151 />
145 <div class="slxx_title title-block"> 152 <div class="slxx_title title-block">
146 权利人信息 153 权利人信息
147 <div class="triangle"></div> 154 <div class="triangle"></div>
...@@ -211,10 +218,11 @@ ...@@ -211,10 +218,11 @@
211 <script> 218 <script>
212 import { mapGetters } from "vuex" 219 import { mapGetters } from "vuex"
213 import { Init, saveData } from "@/api/workflow/tdsyqFlow.js" 220 import { Init, saveData } from "@/api/workflow/tdsyqFlow.js"
221 import tdytTable from "@/views/workflow/components/tdytTable";
214 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable" 222 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
215 import selectTable from '@/components/selectTable/index.vue' 223 import selectTable from '@/components/selectTable/index.vue'
216 export default { 224 export default {
217 components: { qlrCommonTable, selectTable }, 225 components: { qlrCommonTable, selectTable,tdytTable },
218 mounted () { 226 mounted () {
219 this.ableOperation = this.$parent.currentSelectTab.ableOperation 227 this.ableOperation = this.$parent.currentSelectTab.ableOperation
220 this.propsParam = this.$attrs; 228 this.propsParam = this.$attrs;
...@@ -262,7 +270,12 @@ ...@@ -262,7 +270,12 @@
262 } 270 }
263 }, 271 },
264 methods: { 272 methods: {
265 change () { }, 273 // 更新土地用途信息
274 upDateTdytxxList(val) {
275 console.log("VAL", val);
276 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
277 this.key++;
278 },
266 // 更新权利人信息 279 // 更新权利人信息
267 upDateQlrxxList (val) { 280 upDateQlrxxList (val) {
268 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)) 281 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
......
...@@ -198,10 +198,9 @@ ...@@ -198,10 +198,9 @@
198 "/djbworkFrameview?bsmSlsq=" + 198 "/djbworkFrameview?bsmSlsq=" +
199 item.bsmSlsq + 199 item.bsmSlsq +
200 "&bestepid=" + 200 "&bestepid=" +
201 item.bestepid + 201 item.bestepid+
202 "&bsmBusiness=" + 202 "&isEdit=" +
203 "&sqywbm=" + 203 true
204 item.djywbm
205 ); 204 );
206 window.open(href, `urlname${item.bsmSlsq}`); 205 window.open(href, `urlname${item.bsmSlsq}`);
207 }else{ 206 }else{
......
...@@ -256,12 +256,12 @@ ...@@ -256,12 +256,12 @@
256 type: 'success' 256 type: 'success'
257 }) 257 })
258 store.dispatch('user/refreshPage', true); 258 store.dispatch('user/refreshPage', true);
259 this.$popupCacel()
259 } else { 260 } else {
260 this.$message.error(res.message); 261 this.$message.error(res.message);
261 } 262 }
262 }) 263 })
263 } 264 }
264 this.$popupCacel()
265 }, 265 },
266 handleSelectionChange (val) { 266 handleSelectionChange (val) {
267 this.bdcdysz = val 267 this.bdcdysz = val
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 </div> 30 </div>
31 <!-- 一并申请 --> 31 <!-- 一并申请 -->
32 <div v-if="selectType == 'together'" class="right-situation el-card"> 32 <div v-if="selectType == 'together'" class="right-situation el-card">
33 <div class="right-title">一并申请</div> 33 <div class="right-title">一并申请</div>
34 <ul> 34 <ul>
35 <li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index" 35 <li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
36 @dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)"> 36 @dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)">
37 <dt>{{ item.nodename }}</dt> 37 <dt>{{ item.nodename }}</dt>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 </div> 91 </div>
92 </template> 92 </template>
93 <script> 93 <script>
94 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz,getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl" 94 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
95 export default { 95 export default {
96 data () { 96 data () {
97 return { 97 return {
...@@ -147,13 +147,13 @@ ...@@ -147,13 +147,13 @@
147 if (this.selectType == 'amend') { 147 if (this.selectType == 'amend') {
148 this.getRepairBiz(); 148 this.getRepairBiz();
149 } 149 }
150 if (this.selectType == 'together') { 150 if (this.selectType == 'together') {
151 getTogetherBiz().then(res => { 151 getTogetherBiz().then(res => {
152 if (res) { 152 if (res) {
153 console.log("res", res); 153 console.log("res", res);
154 this.djqxList = res.result; 154 this.djqxList = res.result;
155 } 155 }
156 }) 156 })
157 } 157 }
158 }, 158 },
159 //权利类型菜单事件 159 //权利类型菜单事件
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 }, 24 },
25 mounted () { 25 mounted () {
26 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) { 26 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
27 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm,this.formData?.sqywInfo?.nodecode || this.formData?.nodecode); 27 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
28 this.router = this.loadView(view); 28 this.router = this.loadView(view);
29 } else { 29 } else {
30 let view = queueDjywmc(this.$route.query?.sqywbm); 30 let view = queueDjywmc(this.$route.query?.sqywbm);
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
33 }, 33 },
34 methods: { 34 methods: {
35 loadView (view) { 35 loadView (view) {
36 console.log(view, 'view');
36 return (r) => 37 return (r) =>
37 require.ensure([], () => r(require(`./components/${view}.vue`))); 38 require.ensure([], () => r(require(`./components/${view}.vue`)));
38 }, 39 },
......