5a6462fc by yangwei

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

2 parents f808eb02 a036215b
Showing 70 changed files with 1607 additions and 680 deletions
...@@ -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
...@@ -103,3 +128,15 @@ export function save (data) { ...@@ -103,3 +128,15 @@ export function save (data) {
103 data 128 data
104 }) 129 })
105 } 130 }
131 /**
132 * @description: 添加审核意见
133 * @param {*} data
134 * @author: renchao
135 */
136 export function addidea (data) {
137 return request({
138 url: SERVER.SERVERAPI + '/rest/djbRepair/sh',
139 method: 'post',
140 data
141 })
142 }
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
21 </transition> 21 </transition>
22 </template> 22 </template>
23 <script> 23 <script>
24 import Popup1 from './index' 24 import Popup1 from './index'
25 export default { 25 export default {
26 name: 'index', 26 name: 'index',
27 data () { 27 data () {
28 return { 28 return {
...@@ -98,13 +98,13 @@ export default { ...@@ -98,13 +98,13 @@ export default {
98 this.$el.parentNode.removeChild(this.$el); 98 this.$el.parentNode.removeChild(this.$el);
99 } 99 }
100 } 100 }
101 } 101 }
102 </script> 102 </script>
103 <style scoped lang="scss" > 103 <style scoped lang="scss" >
104 @import "~@/styles/mixin.scss"; 104 @import "~@/styles/mixin.scss";
105 @import "~@/styles/dialogBox.scss"; 105 @import "~@/styles/dialogBox.scss";
106 106
107 .ls-mask { 107 .ls-mask {
108 width: 100%; 108 width: 100%;
109 height: 100%; 109 height: 100%;
110 z-index: 500; 110 z-index: 500;
...@@ -112,10 +112,9 @@ export default { ...@@ -112,10 +112,9 @@ export default {
112 left: 0; 112 left: 0;
113 top: 0; 113 top: 0;
114 background: rgba(0, 0, 0, 0.3); 114 background: rgba(0, 0, 0, 0.3);
115 }
115 116
116 } 117 .ls-mask-window {
117
118 .ls-mask-window {
119 background: white; 118 background: white;
120 position: relative; 119 position: relative;
121 left: 50%; 120 left: 50%;
...@@ -124,32 +123,32 @@ export default { ...@@ -124,32 +123,32 @@ export default {
124 transform: translate(-50%, -50%); 123 transform: translate(-50%, -50%);
125 border-radius: 5px; 124 border-radius: 5px;
126 overflow: hidden; 125 overflow: hidden;
127 } 126 }
128 127
129 .ls-mask-window b { 128 .ls-mask-window b {
130 padding-left: 5px; 129 padding-left: 5px;
131 } 130 }
132 131
133 .ls-title { 132 .ls-title {
134 padding: 16px; 133 padding: 16px;
135 color: #ffffff; 134 color: #ffffff;
136 background: linear-gradient(3deg, #409EFF, #a7cbee); 135 background: linear-gradient(3deg, #409eff, #a7cbee);
137 font-size: 16px; 136 font-size: 16px;
138 } 137 }
139 138
140 .ls-title .svg-icon { 139 .ls-title .svg-icon {
141 font-size: 18px; 140 font-size: 18px;
142 } 141 }
143 142
144 .mask-content { 143 .mask-content {
145 padding: 20px; 144 padding: 20px;
146 width: 100%; 145 width: 100%;
147 min-height: 30%; 146 min-height: 30%;
148 max-height: 90vh; 147 max-height: 90vh;
149 overflow-y: scroll; 148 overflow-y: scroll;
150 } 149 }
151 150
152 .ls-mask-footer { 151 .ls-mask-footer {
153 height: 50px; 152 height: 50px;
154 display: flex; 153 display: flex;
155 justify-content: center; 154 justify-content: center;
...@@ -161,30 +160,29 @@ export default { ...@@ -161,30 +160,29 @@ export default {
161 border-bottom-left-radius: 5px; 160 border-bottom-left-radius: 5px;
162 border-bottom-right-radius: 5px; 161 border-bottom-right-radius: 5px;
163 overflow: hidden; 162 overflow: hidden;
164 } 163 }
165
166 164
167 /deep/.closeStyle { 165 /deep/.closeStyle {
168 position: absolute; 166 position: absolute;
169 top: 13px; 167 top: 13px;
170 right: 26px; 168 right: 26px;
171 font-size: 24px; 169 font-size: 24px;
172 cursor: pointer; 170 cursor: pointer;
173 color: #409EFF; 171 color: #409eff;
174 } 172 }
175 173
176 /deep/.el-loading-mask { 174 /deep/.el-loading-mask {
177 background: none; 175 background: none;
178 } 176 }
179 177
180 .dialog-fade-enter-active, 178 .dialog-fade-enter-active,
181 .dialog-fade-leave-active { 179 .dialog-fade-leave-active {
182 transition: opacity 0.3s; 180 transition: opacity 0.3s;
183 } 181 }
184 182
185 .dialog-fade-enter, 183 .dialog-fade-enter,
186 .dialog-fade-leave-to { 184 .dialog-fade-leave-to {
187 opacity: 0; 185 opacity: 0;
188 } 186 }
189 </style> 187 </style>
190 188
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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,36 +88,7 @@ ...@@ -100,36 +88,7 @@
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(() => {
133 if (this.multiple) { 92 if (this.multiple) {
134 this.defaultValue.forEach(row => { 93 this.defaultValue.forEach(row => {
135 var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row[this.defaultProps.value]) 94 var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row[this.defaultProps.value])
...@@ -138,20 +97,15 @@ ...@@ -138,20 +97,15 @@
138 } 97 }
139 }) 98 })
140 } else { 99 } 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,8 +116,10 @@ ...@@ -162,8 +116,10 @@
162 item.currentLabel = item.value[this.defaultProps.label] 116 item.currentLabel = item.value[this.defaultProps.label]
163 }) 117 })
164 } else { 118 } else {
119 if (this.defaultValue) {
165 this.$refs.select.selectedLabel = this.defaultValue[this.defaultProps.label] 120 this.$refs.select.selectedLabel = this.defaultValue[this.defaultProps.label]
166 } 121 }
122 }
167 }) 123 })
168 }, 124 },
169 //表格勾选事件 125 //表格勾选事件
...@@ -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 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 15:05:38
5 */
6 import Vue from 'vue'
7 import Popup from './index.vue'
8 const PopupBox = Vue.extend(Popup)
9 let popuping = undefined
10
11 PopupBox.prototype.close = function () {
12 // 如果Popup 有引用,则去掉引用
13 if (popuping) {
14 popuping = undefined
15 }
16 // 先将组件隐藏
17 this.isShow = false
18 // 延迟300毫秒,等待Popup关闭动画执行完之后销毁组件
19 setTimeout(() => {
20 // 移除挂载的dom元素
21 if (this.$el && this.$el.parentNode) {
22 this.$el.parentNode.removeChild(this.$el)
23 }
24 }, 300)
25 }
26
27 const Popup1 = (title, editItem, data, formData) => {
28 // 如果组件已渲染,则返回即可
29 if (popuping) {
30 return popuping
31 }
32 data.title = title
33 data.editItem = editItem
34 if (formData) {
35 data.formData = formData
36 }
37 // 通过构造函数初始化组件 相当于 new Vue()
38 let instance = new PopupBox({
39 data
40 }).$mount()
41 document.body.appendChild(instance.$el)
42 Vue.nextTick(() => {
43 instance.isShow = true
44 // 将组件实例赋值给loading
45 popuping = instance
46 })
47 return instance
48 }
49 export default Popup1
1 <template>
2 <transition name="msgbox-fade">
3 <div class="ls-mask" v-if="myShow">
4 <div class="ls-mask-window" :class="isMain ? 'mainCenter' : 'contentCenter'" :style="{ 'width': width }">
5 <div class="ls-head">
6 <div class="ls-title" :style="{ 'text-align': titleStyle }">
7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
8 <b>{{ title }}</b>
9 </div>
10 <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />
11 </div>
12 <div class="mask-content" ref='contentRef' :style="{ 'height': contentHeight }">
13 <component :is="editItem" ref='childRef' :key="key" :formData='formData' />
14 </div>
15 <div class="ls-mask-footer" v-if='btnShow'>
16 <el-button type="primary" @click="onConfirm">{{ confirmText }}</el-button>
17 <el-button @click="onCancel">{{ cancelText }}</el-button>
18 </div>
19 </div>
20 </div>
21 </transition>
22 </template>
23 <script>
24 import Popup1 from './index'
25 export default {
26 name: 'index',
27 data () {
28 return {
29 title: '标题',
30 editItem: "",
31 isMain: false,
32 formData: undefined,//父组件传递的参数 负责传给子组件
33 btnShow: false,
34 cancel: function () { },
35 confirm: function () { },
36 cancelText: '取消',
37 confirmText: '确认',
38 isSync: false,
39 isShow: false,
40 myShow: false,
41 titleStyle: 'center',
42 width: "75%",
43 height: "auto",
44 contentHeight: "",
45 iconClass: "",
46 key: 0
47 }
48 },
49 watch: {
50 isShow (newValue) {
51 this.$nextTick(() => {
52 this.editItem = this.loadViewFn(this.editItem)
53 document.body.appendChild(this.$el);
54 this.myShow = newValue
55 })
56 }
57 },
58 mounted () {
59 // 计算滚动条高度
60 setTimeout(() => {
61 if (this.btnShow) {
62 if (this.height == 'auto') {
63 this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
64 } else {
65 this.contentHeight = this.height
66 }
67 } else {
68 if (this.height == 'auto') {
69 this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
70 } else {
71 this.contentHeight = this.height
72 }
73 }
74 }, 300)
75 },
76 methods: {
77 onCancel () {
78 Popup1().close()
79 },
80 onConfirm () {
81 let res = new Promise((resolve, reject) => {
82 this.confirm()
83 resolve(true)
84 })
85 if (res) {
86 this.isShow = false
87 }
88 },
89 loadViewFn (view) {
90 return (r) =>
91 require.ensure([], () =>
92 r(require(`@/views/${view}.vue`))
93 )
94 }
95 },
96 destroyed () {
97 if (this.appendToBody && this.$el && this.$el.parentNode) {
98 this.$el.parentNode.removeChild(this.$el);
99 }
100 }
101 }
102 </script>
103 <style scoped lang="scss" >
104 @import "~@/styles/mixin.scss";
105 @import "~@/styles/dialogBox.scss";
106
107 .ls-mask {
108 width: 100%;
109 height: 100%;
110 z-index: 500;
111 position: fixed;
112 left: 0;
113 top: 0;
114 background: rgba(0, 0, 0, 0.3);
115 }
116
117 .ls-mask-window {
118 background: white;
119 position: relative;
120 left: 50%;
121 top: 50%;
122 min-height: 200px;
123 transform: translate(-50%, -50%);
124 border-radius: 5px;
125 overflow: hidden;
126 }
127
128 .ls-mask-window b {
129 padding-left: 5px;
130 }
131
132 .ls-title {
133 padding: 16px;
134 color: #ffffff;
135 background: linear-gradient(3deg, #409eff, #a7cbee);
136 font-size: 16px;
137 }
138
139 .ls-title .svg-icon {
140 font-size: 18px;
141 }
142
143 .mask-content {
144 padding: 20px;
145 width: 100%;
146 min-height: 30%;
147 max-height: 90vh;
148 overflow-y: scroll;
149 }
150
151 .ls-mask-footer {
152 height: 50px;
153 display: flex;
154 justify-content: center;
155 width: 100%;
156 position: absolute;
157 border-top: 1px solid $borderColor;
158 bottom: 0;
159 background: #ffffff;
160 border-bottom-left-radius: 5px;
161 border-bottom-right-radius: 5px;
162 overflow: hidden;
163 }
164
165 /deep/.closeStyle {
166 position: absolute;
167 top: 13px;
168 right: 26px;
169 font-size: 24px;
170 cursor: pointer;
171 color: #409eff;
172 }
173
174 /deep/.el-loading-mask {
175 background: none;
176 }
177
178 .dialog-fade-enter-active,
179 .dialog-fade-leave-active {
180 transition: opacity 0.3s;
181 }
182
183 .dialog-fade-enter,
184 .dialog-fade-leave-to {
185 opacity: 0;
186 }
187 </style>
188
...\ No newline at end of file ...\ No newline at end of file
1 弹窗封装
2 2.用法以及参数:
3 this.$popup('提示','ywbl/dbx/aa',{
4 width: '75%', // 初始化75% 不需要改的话 可以直接不要
5 formData: this.formData, // 父组件传给子组件的参数
6 cancel: function () {}, //取消事件的回调 没有按钮可以不需要
7 confirm: function () {} //确认事件的回调 没有按钮可以不需要
8 })
9
10 5.后续有修改请添加在此处文档说明作用
...\ No newline at end of file ...\ No newline at end of file
...@@ -180,6 +180,10 @@ div:focus { ...@@ -180,6 +180,10 @@ div:focus {
180 } 180 }
181 } 181 }
182 182
183 .flex {
184 display: flex;
185 }
186
183 aside { 187 aside {
184 background: #eef1f6; 188 background: #eef1f6;
185 padding: 8px 24px; 189 padding: 8px 24px;
...@@ -447,3 +451,32 @@ aside { ...@@ -447,3 +451,32 @@ aside {
447 right: 0; 451 right: 0;
448 transform: rotate(-90deg); 452 transform: rotate(-90deg);
449 } 453 }
454
455 // 正在注销
456 .zhuxiaoIcon {
457 position: relative;
458
459 .icon {
460 position: absolute;
461 top: 9px;
462 right: 5px;
463 transform: rotate(45deg);
464 color: #fff;
465 font-size: 12px;
466 z-index: 10;
467 }
468 }
469
470 .zhuxiaoIcon::after {
471 content: "";
472 display: block;
473 width: 0;
474 height: 0;
475 border-width: 0px 0px 55px 55px;
476 border-style: none solid solid;
477 border-color: transparent transparent red;
478 position: absolute;
479 top: 0;
480 right: 0;
481 transform: rotate(-90deg);
482 }
...\ 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-04-11 09:31:14 4 * @LastEditTime: 2023-07-07 09:21:10
5 */ 5 */
6 import Popup from '@/components/Popup/index' 6 import ywPopup from '@/components/ywPopup/index'
7 import Popup1 from '@/components/Popup1/index' 7 import Popup1 from '@/components/Popup1/index'
8 export function popupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) { 8 export function popupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) {
9 // Popup.install 9 // Popup.install
...@@ -18,10 +18,32 @@ export function popupDialog (title, url, params, width = '75%', isMain, height, ...@@ -18,10 +18,32 @@ export function popupDialog (title, url, params, width = '75%', isMain, height,
18 }, 18 },
19 confirm: () => { 19 confirm: () => {
20 callback() 20 callback()
21 } 21 },
22 popupDialog: popupDialog // 将 popupDialog 方法传递给弹框组件
23 })
24 }
25
26 export function ywPopupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) {
27 // Popup.install
28 ywPopup(title, url, {
29 height: height,
30 width: width,
31 formData: params,
32 btnShow: btnShow,
33 isMain: isMain,
34 cancel: () => {
35 cancel()
36 },
37 confirm: () => {
38 callback()
39 },
40 popupDialog: popupDialog // 将 popupDialog 方法传递给弹框组件
22 }) 41 })
23 } 42 }
24 43
25 export function popupCacel () { 44 export function popupCacel () {
26 Popup1().close() 45 Popup1().close()
27 } 46 }
47 export function ywPopupCacel () {
48 ywPopupDialog().close()
49 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!--
2 功能:初始化功能描述
3 作者:calliope
4 -->
5 <template>
6 <div class='ywdialog'>
7 <el-link type="danger" :underline="false">{{formData.message}}</el-link>
8 <el-table
9 v-if="formData.result"
10 :data="formData.result"
11 height="200">
12 <el-table-column
13 prop="bdcdyh"
14 label="不动产单元号">
15 </el-table-column>
16 <el-table-column
17 prop="verifyErrorMessage"
18 label="状态">
19 </el-table-column>
20 </el-table>
21 </div>
22 </template>
23 <script>
24 export default {
25 props: {
26 formData: {
27 type: Object,
28 default: {}
29 }
30 }
31 }
32 </script>
33 <style scoped lang='scss'>
34 @import "~@/styles/public.scss";
35 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -4,27 +4,60 @@ ...@@ -4,27 +4,60 @@
4 * @LastEditTime: 2023-05-17 10:39:47 4 * @LastEditTime: 2023-05-17 10:39:47
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="申请人信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm" 7 <dialogBox
8 @closeDialog="closeDialog" :isButton="showButton"> 8 title="权利人信息"
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 9 width="60%"
10 isMain
11 v-model="myValue"
12 :isFullscreen="false"
13 @submitForm="submitForm"
14 @closeDialog="closeDialog"
15 :isButton="showButton"
16 >
17 <el-form
18 :model="ruleForm"
19 :rules="rules"
20 ref="ruleForm"
21 label-width="120px"
22 >
10 <el-row> 23 <el-row>
11 <el-col :span="8"> 24 <el-col :span="8">
12 <el-form-item label="权利人类型1" prop="sqrlx"> 25 <el-form-item label="权利人类型" prop="qlrlx">
13 <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择"> 26 <el-select
14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 27 clearable
28 v-model="ruleForm.qlrlx"
29 class="width100"
30 placeholder="请选择"
31 >
32 <el-option
33 v-for="item in dictData['A36']"
34 :key="item.dcode"
35 :label="item.dname"
36 :value="item.dcode"
37 >
15 </el-option> 38 </el-option>
16 </el-select> 39 </el-select>
17 </el-form-item> 40 </el-form-item>
18 </el-col> 41 </el-col>
19 <el-col :span="8"> 42 <el-col :span="8">
20 <el-form-item label="姓名/名称" prop="sqrmc"> 43 <el-form-item label="姓名/名称" prop="qlrmc">
21 <el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input> 44 <el-input v-model="ruleForm.qlrmc" maxlegth="15"></el-input>
22 </el-form-item> 45 </el-form-item>
23 </el-col> 46 </el-col>
24 <el-col :span="8"> 47 <el-col :span="8">
25 <el-form-item label="证件种类" prop="zjzl"> 48 <el-form-item label="证件种类" prop="zjzl">
26 <el-select clearable v-model="ruleForm.zjzl" class="width100" placeholder="请选择"> 49 <el-select
27 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 50 clearable
51 v-model="ruleForm.zjzl"
52 class="width100"
53 placeholder="请选择"
54 >
55 <el-option
56 v-for="item in dictData['A30']"
57 :key="item.dcode"
58 :label="item.dname"
59 :value="item.dcode"
60 >
28 </el-option> 61 </el-option>
29 </el-select> 62 </el-select>
30 </el-form-item> 63 </el-form-item>
...@@ -33,18 +66,36 @@ ...@@ -33,18 +66,36 @@
33 <el-row> 66 <el-row>
34 <el-col :span="8"> 67 <el-col :span="8">
35 <el-form-item label="证件号" prop="zjh"> 68 <el-form-item label="证件号" prop="zjh">
36 <el-input v-model="ruleForm.zjh" maxlength="15" oninput="value=value.replace(/[^\X0-9]/g,'')"></el-input> 69 <el-input
70 v-model="ruleForm.zjh"
71 maxlength="15"
72 oninput="value=value.replace(/[^\X0-9]/g,'')"
73 ></el-input>
37 </el-form-item> 74 </el-form-item>
38 </el-col> 75 </el-col>
39 <el-col :span="8"> 76 <el-col :span="8">
40 <el-form-item label="联系电话" prop="dh"> 77 <el-form-item label="联系电话" prop="dh">
41 <el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 78 <el-input
79 v-model="ruleForm.dh"
80 maxlength="11"
81 oninput="value=value.replace(/[^\d]/g,'')"
82 ></el-input>
42 </el-form-item> 83 </el-form-item>
43 </el-col> 84 </el-col>
44 <el-col :span="8"> 85 <el-col :span="8">
45 <el-form-item label="性别"> 86 <el-form-item label="性别">
46 <el-select clearable v-model="ruleForm.xb" class="width100" placeholder="请选择"> 87 <el-select
47 <el-option v-for="item in dictData['A43']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 88 clearable
89 v-model="ruleForm.xb"
90 class="width100"
91 placeholder="请选择"
92 >
93 <el-option
94 v-for="item in dictData['A43']"
95 :key="item.dcode"
96 :label="item.dname"
97 :value="item.dcode"
98 >
48 </el-option> 99 </el-option>
49 </el-select> 100 </el-select>
50 </el-form-item> 101 </el-form-item>
...@@ -58,12 +109,12 @@ ...@@ -58,12 +109,12 @@
58 </el-col> 109 </el-col>
59 <el-col :span="8"> 110 <el-col :span="8">
60 <el-form-item label="国家/地区"> 111 <el-form-item label="国家/地区">
61 <el-input v-model="ruleForm.gjdq"></el-input> 112 <el-input v-model="ruleForm.gj"></el-input>
62 </el-form-item> 113 </el-form-item>
63 </el-col> 114 </el-col>
64 <el-col :span="8"> 115 <el-col :span="8">
65 <el-form-item label="户籍所在省市"> 116 <el-form-item label="户籍所在省市">
66 <el-input v-model="ruleForm.szss"></el-input> 117 <el-input v-model="ruleForm.hjszss"></el-input>
67 </el-form-item> 118 </el-form-item>
68 </el-col> 119 </el-col>
69 </el-row> 120 </el-row>
...@@ -71,7 +122,7 @@ ...@@ -71,7 +122,7 @@
71 <el-row> 122 <el-row>
72 <el-col :span="16"> 123 <el-col :span="16">
73 <el-form-item label="地址"> 124 <el-form-item label="地址">
74 <el-input v-model="ruleForm.txdz"></el-input> 125 <el-input v-model="ruleForm.dz"></el-input>
75 </el-form-item> 126 </el-form-item>
76 </el-col> 127 </el-col>
77 <el-col :span="8"> 128 <el-col :span="8">
...@@ -107,7 +158,7 @@ ...@@ -107,7 +158,7 @@
107 </el-col> 158 </el-col>
108 <el-col :span="16"> 159 <el-col :span="16">
109 <el-form-item label="代理机构"> 160 <el-form-item label="代理机构">
110 <el-input v-model="ruleForm.dljg"></el-input> 161 <el-input v-model="ruleForm.dlrjgmc"></el-input>
111 </el-form-item> 162 </el-form-item>
112 </el-col> 163 </el-col>
113 </el-row> 164 </el-row>
...@@ -115,7 +166,11 @@ ...@@ -115,7 +166,11 @@
115 <el-row> 166 <el-row>
116 <el-col :span="8"> 167 <el-col :span="8">
117 <el-form-item label="联系电话"> 168 <el-form-item label="联系电话">
118 <el-input v-model="ruleForm.lxdh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 169 <el-input
170 v-model="ruleForm.dlrdhhm"
171 maxlength="11"
172 oninput="value=value.replace(/[^\d]/g,'')"
173 ></el-input>
119 </el-form-item> 174 </el-form-item>
120 </el-col> 175 </el-col>
121 <el-col :span="8"> 176 <el-col :span="8">
...@@ -125,8 +180,18 @@ ...@@ -125,8 +180,18 @@
125 </el-col> 180 </el-col>
126 <el-col :span="8"> 181 <el-col :span="8">
127 <el-form-item label="代理人证件类型"> 182 <el-form-item label="代理人证件类型">
128 <el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择"> 183 <el-select
129 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 184 clearable
185 v-model="ruleForm.dlrzjlx"
186 class="width100"
187 placeholder="请选择"
188 >
189 <el-option
190 v-for="item in dictData['A30']"
191 :key="item.dcode"
192 :label="item.dname"
193 :value="item.dcode"
194 >
130 </el-option> 195 </el-option>
131 </el-select> 196 </el-select>
132 </el-form-item> 197 </el-form-item>
...@@ -143,50 +208,61 @@ ...@@ -143,50 +208,61 @@
143 </dialogBox> 208 </dialogBox>
144 </template> 209 </template>
145 <script> 210 <script>
146 import { mapGetters } from "vuex"; 211 import { mapGetters } from "vuex";
147 export default { 212 export default {
148 props: { 213 props: {
149 value: { type: Boolean, default: false }, 214 value: { type: Boolean, default: false },
150 details: { type: Object, default: {} }, 215 details: { type: Object, default: {} },
151 showButton: { type: Boolean, default: false } 216 showButton: { type: Boolean, default: false },
152 }, 217 },
153 computed: { 218 computed: {
154 ...mapGetters(["dictData"]), 219 ...mapGetters(["dictData"]),
155 }, 220 },
156 data () { 221 data() {
157 return { 222 return {
158 myValue: this.value, 223 myValue: this.value,
159 ruleForm: { 224 ruleForm: {
160 sqrlx: "", 225 bsmBdcqz: "",
161 sqrmc: "", 226 bsmQlr: "",
162 zjzl: "", 227 bsmQlxx: "",
163 zjh: "", 228 bz: "",
229 cbfbm: "",
164 dh: "", 230 dh: "",
165 xb: "", 231 dlrdhhm: "",
232 dlrjgmc: "",
233 dlrxm: "",
234 dlrzjh: "",
235 dlrzjlx: "",
236 dz: "",
237 dzyj: "",
238 fbfbm: "",
239 frdh: "",
166 frmc: "", 240 frmc: "",
167 gjdq: "",
168 szss: "",
169 txdz: "",
170 yb: "",
171 fzjg: "", 241 fzjg: "",
172 dzyj: "", 242 gj: "",
173 qlbl: "",
174 gzdw: "", 243 gzdw: "",
175 dljg: "", 244 hjszss: "",
176 dlrxm: "", 245 qlrlx: "",
177 dlrzjlx: "", 246 qlrmc: "",
178 dlrzjh: "", 247 qlrtz: "",
248 sfczr: "",
249 sshy: "",
250 sxh: 0,
251 xb: "",
252 yb: "",
253 zjh: "",
254 zjzl: "",
179 }, 255 },
180 rules: { 256 rules: {
181 sqrlx: [{ required: true, message: "权利人类型", trigger: "change" }], 257 qlrlx: [{ required: true, message: "权利人类型", trigger: "change" }],
182 sqrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }], 258 qlrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }],
183 zjzl: [{ required: true, message: "证件种类", trigger: "change" }], 259 zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
184 zjh: [{ required: true, message: "证件号", trigger: "blur" }], 260 zjh: [{ required: true, message: "证件号", trigger: "blur" }],
185 }, 261 },
186 }; 262 };
187 }, 263 },
188 watch: { 264 watch: {
189 value (val) { 265 value(val) {
190 this.myValue = _.cloneDeep(val); 266 this.myValue = _.cloneDeep(val);
191 }, 267 },
192 details: { 268 details: {
...@@ -197,11 +273,11 @@ ...@@ -197,11 +273,11 @@
197 }, 273 },
198 }, 274 },
199 methods: { 275 methods: {
200 closeDialog () { 276 closeDialog() {
201 this.$emit("input", false); 277 this.$emit("input", false);
202 this.$refs["ruleForm"].resetFields(); 278 this.$refs["ruleForm"].resetFields();
203 }, 279 },
204 submitForm () { 280 submitForm() {
205 this.$refs.ruleForm.validate((valid) => { 281 this.$refs.ruleForm.validate((valid) => {
206 if (valid) { 282 if (valid) {
207 this.$emit("input", false); 283 this.$emit("input", false);
...@@ -212,14 +288,14 @@ ...@@ -212,14 +288,14 @@
212 }); 288 });
213 }, 289 },
214 }, 290 },
215 }; 291 };
216 </script> 292 </script>
217 <style scoped lang="scss"> 293 <style scoped lang="scss">
218 @import "~@/styles/dialogBoxheader.scss"; 294 @import "~@/styles/dialogBoxheader.scss";
219 .submit-button { 295 .submit-button {
220 text-align: center; 296 text-align: center;
221 height: 52px; 297 height: 52px;
222 padding-top: 10px; 298 padding-top: 10px;
223 background-color: #fff; 299 background-color: #fff;
224 } 300 }
225 </style> 301 </style>
......
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
10 <el-row> 10 <el-row>
11 <el-col :span="8"> 11 <el-col :span="8">
12 <el-form-item label="义务人类型1" prop="sqrlx"> 12 <el-form-item label="义务人类型" prop="ywrlx">
13 <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择"> 13 <el-select clearable v-model="ruleForm.ywrlx" class="width100" placeholder="请选择">
14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="8"> 19 <el-col :span="8">
20 <el-form-item label="姓名/名称" prop="sqrmc"> 20 <el-form-item label="姓名/名称" prop="ywrmc">
21 <el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input> 21 <el-input v-model="ruleForm.ywrmc" maxlegth="15"></el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <el-col :span="8"> 24 <el-col :span="8">
...@@ -157,8 +157,8 @@ ...@@ -157,8 +157,8 @@
157 return { 157 return {
158 myValue: this.value, 158 myValue: this.value,
159 ruleForm: { 159 ruleForm: {
160 sqrlx: "", 160 ywrlx: "",
161 sqrmc: "", 161 ywrmc: "",
162 zjzl: "", 162 zjzl: "",
163 zjh: "", 163 zjh: "",
164 dh: "", 164 dh: "",
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
178 dlrzjh: "", 178 dlrzjh: "",
179 }, 179 },
180 rules: { 180 rules: {
181 sqrlx: [{ required: true, message: "义务人类型", trigger: "change" }], 181 ywrlx: [{ required: true, message: "义务人类型", trigger: "change" }],
182 sqrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }], 182 ywrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }],
183 zjzl: [{ required: true, message: "证件种类", trigger: "change" }], 183 zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
184 zjh: [{ required: true, message: "证件号", trigger: "blur" }], 184 zjh: [{ required: true, message: "证件号", trigger: "blur" }],
185 }, 185 },
......
...@@ -124,6 +124,7 @@ export default { ...@@ -124,6 +124,7 @@ export default {
124 //读取申请单元信息 124 //读取申请单元信息
125 loadBdcdylist(add) { 125 loadBdcdylist(add) {
126 var formdata = new FormData(); 126 var formdata = new FormData();
127 if(this.bsmSlsq){
127 formdata.append("bsmSlsq", this.bsmSlsq); 128 formdata.append("bsmSlsq", this.bsmSlsq);
128 formdata.append("bestepid", this.bestepid); 129 formdata.append("bestepid", this.bestepid);
129 leftMenu(formdata).then((res) => { 130 leftMenu(formdata).then((res) => {
...@@ -135,6 +136,8 @@ export default { ...@@ -135,6 +136,8 @@ export default {
135 } 136 }
136 } 137 }
137 }); 138 });
139 }
140
138 141
139 }, 142 },
140 // 获取右侧菜单 143 // 获取右侧菜单
......
...@@ -59,16 +59,17 @@ ...@@ -59,16 +59,17 @@
59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" /> 59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
60 <el-table-column label="流程状态" header-align="center" align="center"> 60 <el-table-column label="流程状态" header-align="center" align="center">
61 <template slot-scope="scope"> 61 <template slot-scope="scope">
62 <div v-if="scope.row.finishTime == null">正在办理</div> 62 <div v-if="scope.row.endTime">已完结</div>
63 <div v-else>已完结</div> 63 <div v-else>正在办理</div>
64 </template> 64 </template>
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="finishTime" width="160" align="center" /> 69 <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
70 <el-table-column label="操作方式" align="center"> 70 <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
71 </el-table-column> 71 <el-table-column label="操作方式" prop="controls" align="center"/>
72 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 73 </el-table>
73 </div> 74 </div>
74 </div> 75 </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')
...@@ -237,13 +246,32 @@ ...@@ -237,13 +246,32 @@
237 // 获取流程记录 246 // 获取流程记录
238 getCommentList() { 247 getCommentList() {
239 this.formData.allCommentList.forEach(async (item,index) => { 248 this.formData.allCommentList.forEach(async (item,index) => {
249 item.comments.forEach(element => {
250 if(element.type=="COMPLETE"){
251 this.formData.allCommentList[index].idea=element.message
252 this.formData.allCommentList[index].controls="完成"
253 }
254 });
240 this.formData.allCommentList[index].agent=item.assignee.name 255 this.formData.allCommentList[index].agent=item.assignee.name
241 }) 256 })
242 setTimeout(() => { 257 this.formData.handlinglist.forEach(async (item,index) => {
243 this.taskList =this.formData.allCommentList; 258 if(item.assignee.name){
259 this.formData.handlinglist[index].agent=item.assignee.name
260 }else{
261 let str=""
262 item.countersign.forEach((item) => {
263 str+=item.name+","
264 })
265 str=str.slice(0, -1);
266 this.formData.allCommentList[index].agent=str
267 }
268
269 })
270 this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
271 // this.taskList =this.formData.allCommentList;
244 // 处理数据之后赋值 272 // 处理数据之后赋值
245 this.taskCommentList=this.taskList 273 this.taskCommentList=this.taskList
246 }, 100) 274
247 }, 275 },
248 276
249 // 设置流程图元素状态 277 // 设置流程图元素状态
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 } 70 }
71 }, 71 },
72 { 72 {
73 prop: "sqrmc", 73 prop: "qlrmc",
74 label: "姓名/名称" 74 label: "姓名/名称"
75 }, 75 },
76 { 76 {
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 this.$nextTick(() => { 121 this.$nextTick(() => {
122 if (val.length == 0 || !val) { 122 if (val.length == 0 || !val) {
123 that.tableDataList = _.cloneDeep([{ 123 that.tableDataList = _.cloneDeep([{
124 sqrmc: '', 124 qlrmc: '',
125 dlrzjlx: '', 125 dlrzjlx: '',
126 dlrzjh: '', 126 dlrzjh: '',
127 fr: '' 127 fr: ''
...@@ -219,3 +219,6 @@ ...@@ -219,3 +219,6 @@
219 } 219 }
220 } 220 }
221 </script> 221 </script>
222 <style scoped lang="scss">
223
224 </style>
......
...@@ -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 inline-message
17 label-width="145px"
17 > 18 >
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 19 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 20 <div class="slxx_title title-block">
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
68 <el-form-item label="登记类型:"> 69 <el-form-item label="登记类型:">
69 <el-select v-model="ruleForm.qlxx.djlx"> 70 <el-select v-model="ruleForm.qlxx.djlx">
70 <el-option 71 <el-option
71 v-for="item in dictData['A21']" 72 v-for="item in djlxlist"
72 :key="item.dcode" 73 :key="item.dcode"
73 :label="item.dname" 74 :label="item.dname"
74 :value="item.dcode" 75 :value="item.dcode"
...@@ -218,28 +219,35 @@ ...@@ -218,28 +219,35 @@
218 </el-col> 219 </el-col>
219 220
220 <el-col :span="8"> 221 <el-col :span="8">
221 <el-form-item label="不动产权证号:"> 222 <el-form-item label="不动产权证号:" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
222 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 223 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
223 </el-form-item> 224 </el-form-item>
224 </el-col> 225 </el-col>
225 <el-col :span="8"> 226 <el-col :span="8">
226 <el-form-item label="区县代码:"> 227 <el-form-item label="区县代码:" prop="qlxx.qxdm" :rules="rules.qxdmrules">
227 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 228 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
228 </el-form-item> 229 </el-form-item>
229 </el-col> 230 </el-col>
230 <el-col :span="8"> 231 <el-col :span="8">
231 <el-form-item label="登记机构:"> 232 <el-form-item label="登记机构:" prop="qlxx.djjg" :rules="rules.djjgrules">
232 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 233 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
233 </el-form-item> 234 </el-form-item>
234 </el-col> 235 </el-col>
235 <el-col :span="8"> 236 <el-col :span="8">
236 <el-form-item label="登簿人:"> 237 <el-form-item label="登簿人:" prop="qlxx.dbr" :rules="rules.dbrrules">
237 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 238 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
238 </el-form-item> 239 </el-form-item>
239 </el-col> 240 </el-col>
240 <el-col :span="8"> 241 <el-col :span="8">
241 <el-form-item label="登记时间:"> 242 <el-form-item label="登记时间:" prop="qlxx.djsj" :rules="rules.djsjrules">
242 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 243 <el-date-picker
244 v-model="ruleForm.qlxx.djsj"
245 type="date"
246 placeholder="选择日期"
247 value-format="yyyy-MM-dd HH:mm:ss"
248 format="yyyy-MM-dd"
249 >
250 </el-date-picker>
243 </el-form-item> 251 </el-form-item>
244 </el-col> 252 </el-col>
245 </el-row> 253 </el-row>
...@@ -314,20 +322,20 @@ ...@@ -314,20 +322,20 @@
314 :gyfs="ruleForm.qlxx.gyfs" 322 :gyfs="ruleForm.qlxx.gyfs"
315 /> 323 />
316 324
317 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0"> 325 <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
318 <div class="slxx_title title-block"> 326 <div class="slxx_title title-block">
319 义务人信息 327 义务人信息
320 <div class="triangle"></div> 328 <div class="triangle"></div>
321 </div> 329 </div>
322 <qlrCommonTable 330 <qlrCommonTable
323 v-if="ruleForm.ywrList" 331 v-if="ruleForm.ywrData"
324 :tableData="ruleForm.ywrList" 332 :tableData="ruleForm.ywrData"
325 :key="key" 333 :key="key"
326 @upDateQlrxxList="upDateYwrxxList" 334 @upDateQlrxxList="upDateYwrxxList"
327 /> 335 />
328 </div> 336 </div>
329 </div> 337 </div>
330 <el-row class="btn"> 338 <el-row class="btn" v-if="!$route.query.viewtype">
331 <el-form-item> 339 <el-form-item>
332 <el-button type="primary" @click="onSubmit">保存</el-button> 340 <el-button type="primary" @click="onSubmit">保存</el-button>
333 </el-form-item> 341 </el-form-item>
...@@ -365,6 +373,34 @@ export default { ...@@ -365,6 +373,34 @@ export default {
365 373
366 //表单是否可操作 374 //表单是否可操作
367 propsParam: this.$attrs, 375 propsParam: this.$attrs,
376 // 登记类型
377 djlxlist: [
378 {
379 dcode: "100",
380 dname: "首次登记",
381 },
382 {
383 dcode: "200",
384 dname: "转移登记",
385 },
386 {
387 dcode: "300",
388 dname: "变更登记",
389 },
390 {
391 dcode: "500",
392 dname: "更正登记",
393 },
394
395 {
396 dcode: "901",
397 dname: "补证",
398 },
399 {
400 dcode: "902",
401 dname: "换证",
402 },
403 ],
368 // 权属状态 404 // 权属状态
369 qsztlist: [ 405 qsztlist: [
370 { 406 {
...@@ -383,7 +419,15 @@ export default { ...@@ -383,7 +419,15 @@ export default {
383 czrOptions: [], 419 czrOptions: [],
384 ruleForm: {}, 420 ruleForm: {},
385 //传递参数\ 421 //传递参数\
386 rules: {}, 422 rules: {
423 bdcqzhrules:[
424 { required: true, message: "不动产权证号:", trigger: "change" },
425 ],
426 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
427 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
428 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
429 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
430 },
387 }; 431 };
388 }, 432 },
389 created() { 433 created() {
...@@ -392,7 +436,7 @@ export default { ...@@ -392,7 +436,7 @@ export default {
392 mounted() {}, 436 mounted() {},
393 methods: { 437 methods: {
394 loadData() { 438 loadData() {
395 console.log("房屋", this.propsParam); 439
396 this.propsParam.isEdit=this.$parent.isEdit 440 this.propsParam.isEdit=this.$parent.isEdit
397 init(this.propsParam).then((res) => { 441 init(this.propsParam).then((res) => {
398 if (res.code == 200) { 442 if (res.code == 200) {
...@@ -419,10 +463,12 @@ export default { ...@@ -419,10 +463,12 @@ export default {
419 }, 463 },
420 // 更新义务人信息 464 // 更新义务人信息
421 upDateYwrxxList(val) { 465 upDateYwrxxList(val) {
422 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val)); 466 this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
423 this.key++; 467 this.key++;
424 }, 468 },
425 onSubmit() { 469 onSubmit() {
470 this.$refs.ruleForm.validate((valid) => {
471 if (valid) {
426 if (this.ruleForm.qlrData.length == 0) { 472 if (this.ruleForm.qlrData.length == 0) {
427 this.$message({ 473 this.$message({
428 showClose: true, 474 showClose: true,
...@@ -496,7 +542,11 @@ export default { ...@@ -496,7 +542,11 @@ export default {
496 type: "error", 542 type: "error",
497 }); 543 });
498 } 544 }
545 }); } else {
546 return false;
547 }
499 }); 548 });
549
500 }, 550 },
501 }, 551 },
502 }; 552 };
......
...@@ -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 inline-message
17 label-width="145px"
17 > 18 >
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 19 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 20 <div class="slxx_title title-block">
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
38 </el-col> 39 </el-col>
39 </el-row> 40 </el-row>
40 <div class="slxx_title title-block"> 41 <div class="slxx_title title-block">
41 国有建设用地使用权信息 42 建设用地、宅基地使用权信息
42 <div class="triangle"></div> 43 <div class="triangle"></div>
43 </div> 44 </div>
44 <el-row :gutter="10"> 45 <el-row :gutter="10">
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
68 <el-form-item label="登记类型:"> 69 <el-form-item label="登记类型:">
69 <el-select v-model="ruleForm.qlxx.djlx"> 70 <el-select v-model="ruleForm.qlxx.djlx">
70 <el-option 71 <el-option
71 v-for="item in dictData['A21']" 72 v-for="item in djlxlist"
72 :key="item.dcode" 73 :key="item.dcode"
73 :label="item.dname" 74 :label="item.dname"
74 :value="item.dcode" 75 :value="item.dcode"
...@@ -147,28 +148,55 @@ ...@@ -147,28 +148,55 @@
147 </el-col> 148 </el-col>
148 149
149 <el-col :span="8"> 150 <el-col :span="8">
150 <el-form-item label="不动产权证号:"> 151 <el-form-item
152 label="不动产权证号:"
153 prop="qlxx.bdcqzh"
154 :rules="rules.bdcqzhrules"
155 >
151 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 156 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
152 </el-form-item> 157 </el-form-item>
153 </el-col> 158 </el-col>
154 <el-col :span="8"> 159 <el-col :span="8">
155 <el-form-item label="区县代码:"> 160 <el-form-item
161 label="区县代码:"
162 prop="qlxx.qxdm"
163 :rules="rules.qxdmrules"
164 >
156 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 165 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
157 </el-form-item> 166 </el-form-item>
158 </el-col> 167 </el-col>
159 <el-col :span="8"> 168 <el-col :span="8">
160 <el-form-item label="登记机构:"> 169 <el-form-item
170 label="登记机构:"
171 prop="qlxx.djjg"
172 :rules="rules.djjgrules"
173 >
161 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 174 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
162 </el-form-item> 175 </el-form-item>
163 </el-col> 176 </el-col>
164 <el-col :span="8"> 177 <el-col :span="8">
165 <el-form-item label="登簿人:"> 178 <el-form-item
179 label="登簿人:"
180 prop="qlxx.dbr"
181 :rules="rules.dbrrules"
182 >
166 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 183 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
167 </el-form-item> 184 </el-form-item>
168 </el-col> 185 </el-col>
169 <el-col :span="8"> 186 <el-col :span="8">
170 <el-form-item label="登记时间:"> 187 <el-form-item
171 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 188 label="登记时间:"
189 prop="qlxx.djsj"
190 :rules="rules.djsjrules"
191 >
192 <el-date-picker
193 v-model="ruleForm.qlxx.djsj"
194 type="date"
195 placeholder="选择日期"
196 value-format="yyyy-MM-dd HH:mm:ss"
197 format="yyyy-MM-dd"
198 >
199 </el-date-picker>
172 </el-form-item> 200 </el-form-item>
173 </el-col> 201 </el-col>
174 </el-row> 202 </el-row>
...@@ -238,21 +266,21 @@ ...@@ -238,21 +266,21 @@
238 :gyfs="ruleForm.qlxx.gyfs" 266 :gyfs="ruleForm.qlxx.gyfs"
239 /> 267 />
240 268
241 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0"> 269 <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
242 <div class="slxx_title title-block"> 270 <div class="slxx_title title-block">
243 义务人信息 271 义务人信息
244 <div class="triangle"></div> 272 <div class="triangle"></div>
245 </div> 273 </div>
246 <qlrCommonTable 274 <ywrCommonTable
247 v-if="ruleForm.ywrList" 275 v-if="ruleForm.ywrData"
248 :tableData="ruleForm.ywrList" 276 :tableData="ruleForm.ywrData"
249 :key="key" 277 :key="key"
250 @upDateQlrxxList="upDateYwrxxList" 278 @upDateQlrxxList="upDateYwrxxList"
251 :viewtype="$route.query.viewtype" 279 :viewtype="$route.query.viewtype"
252 /> 280 />
253 </div> 281 </div>
254 </div> 282 </div>
255 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> 283 <el-row class="btn" v-if="!$route.query.viewtype">
256 <el-form-item> 284 <el-form-item>
257 <el-button type="primary" @click="onSubmit">保存</el-button> 285 <el-button type="primary" @click="onSubmit">保存</el-button>
258 </el-form-item> 286 </el-form-item>
...@@ -288,6 +316,34 @@ export default { ...@@ -288,6 +316,34 @@ export default {
288 propsParam: this.$attrs, 316 propsParam: this.$attrs,
289 ableOperation: true, 317 ableOperation: true,
290 key: 0, 318 key: 0,
319 // 登记类型
320 djlxlist: [
321 {
322 dcode: "100",
323 dname: "首次登记",
324 },
325 {
326 dcode: "200",
327 dname: "转移登记",
328 },
329 {
330 dcode: "300",
331 dname: "变更登记",
332 },
333 {
334 dcode: "500",
335 dname: "更正登记",
336 },
337
338 {
339 dcode: "901",
340 dname: "补证",
341 },
342 {
343 dcode: "902",
344 dname: "换证",
345 },
346 ],
291 // 权属状态 347 // 权属状态
292 qsztlist: [ 348 qsztlist: [
293 { 349 {
...@@ -299,13 +355,21 @@ export default { ...@@ -299,13 +355,21 @@ export default {
299 dname: "历史", 355 dname: "历史",
300 }, 356 },
301 ], 357 ],
302 tdxz:null, 358 tdxz: null,
303 isShow: false, 359 isShow: false,
304 disabled: true, 360 disabled: true,
305 czrOptions: [], 361 czrOptions: [],
306 ruleForm: {}, 362 ruleForm: {},
307 //传递参数\ 363 //传递参数\
308 rules: {}, 364 rules: {
365 bdcqzhrules: [
366 { required: true, message: "不动产权证号:", trigger: "change" },
367 ],
368 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
369 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
370 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
371 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
372 },
309 }; 373 };
310 }, 374 },
311 created() { 375 created() {
...@@ -318,41 +382,39 @@ export default { ...@@ -318,41 +382,39 @@ export default {
318 return store.getters.dictData[val]; 382 return store.getters.dictData[val];
319 }, 383 },
320 loadData() { 384 loadData() {
321 this.propsParam.isEdit=this.$parent.isEdit 385
386 this.propsParam.isEdit = this.$parent.isEdit;
322 init(this.propsParam).then((res) => { 387 init(this.propsParam).then((res) => {
323 if (res.code == 200) { 388 if (res.code == 200) {
324 this.ruleForm = res.result; 389 this.ruleForm = res.result;
325 if( this.ruleForm.tdytqxList.length>0){ 390 if (this.ruleForm.tdytqxList.length > 0) {
326 this.tdxz=this.ruleForm.tdytqxList[0].qlxzbm 391 this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
327 }else{ 392 } else {
328 this.tdxz=null 393 this.tdxz = null;
329 } 394 }
330 console.log("this.ruleForm", this.ruleForm);
331 this.isShow = true; 395 this.isShow = true;
332 } 396 }
333 }); 397 });
334 }, 398 },
335 // 更新土地用途信息 399 // 更新土地用途信息
336 upDateTdytxxList(val) { 400 upDateTdytxxList(val) {
337 console.log("VAL", val);
338 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 401 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
339 this.key++; 402 this.key++;
340 }, 403 },
341 // 更新权利人信息 404 // 更新权利人信息
342 upDateQlrxxList(val) { 405 upDateQlrxxList(val) {
343 console.log("val", val);
344 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 406 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
345 console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
346 this.czrOptions = this.ruleForm.qlrData; 407 this.czrOptions = this.ruleForm.qlrData;
347 this.key++; 408 this.key++;
348 }, 409 },
349 // 更新义务人信息 410 // 更新义务人信息
350 upDateYwrxxList(val) { 411 upDateYwrxxList(val) {
351 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val)); 412 this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
352 this.key++; 413 this.key++;
353 }, 414 },
354 onSubmit() { 415 onSubmit() {
355 console.log("this.ruleForm大信息", this.ruleForm); 416 this.$refs.ruleForm.validate((valid) => {
417 if (valid) {
356 if (this.ruleForm.qlrData.length == 0) { 418 if (this.ruleForm.qlrData.length == 0) {
357 this.$message({ 419 this.$message({
358 showClose: true, 420 showClose: true,
...@@ -406,6 +468,10 @@ export default { ...@@ -406,6 +468,10 @@ export default {
406 }); 468 });
407 } 469 }
408 }); 470 });
471 } else {
472 return false;
473 }
474 });
409 }, 475 },
410 }, 476 },
411 }; 477 };
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-25 15:52:42 4 * @LastEditTime: 2023-06-25 15:52:42
5 :show-message="false"
5 --> 6 -->
6 <template> 7 <template>
7 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -13,7 +14,8 @@ ...@@ -13,7 +14,8 @@
13 ref="ruleForm" 14 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 15 :label-position="flag ? 'top' : ''"
15 :inline="flag" 16 :inline="flag"
16 label-width="127px" 17 inline-message
18 label-width="145px"
17 > 19 >
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 20 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 21 <div class="slxx_title title-block">
...@@ -38,7 +40,7 @@ ...@@ -38,7 +40,7 @@
38 </el-col> 40 </el-col>
39 </el-row> 41 </el-row>
40 <div class="slxx_title title-block"> 42 <div class="slxx_title title-block">
41 房地产权(独幢、层、套、间房屋) 43 预告登记信息
42 <div class="triangle"></div> 44 <div class="triangle"></div>
43 </div> 45 </div>
44 <el-row :gutter="10"> 46 <el-row :gutter="10">
...@@ -73,7 +75,7 @@ ...@@ -73,7 +75,7 @@
73 <el-form-item label="登记类型:"> 75 <el-form-item label="登记类型:">
74 <el-select v-model="ruleForm.qlxx.djlx"> 76 <el-select v-model="ruleForm.qlxx.djlx">
75 <el-option 77 <el-option
76 v-for="item in dictData['A21']" 78 v-for="item in djlxlist"
77 :key="item.dcode" 79 :key="item.dcode"
78 :label="item.dname" 80 :label="item.dname"
79 :value="item.dcode" 81 :value="item.dcode"
...@@ -88,28 +90,35 @@ ...@@ -88,28 +90,35 @@
88 </el-form-item> 90 </el-form-item>
89 </el-col> 91 </el-col>
90 <el-col :span="8"> 92 <el-col :span="8">
91 <el-form-item label="不动产权证号:"> 93 <el-form-item label="不动产权证号:" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
92 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 94 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
93 </el-form-item> 95 </el-form-item>
94 </el-col> 96 </el-col>
95 <el-col :span="8"> 97 <el-col :span="8">
96 <el-form-item label="区县代码:"> 98 <el-form-item label="区县代码:" prop="qlxx.qxdm" :rules="rules.qxdmrules">
97 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 99 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
98 </el-form-item> 100 </el-form-item>
99 </el-col> 101 </el-col>
100 <el-col :span="8"> 102 <el-col :span="8">
101 <el-form-item label="登记机构:"> 103 <el-form-item label="登记机构:" prop="qlxx.djjg" :rules="rules.djjgrules">
102 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 104 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
103 </el-form-item> 105 </el-form-item>
104 </el-col> 106 </el-col>
105 <el-col :span="8"> 107 <el-col :span="8">
106 <el-form-item label="登簿人:"> 108 <el-form-item label="登簿人:" prop="qlxx.dbr" :rules="rules.dbrrules">
107 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 109 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
108 </el-form-item> 110 </el-form-item>
109 </el-col> 111 </el-col>
110 <el-col :span="8"> 112 <el-col :span="8">
111 <el-form-item label="登记时间:"> 113 <el-form-item label="登记时间:" prop="qlxx.djsj" :rules="rules.djsjrules">
112 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 114 <el-date-picker
115 v-model="ruleForm.qlxx.djsj"
116 type="date"
117 placeholder="选择日期"
118 value-format="yyyy-MM-dd HH:mm:ss"
119 format="yyyy-MM-dd"
120 >
121 </el-date-picker>
113 </el-form-item> 122 </el-form-item>
114 </el-col> 123 </el-col>
115 <el-col :span="8"> 124 <el-col :span="8">
...@@ -277,7 +286,7 @@ ...@@ -277,7 +286,7 @@
277 :gyfs="ruleForm.qlxx.gyfs" 286 :gyfs="ruleForm.qlxx.gyfs"
278 /> 287 />
279 288
280 <div> 289 <div v-if="ruleForm.ywrData">
281 <div class="slxx_title title-block"> 290 <div class="slxx_title title-block">
282 义务人信息 291 义务人信息
283 <div class="triangle"></div> 292 <div class="triangle"></div>
...@@ -290,7 +299,7 @@ ...@@ -290,7 +299,7 @@
290 /> 299 />
291 </div> 300 </div>
292 </div> 301 </div>
293 <el-row class="btn"> 302 <el-row class="btn" v-if="!$route.query.viewtype">
294 <el-form-item> 303 <el-form-item>
295 <el-button type="primary" @click="onSubmit">保存</el-button> 304 <el-button type="primary" @click="onSubmit">保存</el-button>
296 </el-form-item> 305 </el-form-item>
...@@ -318,6 +327,34 @@ export default { ...@@ -318,6 +327,34 @@ export default {
318 disabled: true, 327 disabled: true,
319 czrOptions: [], 328 czrOptions: [],
320 ruleForm: {}, 329 ruleForm: {},
330 // 登记类型
331 djlxlist: [
332 {
333 dcode: "100",
334 dname: "首次登记",
335 },
336 {
337 dcode: "200",
338 dname: "转移登记",
339 },
340 {
341 dcode: "300",
342 dname: "变更登记",
343 },
344 {
345 dcode: "500",
346 dname: "更正登记",
347 },
348
349 {
350 dcode: "901",
351 dname: "补证",
352 },
353 {
354 dcode: "902",
355 dname: "换证",
356 },
357 ],
321 // 权属状态 358 // 权属状态
322 qsztlist: [ 359 qsztlist: [
323 { 360 {
...@@ -330,7 +367,15 @@ export default { ...@@ -330,7 +367,15 @@ export default {
330 }, 367 },
331 ], 368 ],
332 //传递参数\ 369 //传递参数\
333 rules: {}, 370 rules: {
371 bdcqzhrules:[
372 { required: true, message: "不动产权证号:", trigger: "change" },
373 ],
374 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
375 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
376 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
377 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
378 },
334 }; 379 };
335 }, 380 },
336 created() { 381 created() {
...@@ -339,27 +384,22 @@ export default { ...@@ -339,27 +384,22 @@ export default {
339 mounted() {}, 384 mounted() {},
340 methods: { 385 methods: {
341 loadData() { 386 loadData() {
342 console.log("预告登记", this.propsParam);
343 this.propsParam.isEdit=this.$parent.isEdit 387 this.propsParam.isEdit=this.$parent.isEdit
344 init(this.propsParam).then((res) => { 388 init(this.propsParam).then((res) => {
345 if (res.code == 200) { 389 if (res.code == 200) {
346 this.ruleForm = res.result; 390 this.ruleForm = res.result;
347 console.log("this.ruleForm", this.ruleForm);
348 this.isShow = true; 391 this.isShow = true;
349 } 392 }
350 }); 393 });
351 }, 394 },
352 // 更新土地用途信息 395 // 更新土地用途信息
353 upDateTdytxxList(val) { 396 upDateTdytxxList(val) {
354 console.log("VAL", val);
355 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 397 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
356 this.key++; 398 this.key++;
357 }, 399 },
358 // 更新权利人信息 400 // 更新权利人信息
359 upDateQlrxxList(val) { 401 upDateQlrxxList(val) {
360 console.log("val", val);
361 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 402 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
362 console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
363 this.czrOptions = this.ruleForm.qlrData; 403 this.czrOptions = this.ruleForm.qlrData;
364 this.key++; 404 this.key++;
365 }, 405 },
...@@ -369,7 +409,8 @@ export default { ...@@ -369,7 +409,8 @@ export default {
369 this.key++; 409 this.key++;
370 }, 410 },
371 onSubmit() { 411 onSubmit() {
372 console.log("this.ruleForm大信息", this.ruleForm); 412 this.$refs.ruleForm.validate((valid) => {
413 if (valid) {
373 if (this.ruleForm.qlrData.length == 0) { 414 if (this.ruleForm.qlrData.length == 0) {
374 this.$message({ 415 this.$message({
375 showClose: true, 416 showClose: true,
...@@ -423,6 +464,10 @@ export default { ...@@ -423,6 +464,10 @@ export default {
423 }); 464 });
424 } 465 }
425 }); 466 });
467 } else {
468 return false;
469 }
470 });
426 }, 471 },
427 }, 472 },
428 }; 473 };
......
...@@ -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 inline-message
17 label-width="145px"
17 > 18 >
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 19 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 20 <div class="slxx_title title-block">
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
38 </el-col> 39 </el-col>
39 </el-row> 40 </el-row>
40 <div class="slxx_title title-block"> 41 <div class="slxx_title title-block">
41 房地产权(独幢、层、套、间房屋) 42 异议登记信息
42 <div class="triangle"></div> 43 <div class="triangle"></div>
43 </div> 44 </div>
44 <el-row :gutter="10"> 45 <el-row :gutter="10">
...@@ -69,11 +70,11 @@ ...@@ -69,11 +70,11 @@
69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 70 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
70 </el-form-item> 71 </el-form-item>
71 </el-col> --> 72 </el-col> -->
72 <!-- <el-col :span="8"> 73 <el-col :span="8">
73 <el-form-item label="登记类型:"> 74 <el-form-item label="登记类型:">
74 <el-select v-model="ruleForm.qlxx.djlx"> 75 <el-select v-model="ruleForm.qlxx.djlx">
75 <el-option 76 <el-option
76 v-for="item in dictData['A21']" 77 v-for="item in djlxlist"
77 :key="item.dcode" 78 :key="item.dcode"
78 :label="item.dname" 79 :label="item.dname"
79 :value="item.dcode" 80 :value="item.dcode"
...@@ -81,35 +82,42 @@ ...@@ -81,35 +82,42 @@
81 </el-option> 82 </el-option>
82 </el-select> 83 </el-select>
83 </el-form-item> 84 </el-form-item>
84 </el-col> --> 85 </el-col>
85 <!-- <el-col :span="8"> 86 <!-- <el-col :span="8">
86 <el-form-item label="不动产坐落:"> 87 <el-form-item label="不动产坐落:">
87 <el-input v-model="ruleForm.qlxx.zl"></el-input> 88 <el-input v-model="ruleForm.qlxx.zl"></el-input>
88 </el-form-item> 89 </el-form-item>
89 </el-col> --> 90 </el-col> -->
90 <!-- <el-col :span="8"> 91 <el-col :span="8">
91 <el-form-item label="不动产权证号:"> 92 <el-form-item label="不动产权证号:" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
92 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 93 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
93 </el-form-item> 94 </el-form-item>
94 </el-col> --> 95 </el-col>
95 <el-col :span="8"> 96 <el-col :span="8">
96 <el-form-item label="区县代码:"> 97 <el-form-item label="区县代码:" prop="qlxx.qxdm" :rules="rules.qxdmrules">
97 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 98 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
98 </el-form-item> 99 </el-form-item>
99 </el-col> 100 </el-col>
100 <el-col :span="8"> 101 <el-col :span="8">
101 <el-form-item label="登记机构:"> 102 <el-form-item label="登记机构:" prop="qlxx.djjg" :rules="rules.djjgrules">
102 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 103 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
103 </el-form-item> 104 </el-form-item>
104 </el-col> 105 </el-col>
105 <el-col :span="8"> 106 <el-col :span="8">
106 <el-form-item label="登簿人:"> 107 <el-form-item label="登簿人:" prop="qlxx.dbr" :rules="rules.dbrrules">
107 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 108 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
108 </el-form-item> 109 </el-form-item>
109 </el-col> 110 </el-col>
110 <el-col :span="8"> 111 <el-col :span="8">
111 <el-form-item label="登记时间:"> 112 <el-form-item label="登记时间:" prop="qlxx.djsj" :rules="rules.djsjrules">
112 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 113 <el-date-picker
114 v-model="ruleForm.qlxx.djsj"
115 type="date"
116 placeholder="选择日期"
117 value-format="yyyy-MM-dd HH:mm:ss"
118 format="yyyy-MM-dd"
119 >
120 </el-date-picker>
113 </el-form-item> 121 </el-form-item>
114 </el-col> 122 </el-col>
115 <el-col :span="8"> 123 <el-col :span="8">
...@@ -153,7 +161,14 @@ ...@@ -153,7 +161,14 @@
153 </el-col> 161 </el-col>
154 <el-col :span="8"> 162 <el-col :span="8">
155 <el-form-item label="注销异议登记时间"> 163 <el-form-item label="注销异议登记时间">
156 <el-input v-model="ruleForm.yydj.zxyydjsj"></el-input> 164 <el-date-picker
165 v-model="ruleForm.yydj.zxyydjsj"
166 type="date"
167 placeholder="选择日期"
168 value-format="yyyy-MM-dd HH:mm:ss"
169 format="yyyy-MM-dd"
170 >
171 </el-date-picker>
157 </el-form-item> 172 </el-form-item>
158 </el-col> 173 </el-col>
159 <el-col :span="8"> 174 <el-col :span="8">
...@@ -189,8 +204,7 @@ ...@@ -189,8 +204,7 @@
189 :key="key" 204 :key="key"
190 :gyfs="ruleForm.qlxx.gyfs" 205 :gyfs="ruleForm.qlxx.gyfs"
191 /> 206 />
192 207 <div v-if="ruleForm.ywrData">
193 <div>
194 <div class="slxx_title title-block"> 208 <div class="slxx_title title-block">
195 义务人信息 209 义务人信息
196 <div class="triangle"></div> 210 <div class="triangle"></div>
...@@ -203,7 +217,7 @@ ...@@ -203,7 +217,7 @@
203 /> 217 />
204 </div> 218 </div>
205 </div> 219 </div>
206 <el-row class="btn"> 220 <el-row class="btn" v-if="!$route.query.viewtype">
207 <el-form-item> 221 <el-form-item>
208 <el-button type="primary" @click="onSubmit">保存</el-button> 222 <el-button type="primary" @click="onSubmit">保存</el-button>
209 </el-form-item> 223 </el-form-item>
...@@ -231,6 +245,34 @@ export default { ...@@ -231,6 +245,34 @@ export default {
231 disabled: true, 245 disabled: true,
232 czrOptions: [], 246 czrOptions: [],
233 ruleForm: {}, 247 ruleForm: {},
248 // 登记类型
249 djlxlist: [
250 {
251 dcode: "100",
252 dname: "首次登记",
253 },
254 {
255 dcode: "200",
256 dname: "转移登记",
257 },
258 {
259 dcode: "300",
260 dname: "变更登记",
261 },
262 {
263 dcode: "500",
264 dname: "更正登记",
265 },
266
267 {
268 dcode: "901",
269 dname: "补证",
270 },
271 {
272 dcode: "902",
273 dname: "换证",
274 },
275 ],
234 // 权属状态 276 // 权属状态
235 qsztlist: [ 277 qsztlist: [
236 { 278 {
...@@ -243,7 +285,15 @@ export default { ...@@ -243,7 +285,15 @@ export default {
243 }, 285 },
244 ], 286 ],
245 //传递参数\ 287 //传递参数\
246 rules: {}, 288 rules: {
289 bdcqzhrules:[
290 { required: true, message: "不动产权证号:", trigger: "change" },
291 ],
292 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
293 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
294 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
295 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
296 },
247 }; 297 };
248 }, 298 },
249 created() { 299 created() {
...@@ -252,27 +302,22 @@ export default { ...@@ -252,27 +302,22 @@ export default {
252 mounted() {}, 302 mounted() {},
253 methods: { 303 methods: {
254 loadData() { 304 loadData() {
255 console.log("异议登记", this.propsParam);
256 this.propsParam.isEdit=this.$parent.isEdit 305 this.propsParam.isEdit=this.$parent.isEdit
257 init(this.propsParam).then((res) => { 306 init(this.propsParam).then((res) => {
258 if (res.code == 200) { 307 if (res.code == 200) {
259 this.ruleForm = res.result; 308 this.ruleForm = res.result;
260 console.log("this.ruleForm", this.ruleForm);
261 this.isShow = true; 309 this.isShow = true;
262 } 310 }
263 }); 311 });
264 }, 312 },
265 // 更新土地用途信息 313 // 更新土地用途信息
266 upDateTdytxxList(val) { 314 upDateTdytxxList(val) {
267 console.log("VAL", val);
268 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 315 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
269 this.key++; 316 this.key++;
270 }, 317 },
271 // 更新权利人信息 318 // 更新权利人信息
272 upDateQlrxxList(val) { 319 upDateQlrxxList(val) {
273 console.log("val", val);
274 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 320 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
275 console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
276 this.czrOptions = this.ruleForm.qlrData; 321 this.czrOptions = this.ruleForm.qlrData;
277 this.key++; 322 this.key++;
278 }, 323 },
...@@ -282,7 +327,8 @@ export default { ...@@ -282,7 +327,8 @@ export default {
282 this.key++; 327 this.key++;
283 }, 328 },
284 onSubmit() { 329 onSubmit() {
285 console.log("this.ruleForm大信息", this.ruleForm); 330 this.$refs.ruleForm.validate((valid) => {
331 if (valid) {
286 if (this.ruleForm.qlrData.length == 0) { 332 if (this.ruleForm.qlrData.length == 0) {
287 this.$message({ 333 this.$message({
288 showClose: true, 334 showClose: true,
...@@ -336,6 +382,10 @@ export default { ...@@ -336,6 +382,10 @@ export default {
336 }); 382 });
337 } 383 }
338 }); 384 });
385 } else {
386 return false;
387 }
388 });
339 }, 389 },
340 }, 390 },
341 }; 391 };
......
...@@ -4,140 +4,142 @@ ...@@ -4,140 +4,142 @@
4 * @LastEditTime: 2023-05-17 10:41:24 4 * @LastEditTime: 2023-05-17 10:41:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class='spyj loadingtext'> 7 <div class="spyj loadingtext">
8 <div class="box"> 8 <div class="box">
9 <b class="spyj_title">审批表</b> 9 <b class="spyj_title">审批表</b>
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <div v-for="(item, index) in tableData" :key="index">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 <el-form :model="tableData[index]" label-width="120px" :rules="rules" :ref="'ruleFormRef'+index">
12 <div class="item_left"> 12 <div class="spyj_form" >
13 {{ item.jdmc }}意见 13 <div class="item_left">{{ item.jdmc }}意见</div>
14 </div>
15 <div class="item_right"> 14 <div class="item_right">
16 <el-row> 15 <el-row>
17 <el-col :span="24"> 16 <el-col :span="24">
18 <el-form-item label-width="0" class="opinion_item" prop="shyj"> 17 <el-form-item
19 <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见" 18 label-width="0"
20 v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input> 19 class="opinion_item"
21 <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true"> 20 prop="shyj"
22 </el-input> 21 >
23 <el-button class="opinion_btn" @click="commonOpinion" 22 <el-input
24 v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button> 23 type="textarea"
24 :rows="4"
25 class="opinion"
26 placeholder="请输入审批意见"
27 v-model="item.shyj"
28 ></el-input>
25 </el-form-item> 29 </el-form-item>
26 </el-col> 30 </el-col>
27 </el-row> 31 </el-row>
28 <el-row> 32 <el-row>
29 <el-col :span="16"> 33 <el-col :span="16">
30 <el-form-item label="审查人" prop="shryxm"> 34 <el-form-item
31 {{ item.shryxm }} 35 label="审查人"
36 prop="shryxm"
37 >
38 <el-input v-model="item.shryxm"></el-input>
32 </el-form-item> 39 </el-form-item>
33 </el-col> 40 </el-col>
34 <el-col :span="8"> 41 <el-col :span="8">
35 <el-form-item label="审核时间" prop="shjssj" :key="refresh"> 42 <el-form-item
36 {{ item.shjssj }} 43 label="审核时间"
44 prop="shsj"
45 >
46 <el-date-picker
47 v-model="item.shsj"
48 type="date"
49 placeholder="选择日期"
50 value-format="yyyy/MM/dd HH:mm:ss"
51 format="yyyy/MM/dd"
52 >
53 </el-date-picker>
37 </el-form-item> 54 </el-form-item>
38 </el-col> 55 </el-col>
39 </el-row> 56 </el-row>
40 </div> 57 </div>
41 </div> 58 </div>
42 <div class="submit_button" v-if="ableOperation">
43 <el-button type="primary" @click="onSubmit">保存</el-button>
44 </div>
45 </el-form> 59 </el-form>
46 </div> 60 </div>
47 <el-empty v-if="isNoData" description="暂无数据"></el-empty> 61 <div class="submit_button" v-if="!$route.query.viewtype">
62 <el-button type="primary" @click="onSubmit('ruleFormRef')">保存</el-button>
63 </div>
64 </div>
65 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
48 </div> 66 </div>
49 </template> 67 </template>
50 <script> 68 <script>
51 import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js"; 69 import { addidea } from "@/api/djbbl.js";
52 import { mapGetters } from 'vuex' 70 import { mapGetters } from "vuex";
53 export default { 71 export default {
54 computed: { 72 computed: {
55 ...mapGetters(['userData', 'yjsqOptions']) 73 ...mapGetters(["userData", "yjsqOptions"]),
56 }, 74 },
57 data () { 75 data() {
58 return { 76 return {
59 isNoData: false, 77 isNoData: false,
60 bsmSlsq: '',
61 //刷新值
62 refresh: 10,
63 ableOperation: true, 78 ableOperation: true,
64 bsmSlsq: this.$route.query.bsmSlsq, 79
65 bestepid: this.$route.query.bestepid, 80 tableData: [{ jdmc: "初审" }, { jdmc: "复审" }, { jdmc: "核定" }],
66 ruleForm: {}, 81
67 rules: { 82 rules: {
68 shyj: [ 83 shyj: [{ required: true, message: "请填写意见", trigger: "blur" }],
69 { required: true, message: '请输入审批意见', trigger: 'blur' } 84 shryxm: [{ required: true, message: "审查人", trigger: "blur" }],
70 ], 85 shsj: [{ required: true, message: "审核时间", trigger: "blur" }],
71 }, 86 },
72 tableData: [], 87 };
73 propsParam: {}
74 }
75 },
76 watch: {
77 yjsqOptions: {
78 handler (val) {
79 this.ruleForm.shyj = val
80 },
81 deep: true,
82 immediate: true
83 },
84 },
85 mounted () {
86 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) {
88 this.ableOperation = false
89 }
90 this.list();
91 }, 88 },
92 methods: {
93 //审批意见数据初始化
94 list () {
95 let that = this
96 this.$startLoading()
97 var formdata = new FormData();
98 formdata.append("bsmBusiness", this.propsParam.bsmRepair);
99 formdata.append("bestepid", this.$route.query.bestepid);
100 formdata.append("ableOperation", this.ableOperation)
101 getSpyjList(formdata).then((res) => {
102 this.$endLoading()
103 if (res.code === 200 && res.result) {
104 89
105 this.tableData = res.result ? res.result : [] 90 watch: {},
106 console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData); 91 created() {},
107 if (res.result.length == 0) { 92 mounted() {},
108 that.isNoData = true 93 methods: {
109 } 94 onSubmit(formName) {
110 this.ruleForm = res.result[res.result.length - 1] 95 const falg = []
111 } 96 for (let index = 0; index < this.tableData.length; index++) {
112 }) 97 this.$refs[formName + index][0].validate((valid) => {
113 }, 98 if (valid) {
114 onSubmit () { 99 falg.push(1)
115 this.ruleForm.bsmSlsq = this.bsmSlsq 100 }
116 this.ruleForm.bestepid = this.bestepid 101 });
117 saveSpyjBySlsq(this.ruleForm).then(res => { 102 }
103 if (falg.length == this.tableData.length) {
104 this.tableData.forEach((item, index) => {
105 item["bsmBusiness"] = this.$parent.bsmRepair;
106 }),
107 addidea(this.tableData).then((res) => {
118 if (res.code === 200) { 108 if (res.code === 200) {
119 this.$message.success("保存成功") 109 this.$message.success("保存成功");
120 this.refresh += 1 110 this.refresh += 1;
121 } else { 111 } else {
122 this.$message.error(res.message) 112 this.$message.error(res.message);
113 }
114 });
115 } else {
116 return false;
123 } 117 }
124 })
125 }, 118 },
126 //打开常用意见列表弹窗 119 // onSubmit() {
127 commonOpinion () { 120 // this.$refs.tablelist[index].validate((valid) => {
128 this.$popupDialog("常用意见", "djbworkflow/components/dialog/commonOpinion", {}, "70%", true) 121 // if (valid) {
122 // this.tableData.forEach((item, index) => {
123 // item["bsmBusiness"] = this.$parent.bsmRepair;
124 // }),
125 // addidea(this.tableData).then((res) => {
126 // if (res.code === 200) {
127 // this.$message.success("保存成功");
128 // this.refresh += 1;
129 // } else {
130 // this.$message.error(res.message);
131 // }
132 // });
133 // }
134 // });
135 // },
129 }, 136 },
130 //使用常用意见 137 };
131 useOpinion (opinion) {
132 this.ruleForm.shyj = opinion
133 }
134 }
135 }
136 </script> 138 </script>
137 <style scoped lang='scss'> 139 <style scoped lang="scss">
138 @import "~@/styles/mixin.scss"; 140 @import "~@/styles/mixin.scss";
139 141
140 .spyj { 142 .spyj {
141 width: 100%; 143 width: 100%;
142 height: 100%; 144 height: 100%;
143 background-color: #f5f5f5; 145 background-color: #f5f5f5;
...@@ -229,5 +231,5 @@ ...@@ -229,5 +231,5 @@
229 text-align: center; 231 text-align: center;
230 margin: 15px 0; 232 margin: 15px 0;
231 } 233 }
232 } 234 }
233 </style> 235 </style>
......
...@@ -75,10 +75,11 @@ export default { ...@@ -75,10 +75,11 @@ export default {
75 finishedInfo: { 75 finishedInfo: {
76 finishedTaskSet: result.finishedActivityIds, 76 finishedTaskSet: result.finishedActivityIds,
77 unfinishedTaskSet: result.runningActivityIds, 77 unfinishedTaskSet: result.runningActivityIds,
78 rejectedTaskSet: result.rejectedTaskSet, 78 rejectedTaskSet: {},
79 finishedSequenceFlowSet: result.finishedSequenceFlowIds 79 finishedSequenceFlowSet: result.finishedSequenceFlowIds
80 }, 80 },
81 allCommentList: result.historyTaskList 81 handlinglist:result.runningTasks,
82 allCommentList: result.finishedTasks
82 }, '80%', true) 83 }, '80%', true)
83 }) 84 })
84 break; 85 break;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 15:31:00 4 * @LastEditTime: 2023-07-11 08:58:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
12 <li 12 <li
13 @click="operation(item)" 13 @click="operation(item)"
14 v-for="(item, index) in leftButtonList" 14 v-for="(item, index) in leftButtonList"
15 :key="index" 15 :key="index">
16 >
17 <svg-icon class="icon" :icon-class="item.icon" /> 16 <svg-icon class="icon" :icon-class="item.icon" />
18 <span class="iconName">{{ item.name }}</span> 17 <span class="iconName">{{ item.name }}</span>
19 </li> 18 </li>
...@@ -22,8 +21,7 @@ ...@@ -22,8 +21,7 @@
22 <li 21 <li
23 @click="operation(item)" 22 @click="operation(item)"
24 v-for="(item, index) in rightButtonList" 23 v-for="(item, index) in rightButtonList"
25 :key="index" 24 :key="index">
26 >
27 <svg-icon class="icon" :icon-class="item.icon" /> 25 <svg-icon class="icon" :icon-class="item.icon" />
28 <span class="iconName">{{ item.name }}</span> 26 <span class="iconName">{{ item.name }}</span>
29 </li> 27 </li>
...@@ -50,15 +48,13 @@ ...@@ -50,15 +48,13 @@
50 :label="item.name" 48 :label="item.name"
51 :name="item.value" 49 :name="item.value"
52 v-for="item in tabList" 50 v-for="item in tabList"
53 :key="item.value" 51 :key="item.value">
54 >
55 </el-tab-pane> 52 </el-tab-pane>
56 </el-tabs> 53 </el-tabs>
57 <component 54 <component
58 :key="fresh" 55 :key="fresh"
59 :is="componentTag" 56 :is="componentTag"
60 v-bind="currentSelectProps" 57 v-bind="currentSelectProps" />
61 />
62 </div> 58 </div>
63 </div> 59 </div>
64 </div> 60 </div>
...@@ -67,28 +63,28 @@ ...@@ -67,28 +63,28 @@
67 </div> 63 </div>
68 </template> 64 </template>
69 <style scoped lang="scss"> 65 <style scoped lang="scss">
70 @import "~@/styles/mixin.scss"; 66 @import "~@/styles/mixin.scss";
71 @import "./workFrame.scss"; 67 @import "./workFrame.scss";
72 </style> 68 </style>
73 <script> 69 <script>
74 import WorkFlow from "./mixin/index"; 70 import WorkFlow from "./mixin/index";
75 import { getForm } from "./flowform"; 71 import { getForm } from "./flowform";
76 import { getStepFormInfo } from "@/api/fqsq.js"; 72 import { getStepFormInfo } from "@/api/fqsq.js";
77 import NoticeBar from "@/components/NoticeBar/index"; 73 import NoticeBar from "@/components/NoticeBar/index";
78 import ProcessViewer from "./components/processViewer.vue"; 74 import ProcessViewer from "./components/processViewer.vue";
79 // 引入左侧菜单 75 // 引入左侧菜单
80 import { leftMenubl } from "@/api/djbbl.js"; 76 import { leftMenubl } from "@/api/djbbl.js";
81 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 77 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
82 import qllxDailog from "./djbBook/components/qllxDailog"; 78 import qllxDailog from "./djbBook/components/qllxDailog";
83 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 79 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
84 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js"; 80 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
85 // 登记簿数据信息 81 // 登记簿数据信息
86 import { addRepairRecord } from "@/api/djbbl.js"; 82 import { addRepairRecord } from "@/api/djbbl.js";
87 // 获取权利类型数组 83 // 获取权利类型数组
88 import { getQllxByBdcdyid } from "@/api/djbbl.js"; 84 import { getQllxByBdcdyid } from "@/api/djbbl.js";
89 85
90 import { getBdcqljqtsx } from "@/api/registerBook.js"; 86 import { getBdcqljqtsx } from "@/api/registerBook.js";
91 export default { 87 export default {
92 components: { 88 components: {
93 selectBdc, 89 selectBdc,
94 NoticeBar, 90 NoticeBar,
...@@ -97,7 +93,7 @@ export default { ...@@ -97,7 +93,7 @@ export default {
97 qllxDailog, 93 qllxDailog,
98 }, 94 },
99 mixins: [WorkFlow], 95 mixins: [WorkFlow],
100 data() { 96 data () {
101 return { 97 return {
102 bsmSlsq: this.$route.query.bsmSlsq, 98 bsmSlsq: this.$route.query.bsmSlsq,
103 //当前流程所在环节 99 //当前流程所在环节
...@@ -109,7 +105,7 @@ export default { ...@@ -109,7 +105,7 @@ export default {
109 qllx: this.$route.query.qllx, 105 qllx: this.$route.query.qllx,
110 //设置那个表单选中 106 //设置那个表单选中
111 tabName: "", 107 tabName: "",
112 isEdit:true, 108 isEdit: true,
113 // 弹框显示 109 // 弹框显示
114 dialogVisible: true, 110 dialogVisible: true,
115 //表单集合 111 //表单集合
...@@ -129,12 +125,12 @@ export default { ...@@ -129,12 +125,12 @@ export default {
129 defaultNode: {}, 125 defaultNode: {},
130 }; 126 };
131 }, 127 },
132 mounted() { 128 mounted () {
133 // this.getleftMenubl() 129 // this.getleftMenubl()
134 }, 130 },
135 131
136 methods: { 132 methods: {
137 stepForm(qllx) { 133 stepForm (qllx) {
138 this.oneSelectProps.qllx = qllx; 134 this.oneSelectProps.qllx = qllx;
139 if (this.$refs.Menu.supplementarylist.length) { 135 if (this.$refs.Menu.supplementarylist.length) {
140 getStepFormInfo(this.oneSelectProps).then((res) => { 136 getStepFormInfo(this.oneSelectProps).then((res) => {
...@@ -152,7 +148,7 @@ export default { ...@@ -152,7 +148,7 @@ export default {
152 // this.supplementarylist = res.result; 148 // this.supplementarylist = res.result;
153 // }) 149 // })
154 // }, 150 // },
155 getQllxByBdcdyid() { 151 getQllxByBdcdyid () {
156 if (this.currentSelectProps.bdcdyid) { 152 if (this.currentSelectProps.bdcdyid) {
157 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 153 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
158 (res) => { 154 (res) => {
...@@ -165,7 +161,7 @@ export default { ...@@ -165,7 +161,7 @@ export default {
165 } 161 }
166 }, 162 },
167 // 获取右侧选项卡 163 // 获取右侧选项卡
168 getCurrentSelectProps(val) { 164 getCurrentSelectProps (val) {
169 if (val.bdcdyid) { 165 if (val.bdcdyid) {
170 this.oneSelectProps = val; 166 this.oneSelectProps = val;
171 } 167 }
...@@ -181,7 +177,7 @@ export default { ...@@ -181,7 +177,7 @@ export default {
181 } 177 }
182 }, 178 },
183 // 获取渲染登记簿列表 179 // 获取渲染登记簿列表
184 getdjblist() { 180 getdjblist () {
185 getBdcqljqtsx({ 181 getBdcqljqtsx({
186 bdcdyid: this.currentSelectProps.bdcdyid, 182 bdcdyid: this.currentSelectProps.bdcdyid,
187 bdcdyh: this.currentSelectProps.bdcdyh, 183 bdcdyh: this.currentSelectProps.bdcdyh,
...@@ -210,23 +206,21 @@ export default { ...@@ -210,23 +206,21 @@ export default {
210 }); 206 });
211 }, 207 },
212 //右侧表单选项卡事件 208 //右侧表单选项卡事件
213 beforeLeave(activeName) { 209 beforeLeave (activeName) {
214 if (activeName && activeName != 0) this.getFromRouter(activeName); 210 if (activeName && activeName != 0) this.getFromRouter(activeName);
215 }, 211 },
216 //切换选项卡内容组件 212 //切换选项卡内容组件
217 getFromRouter(tabname) { 213 getFromRouter (tabname) {
218 console.log("切换选项卡内容组件", tabname,this.tabList);
219 this.componentTag = getForm(tabname); 214 this.componentTag = getForm(tabname);
220 }, 215 },
221 closefp() { 216 closefp () {
222 console.log("点击分屏");
223 this.splitScreen = this.splitScreen ? false : true; 217 this.splitScreen = this.splitScreen ? false : true;
224 this.$store.dispatch("app/set1tScreen", this.splitScreen); 218 this.$store.dispatch("app/set1tScreen", this.splitScreen);
225 this.getFromRouter(this.tabList[0].value); 219 this.getFromRouter(this.tabList[0].value);
226 this.clxxForm = getForm(this.tabList[1].value); 220 this.clxxForm = getForm(this.tabList[1].value);
227 }, 221 },
228 // 增加补录记录 222 // 增加补录记录
229 addRepairRecord(row, del) { 223 addRepairRecord (row, del) {
230 let from = { 224 let from = {
231 bsmQlxx: "", 225 bsmQlxx: "",
232 bsmSlsq: this.bsmSlsq, 226 bsmSlsq: this.bsmSlsq,
...@@ -263,9 +257,21 @@ export default { ...@@ -263,9 +257,21 @@ export default {
263 }) 257 })
264 .catch((res) => { 258 .catch((res) => {
265 console.log("错", res); 259 console.log("错", res);
266 }); 260 })
267 },
268 }, 261 },
269 }; 262 openDialog () {
263 this.$store.dispatch('user/refreshPage', false)
264 let data = JSON.parse(localStorage.getItem('ywbl'))
265 let title
266 if (data?.sqywmc) {
267 title = "申请业务:" + data?.sqywmc
268 } else {
269 title = "申请业务:" + data?.djywmc
270 }
271
272 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
273 }
274 }
275 };
270 </script> 276 </script>
271 <style scoped lang="scss"></style> 277 <style scoped lang="scss"></style>
......
...@@ -22,19 +22,32 @@ ...@@ -22,19 +22,32 @@
22 :class="[ 22 :class="[
23 row.qszt == '2' ? 'lishi' : '', 23 row.qszt == '2' ? 'lishi' : '',
24 row.qszt == '0' ? 'linshi' : '', 24 row.qszt == '0' ? 'linshi' : '',
25 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 25
26 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 26 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
27 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
28 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
29 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
27 ]"> 31 ]">
28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 33 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 34 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
31 </div> 35 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 36 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
33 正在办理 37 失效
34 </div> 38 </div>
35 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 39 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
36 有效 40 有效
37 </div> 41 </div>
42 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
43 正在补录
44 </div>
45 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
46 正在申请
47 </div>
48 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
49 正在注销
50 </div>
38 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span> 51 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
39 52
40 <span v-else>{{ row[item.prop] }}</span> 53 <span v-else>{{ row[item.prop] }}</span>
......
...@@ -24,8 +24,11 @@ ...@@ -24,8 +24,11 @@
24 :class="[ 24 :class="[
25 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
27 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 27 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
28 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 28 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
29 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
31 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
29 ]"> 32 ]">
30 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 33 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
31 <el-button 34 <el-button
...@@ -37,12 +40,21 @@ ...@@ -37,12 +40,21 @@
37 icon="el-icon-edit-outline" 40 icon="el-icon-edit-outline"
38 @click="editDialog(row, 'D')">删除</el-button> 41 @click="editDialog(row, 'D')">删除</el-button>
39 </div> 42 </div>
40 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
41 正在办理 44 失效
42 </div> 45 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 46 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
44 有效 47 有效
45 </div> 48 </div>
49 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
50 正在补录
51 </div>
52 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
53 正在申请
54 </div>
55 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
56 正在注销
57 </div>
46 <span v-if="item.prop == 'qszt'"> 58 <span v-if="item.prop == 'qszt'">
47 {{ getQsztName(row[item.prop]) }} 59 {{ getQsztName(row[item.prop]) }}
48 </span> 60 </span>
......
...@@ -24,19 +24,31 @@ ...@@ -24,19 +24,31 @@
24 :class="[ 24 :class="[
25 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
27 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 27 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
28 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 28 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
29 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
31 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
29 ]"> 32 ]">
30 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 33 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
31 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 34 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
32 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 35 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
33 </div> 36 </div>
34 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 37 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
35 正在办理 38 失效
36 </div> 39 </div>
37 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 40 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
38 有效 41 有效
39 </div> 42 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
44 正在补录
45 </div>
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
47 正在申请
48 </div>
49 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
50 正在注销
51 </div>
40 <span v-if="item.prop == 'qszt'"> 52 <span v-if="item.prop == 'qszt'">
41 {{ getQsztName(row[item.prop]) }} 53 {{ getQsztName(row[item.prop]) }}
42 </span> 54 </span>
......
...@@ -19,19 +19,31 @@ ...@@ -19,19 +19,31 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
26 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
24 ]"> 27 ]">
25 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
28 </div> 31 </div>
29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 32 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
30 正在办理 33 失效
31 </div> 34 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 35 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
33 有效 36 有效
34 </div> 37 </div>
38 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
39 正在补录
40 </div>
41 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
42 正在申请
43 </div>
44 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
45 正在注销
46 </div>
35 <span v-if="item.prop == 'qszt'"> 47 <span v-if="item.prop == 'qszt'">
36 {{ getQsztName(row[item.prop]) }} 48 {{ getQsztName(row[item.prop]) }}
37 </span> 49 </span>
...@@ -71,9 +83,10 @@ ...@@ -71,9 +83,10 @@
71 }, 83 },
72 methods: { 84 methods: {
73 loadData () { 85 loadData () {
74 if(this.$parent.addRepairRecord){ 86 if (this.$parent.addRepairRecord) {
75 this.columns.unshift({prop:"cz", 87 this.columns.unshift({
76 label:"操作" 88 prop: "cz",
89 label: "操作"
77 }) 90 })
78 } 91 }
79 getJsydsyqList({ 92 getJsydsyqList({
...@@ -114,13 +127,13 @@ ...@@ -114,13 +127,13 @@
114 return name; 127 return name;
115 }, 128 },
116 // 新增一条补录信息 129 // 新增一条补录信息
117 editDialog(row,del){ 130 editDialog (row, del) {
118 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 131 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
119 confirmButtonText: '确定', 132 confirmButtonText: '确定',
120 cancelButtonText: '取消', 133 cancelButtonText: '取消',
121 type: 'warning' 134 type: 'warning'
122 }).then(() => { 135 }).then(() => {
123 this.$parent.addRepairRecord(row,del) 136 this.$parent.addRepairRecord(row, del)
124 137
125 this.$message({ 138 this.$message({
126 type: 'success', 139 type: 'success',
......
...@@ -24,8 +24,11 @@ ...@@ -24,8 +24,11 @@
24 :class="[ 24 :class="[
25 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
27 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 27 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
28 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 28 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
29 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
31 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
29 ]"> 32 ]">
30 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 33 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
31 <el-button 34 <el-button
...@@ -37,12 +40,21 @@ ...@@ -37,12 +40,21 @@
37 icon="el-icon-edit-outline" 40 icon="el-icon-edit-outline"
38 @click="editDialog(row, 'D')">删除</el-button> 41 @click="editDialog(row, 'D')">删除</el-button>
39 </div> 42 </div>
40 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
41 正在办理 44 失效
42 </div> 45 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 46 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
44 有效 47 有效
45 </div> 48 </div>
49 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
50 正在补录
51 </div>
52 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
53 正在申请
54 </div>
55 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
56 正在注销
57 </div>
46 <span v-if="item.prop == 'qszt'"> 58 <span v-if="item.prop == 'qszt'">
47 {{ getQsztName(row[item.prop]) }} 59 {{ getQsztName(row[item.prop]) }}
48 </span> 60 </span>
......
...@@ -19,19 +19,31 @@ ...@@ -19,19 +19,31 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
26 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
24 ]"> 27 ]">
25 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
28 </div> 31 </div>
29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 32 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
30 正在办理 33 失效
31 </div> 34 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 35 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
33 有效 36 有效
34 </div> 37 </div>
38 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
39 正在补录
40 </div>
41 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
42 正在申请
43 </div>
44 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
45 正在注销
46 </div>
35 <span v-if="item.prop == 'qszt'"> 47 <span v-if="item.prop == 'qszt'">
36 {{ getQsztName(row[item.prop]) }} 48 {{ getQsztName(row[item.prop]) }}
37 </span> 49 </span>
...@@ -72,9 +84,10 @@ ...@@ -72,9 +84,10 @@
72 methods: { 84 methods: {
73 loadData () { 85 loadData () {
74 86
75 if(this.$parent.addRepairRecord){ 87 if (this.$parent.addRepairRecord) {
76 this.columns.unshift({prop:"cz", 88 this.columns.unshift({
77 label:"操作" 89 prop: "cz",
90 label: "操作"
78 }) 91 })
79 } 92 }
80 getJsydsyqList({ 93 getJsydsyqList({
...@@ -115,13 +128,13 @@ ...@@ -115,13 +128,13 @@
115 return name; 128 return name;
116 }, 129 },
117 // 新增一条补录信息 130 // 新增一条补录信息
118 editDialog(row,del){ 131 editDialog (row, del) {
119 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 132 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
120 confirmButtonText: '确定', 133 confirmButtonText: '确定',
121 cancelButtonText: '取消', 134 cancelButtonText: '取消',
122 type: 'warning' 135 type: 'warning'
123 }).then(() => { 136 }).then(() => {
124 this.$parent.addRepairRecord(row,del) 137 this.$parent.addRepairRecord(row, del)
125 138
126 this.$message({ 139 this.$message({
127 type: 'success', 140 type: 'success',
......
...@@ -19,19 +19,31 @@ ...@@ -19,19 +19,31 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 row.qlzt == '0' ? 'zhuxiaoIcon' : '',
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 row.qlzt == '3' ? 'linshiIcon' : '',
24 row.qlzt == '2' ? 'linshiIcon' : '',
25 row.qlzt == '1' ? 'xianshiIcon' : '',
26 row.qlzt == '4' ? 'zhuxiaoIcon' : '',
24 ]"> 27 ]">
25 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
28 </div> 31 </div>
29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 32 <div class="icon" v-if="row.qlzt == '0'">
30 正在办理 33 失效
31 </div> 34 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 35 <div class="icon" v-if="row.qlzt == '1'">
33 有效 36 有效
34 </div> 37 </div>
38 <div class="icon" v-if="row.qlzt == '2'">
39 正在补录
40 </div>
41 <div class="icon" v-if="row.qlzt == '3'">
42 正在申请
43 </div>
44 <div class="icon" v-if="row.qlzt == '4'">
45 正在注销
46 </div>
35 <span v-if="item.prop == 'qszt'"> 47 <span v-if="item.prop == 'qszt'">
36 {{ getQsztName(row[item.prop]) }} 48 {{ getQsztName(row[item.prop]) }}
37 </span> 49 </span>
...@@ -50,15 +62,27 @@ ...@@ -50,15 +62,27 @@
50 <td v-for="(row, index) in tableData" :key="index" :class="[ 62 <td v-for="(row, index) in tableData" :key="index" :class="[
51 row.qszt == '2' ? 'lishi' : '', 63 row.qszt == '2' ? 'lishi' : '',
52 row.qszt == '0' ? 'linshi' : '', 64 row.qszt == '0' ? 'linshi' : '',
53 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 65 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
54 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 66 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
67 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
68 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
69 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
55 ]"> 70 ]">
56 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 71 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
57 正在办理 72 失效
58 </div> 73 </div>
59 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 74 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
60 有效 75 有效
61 </div> 76 </div>
77 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
78 正在补录
79 </div>
80 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
81 正在申请
82 </div>
83 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
84 正在注销
85 </div>
62 <span v-if="item.prop == 'qszt'"> 86 <span v-if="item.prop == 'qszt'">
63 {{ getQsztName(row[item.prop]) }} 87 {{ getQsztName(row[item.prop]) }}
64 </span> 88 </span>
......
...@@ -19,19 +19,31 @@ ...@@ -19,19 +19,31 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
26 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
24 ]"> 27 ]">
25 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
28 </div> 31 </div>
29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 32 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
30 正在办理 33 失效
31 </div> 34 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 35 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
33 有效 36 有效
34 </div> 37 </div>
38 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
39 正在补录
40 </div>
41 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
42 正在申请
43 </div>
44 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
45 正在注销
46 </div>
35 <span v-if="item.prop == 'qszt'"> 47 <span v-if="item.prop == 'qszt'">
36 {{ getQsztName(row[item.prop]) }} 48 {{ getQsztName(row[item.prop]) }}
37 </span> 49 </span>
...@@ -72,9 +84,10 @@ ...@@ -72,9 +84,10 @@
72 methods: { 84 methods: {
73 loadData () { 85 loadData () {
74 86
75 if(this.$parent.addRepairRecord){ 87 if (this.$parent.addRepairRecord) {
76 this.columns.unshift({prop:"cz", 88 this.columns.unshift({
77 label:"操作" 89 prop: "cz",
90 label: "操作"
78 }) 91 })
79 } 92 }
80 getTdsyqList({ 93 getTdsyqList({
...@@ -115,13 +128,13 @@ ...@@ -115,13 +128,13 @@
115 return name; 128 return name;
116 }, 129 },
117 // 新增一条补录信息 130 // 新增一条补录信息
118 editDialog(row,del){ 131 editDialog (row, del) {
119 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 132 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
120 confirmButtonText: '确定', 133 confirmButtonText: '确定',
121 cancelButtonText: '取消', 134 cancelButtonText: '取消',
122 type: 'warning' 135 type: 'warning'
123 }).then(() => { 136 }).then(() => {
124 this.$parent.addRepairRecord(row,del) 137 this.$parent.addRepairRecord(row, del)
125 138
126 this.$message({ 139 this.$message({
127 type: 'success', 140 type: 'success',
......
...@@ -18,19 +18,31 @@ ...@@ -18,19 +18,31 @@
18 <td v-for="(row, index) in tableData" :key="index" :class="[ 18 <td v-for="(row, index) in tableData" :key="index" :class="[
19 row.qszt == '2' ? 'lishi' : '', 19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
22 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 22 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
23 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
23 ]"> 26 ]">
24 <div class="setbut" v-if="item.prop == 'cz'"> 27 <div class="setbut" v-if="item.prop == 'cz'">
25 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 28 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
27 </div> 30 </div>
28 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 31 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
29 正在办理 32 失效
30 </div> 33 </div>
31 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 34 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
32 有效 35 有效
33 </div> 36 </div>
37 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
38 正在补录
39 </div>
40 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
41 正在申请
42 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
44 正在注销
45 </div>
34 <span v-if="item.prop == 'qszt'"> 46 <span v-if="item.prop == 'qszt'">
35 {{ getQsztName(row[item.prop]) }} 47 {{ getQsztName(row[item.prop]) }}
36 </span> 48 </span>
......
...@@ -18,19 +18,31 @@ ...@@ -18,19 +18,31 @@
18 <td v-for="(row, index) in tableData" :key="index" :class="[ 18 <td v-for="(row, index) in tableData" :key="index" :class="[
19 row.qszt == '2' ? 'lishi' : '', 19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
22 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 22 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
23 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
23 ]"> 26 ]">
24 <div class="setbut" v-if="item.prop == 'cz'"> 27 <div class="setbut" v-if="item.prop == 'cz'">
25 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 28 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
27 </div> 30 </div>
28 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 31 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
29 正在办理 32 失效
30 </div> 33 </div>
31 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'"> 34 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
32 有效 35 有效
33 </div> 36 </div>
37 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
38 正在补录
39 </div>
40 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
41 正在申请
42 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
44 正在注销
45 </div>
34 <span v-if="item.prop == 'qszt'"> 46 <span v-if="item.prop == 'qszt'">
35 {{ getQsztName(row[item.prop]) }} 47 {{ getQsztName(row[item.prop]) }}
36 </span> 48 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-04 16:08:03 4 * @LastEditTime: 2023-07-05 09:55:42
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -67,9 +67,11 @@ ...@@ -67,9 +67,11 @@
67 ...mapGetters(["dictData"]) 67 ...mapGetters(["dictData"])
68 }, 68 },
69 created () { 69 created () {
70 this.ableOperation = this.$parent.currentSelectTab.ableOperation
71 this.clmlInitList(1) 70 this.clmlInitList(1)
72 }, 71 },
72 mounted() {
73 this.ableOperation = this.$parent.isEdit;
74 },
73 methods: { 75 methods: {
74 // 自动预览 76 // 自动预览
75 nextPriview () { 77 nextPriview () {
...@@ -125,7 +127,6 @@ ...@@ -125,7 +127,6 @@
125 this.previewImg.bsmSj = item.bsmSj; 127 this.previewImg.bsmSj = item.bsmSj;
126 }, 128 },
127 updateList (val) { 129 updateList (val) {
128 console.log(val, 'valvalvalval');
129 let that = this 130 let that = this
130 if (val.children.length != []) { //删除最后一张图片时 val=null 131 if (val.children.length != []) { //删除最后一张图片时 val=null
131 this.tableData.forEach(item => { 132 this.tableData.forEach(item => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-04 15:04:59 4 * @LastEditTime: 2023-07-07 13:12:58
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;">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 v-for="(item, index) in headTabBdcqz" :key="index"> 11 v-for="(item, index) in headTabBdcqz" :key="index">
12 </el-tab-pane> 12 </el-tab-pane>
13 </el-tabs> 13 </el-tabs>
14 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div> 14 <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
15 <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas> 15 <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas>
16 <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas> 16 <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas>
17 </div> 17 </div>
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
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';
24 export default { 23 export default {
25 name: "zsyl", 24 name: "zsyl",
26 props: { 25 props: {
...@@ -31,6 +30,7 @@ ...@@ -31,6 +30,7 @@
31 }, 30 },
32 data () { 31 data () {
33 return { 32 return {
33 noData: false,
34 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'), 34 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'),
35 bdczmSrc: require('@/image/bdcqz/bdczm.jpg'), 35 bdczmSrc: require('@/image/bdcqz/bdczm.jpg'),
36 loading: false, 36 loading: false,
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
78 this.loading = true 78 this.loading = true
79 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => { 79 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
80 if (res.code == 200) { 80 if (res.code == 200) {
81 this.noData = true
81 if (res.result && res.result.length > 0) { 82 if (res.result && res.result.length > 0) {
82 this.activeName = res.result[0].bsmBdcqz 83 this.activeName = res.result[0].bsmBdcqz
83 this.bdcqz = res.result[0] 84 this.bdcqz = res.result[0]
......
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
83 }, 83 },
84 }, 84 },
85 mounted () { 85 mounted () {
86 this.propsParam.isEdit=this.$parent.isEdit
86 this.propsParam = this.$attrs; 87 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) { 88 if (this.$route.query.viewtype) {
88 this.ableOperation = false 89 this.ableOperation = false
......
...@@ -5,15 +5,78 @@ ...@@ -5,15 +5,78 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <lb-table 8 <el-table
9 :column="InformationTable" 9 :data="tableDataList"
10 border
10 :pagination="false" 11 :pagination="false"
11 :key="key" 12 :key="key"
13 :header-cell-style="{'text-align':'center'}"
12 :heightNumSetting="true" 14 :heightNumSetting="true"
13 :minHeight="150" 15 :minHeight="150"
14 :data="tableDataList" 16 height="150"
17 style="width: 100%"
15 > 18 >
16 </lb-table> 19 <el-table-column
20 prop="index"
21 width="50"
22 :render-header="renderHeader"
23 >
24 <template slot-scope="scope">
25 <i
26 class="el-icon-minus pointer"
27 @click="deleClick(scope.$index, scope.row)"
28 ></i>
29 </template>
30 </el-table-column>
31 <el-table-column prop="yt" label="土地用途" min-width="100">
32 <template slot-scope="scope">
33 <treeselect
34 v-model="tdyt"
35 noOptionsText="暂无数据"
36 placeholder=""
37 :show-count="true"
38 :options="dictData['tdyt']"
39 :normalizer="normalizer"
40 :appendToBody="true" z-index="9999"
41 @input="addrow(scope.row)"
42 />
43 </template>
44 </el-table-column>
45 <el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
46 <template slot-scope="scope">
47 <el-date-picker
48 v-model='scope.row.qssj'
49 type="date"
50 placeholder="选择日期"
51 value-format="yyyy/MM/dd HH:mm:ss"
52 format="yyyy/MM/dd"
53 @blur="addrow(scope.row)">
54 </el-date-picker>
55 </template>
56 </el-table-column>
57 <el-table-column prop="jssj" label="土地使用结束时间" min-width="100">
58 <template slot-scope="scope">
59 <el-date-picker
60 v-model='scope.row.jssj'
61 type="date"
62 placeholder="选择日期"
63 value-format="yyyy/MM/dd HH:mm:ss"
64 format="yyyy/MM/dd"
65 @blur="addrow(scope.row)">
66 </el-date-picker>
67 </template>
68 </el-table-column>
69 <el-table-column prop="syqx" label="土地使用期限" min-width="100">
70 <template slot-scope="scope">
71 <el-input
72 class="item"
73 v-model="scope.row.syqx"
74 placeholder="请输入内容"
75 @blur="addrow(scope.row)">
76 ></el-input>
77 </template>
78 </el-table-column>
79 </el-table>
17 </div> 80 </div>
18 </template> 81 </template>
19 <script> 82 <script>
...@@ -32,6 +95,8 @@ export default { ...@@ -32,6 +95,8 @@ export default {
32 }, 95 },
33 data() { 96 data() {
34 return { 97 return {
98 // 键名转换,方法默认是label和children进行树状渲染
99 tdyt:null,
35 key: 0, 100 key: 0,
36 newdata: { 101 newdata: {
37 yt: "", 102 yt: "",
...@@ -40,118 +105,15 @@ export default { ...@@ -40,118 +105,15 @@ export default {
40 syqx: "", 105 syqx: "",
41 }, 106 },
42 tableDataList: [], 107 tableDataList: [],
43 InformationTable: [ 108 normalizer(node) {
44 { 109 if (node.children == null || node.children == "null") {
45 width: "50", 110 delete node.children;
46 renderHeader: (h, scope) => { 111 }
47 return ( 112 return {
48 <div> 113 id: node.dcode,
49 {" "} 114 label: node.dname,
50 {this.$route.query.viewtype == 1 ? ( 115 };
51 "序号"
52 ) : (
53 <i
54 class="el-icon-plus pointer"
55 onClick={() => {
56 this.addClick();
57 }}
58 ></i>
59 )}
60 </div>
61 );
62 },
63 render: (h, scope) => {
64 return (
65 <div>
66 {this.$route.query.viewtype == 1 ? (
67 <span>{scope.$index + 1}</span>
68 ) : (
69 <i
70 class="el-icon-minus pointer"
71 onClick={() => {
72 this.deleClick(scope.$index, scope.row);
73 }}
74 ></i>
75 )}
76 </div>
77 );
78 },
79 },
80 {
81 label: "土地用途",
82 align: "center",
83 render: (h, scope) => {
84 return (
85 <el-select
86 value={scope.row.yt}
87 onChange={(val) => {
88 scope.row.yt = val;
89 }}
90 clearable
91 onblur={() => {
92 this.addrow(scope);
93 }}
94 >
95 {this.dictData["tdyt"].map((option) => {
96 return (
97 <el-option
98 label={option.dname}
99 value={option.dcode}
100 ></el-option>
101 );
102 })}
103 </el-select>
104 );
105 },
106 },
107 {
108 label: "土地使用起始时间",
109 render: (h, scope) => {
110 return (
111 <el-date-picker
112 v-model={scope.row.qssj}
113 type="date"
114 placeholder="选择日期"
115 value-format="yyyy/MM/dd HH:mm:ss"
116 format="yyyy/MM/dd HH:mm:ss"
117 onblur={() => {
118 this.addrow(scope.row);
119 }}
120 ></el-date-picker>
121 );
122 },
123 },
124 {
125 label: "土地使用结束时间",
126 render: (h, scope) => {
127 return (
128 <el-date-picker
129 v-model={scope.row.jssj}
130 type="date"
131 placeholder="选择日期"
132 value-format="yyyy/MM/dd HH:mm:ss"
133 format="yyyy/MM/dd HH:mm:ss"
134 onblur={() => {
135 this.addrow(scope.row);
136 }}
137 ></el-date-picker>
138 );
139 },
140 },
141 {
142 label: "土地使用期限",
143 render: (h, scope) => {
144 return (
145 <el-input
146 v-model={scope.row.syqx}
147 onblur={() => {
148 this.addrow(scope.row);
149 }}
150 ></el-input>
151 );
152 },
153 }, 116 },
154 ],
155 }; 117 };
156 }, 118 },
157 watch: { 119 watch: {
...@@ -168,8 +130,20 @@ export default { ...@@ -168,8 +130,20 @@ export default {
168 syqx: "", 130 syqx: "",
169 }, 131 },
170 ]); 132 ]);
133 if( that.tableDataList.length>0){
134 console.log("that.tableDataList",that.tableDataList);
135 this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
136 }else{
137 this.tdyt=null
138 }
171 } else { 139 } else {
172 that.tableDataList = _.cloneDeep(val); 140 that.tableDataList = _.cloneDeep(val);
141 if( that.tableDataList.length>0){
142 console.log("that.tableDataList",that.tableDataList);
143 this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
144 }else{
145 this.tdyt=null
146 }
173 } 147 }
174 }); 148 });
175 }, 149 },
...@@ -178,21 +152,42 @@ export default { ...@@ -178,21 +152,42 @@ export default {
178 }, 152 },
179 }, 153 },
180 methods: { 154 methods: {
155 renderHeader() {
156 return (
157 <div>
158 {" "}
159 {this.$route.query.viewtype == 1 ? (
160 "序号"
161 ) : (
162 <i
163 class="el-icon-plus pointer"
164 onClick={() => {
165 this.addClick();
166 }}
167 ></i>
168 )}
169 </div>
170 );
171 },
181 // 修改事件 172 // 修改事件
182 addrow() { 173 addrow() {
183 console.log("this.$parent.bsmqlxx",this.$parent.$parent.bsmqlxx); 174 this.tableDataList = this.tableDataList.map((item) => {
184 175 return{
176 ...item,
177 yt:this.tdyt
178 }
179 })
185 this.$emit("upDateTdytxxList", this.tableDataList); 180 this.$emit("upDateTdytxxList", this.tableDataList);
186 }, 181 },
187 // 新增 182 // 新增
188 addClick() { 183 addClick() {
189 this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata); 184 this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
185
190 this.$emit("upDateTdytxxList", this.tableDataList); 186 this.$emit("upDateTdytxxList", this.tableDataList);
191 }, 187 },
192 188
193 // 删除 189 // 删除
194 deleClick(index, row) { 190 deleClick(index, row) {
195 console.log("删除");
196 this.$confirm("确定要删除吗, 是否继续?", "提示", { 191 this.$confirm("确定要删除吗, 是否继续?", "提示", {
197 confirmButtonText: "确定", 192 confirmButtonText: "确定",
198 cancelButtonText: "取消", 193 cancelButtonText: "取消",
...@@ -210,4 +205,11 @@ export default { ...@@ -210,4 +205,11 @@ export default {
210 .el-input { 205 .el-input {
211 border: none !important; 206 border: none !important;
212 } 207 }
208 /deep/.el-table__row{
209 border: none !important;
210
211 }
212 .el-date-editor.el-input{
213 width: 100%;
214 }
213 </style> 215 </style>
......
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 }
......
...@@ -117,10 +117,6 @@ ...@@ -117,10 +117,6 @@
117 data () { 117 data () {
118 return { 118 return {
119 queryForm: { 119 queryForm: {
120 ywly: "",
121 qllx: "",
122 djlx: "",
123 ywh: "",
124 }, 120 },
125 searchForm: { 121 searchForm: {
126 ywlymc: "", 122 ywlymc: "",
......
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
72 <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="$route.query.viewtype || isJfOperation"></el-input> 72 <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="$route.query.viewtype || isJfOperation"></el-input>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 <!-- 批量查封状态有多种查封类型,不予展示 --> 75 <!-- 批量查封状态有多种查封类型,不予展示 -->
76 <!-- <el-col :span="8"> 76 <!-- <el-col :span="8">
77 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc"> 77 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc">
78 <el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input> 78 <el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input>
79 </el-form-item> 79 </el-form-item>
......
...@@ -275,9 +275,9 @@ ...@@ -275,9 +275,9 @@
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 },
......
...@@ -131,6 +131,14 @@ ...@@ -131,6 +131,14 @@
131 </el-col> 131 </el-col>
132 </el-row> 132 </el-row>
133 <div class="slxx_title title-block"> 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 />
141 <div class="slxx_title title-block">
134 权利人信息 142 权利人信息
135 <div class="triangle"></div> 143 <div class="triangle"></div>
136 </div> 144 </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({
......
...@@ -134,6 +134,14 @@ ...@@ -134,6 +134,14 @@
134 </el-col> 134 </el-col>
135 </el-row> 135 </el-row>
136 <div class="slxx_title title-block"> 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 />
144 <div class="slxx_title title-block">
137 权利人信息 145 权利人信息
138 <div class="triangle"></div> 146 <div class="triangle"></div>
139 </div> 147 </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>
......
...@@ -125,6 +125,14 @@ ...@@ -125,6 +125,14 @@
125 </el-col> 125 </el-col>
126 </el-row> 126 </el-row>
127 <div class="slxx_title title-block"> 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 />
135 <div class="slxx_title title-block">
128 权利人信息 136 权利人信息
129 <div class="triangle"></div> 137 <div class="triangle"></div>
130 </div> 138 </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);
......
...@@ -126,6 +126,14 @@ ...@@ -126,6 +126,14 @@
126 </el-col> 126 </el-col>
127 </el-row> 127 </el-row>
128 <div class="slxx_title title-block"> 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 />
136 <div class="slxx_title title-block">
129 权利人信息 137 权利人信息
130 <div class="triangle"></div> 138 <div class="triangle"></div>
131 </div> 139 </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({
......
...@@ -128,6 +128,14 @@ ...@@ -128,6 +128,14 @@
128 </el-col> 128 </el-col>
129 </el-row> 129 </el-row>
130 <div class="slxx_title title-block"> 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 />
138 <div class="slxx_title title-block">
131 权利人信息 139 权利人信息
132 <div class="triangle"></div> 140 <div class="triangle"></div>
133 </div> 141 </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-07-04 16:23:54 4 * @LastEditTime: 2023-07-10 15:16:48
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </div> 15 </div>
16 <el-row :gutter="10"> 16 <el-row :gutter="10">
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="业务号:"> 18 <el-form-item label="业务号111:">
19 <el-input disabled v-model="ruleForm.flow.ywh"></el-input> 19 <el-input disabled v-model="ruleForm.flow.ywh"></el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
...@@ -130,18 +130,14 @@ ...@@ -130,18 +130,14 @@
130 <el-input v-model="ruleForm.tdsyq.mjdw"></el-input> 130 <el-input v-model="ruleForm.tdsyq.mjdw"></el-input>
131 </el-form-item> 131 </el-form-item>
132 </el-col> 132 </el-col>
133
134 <el-col :span="8">
135 <el-form-item label="下拉表格测试:">
136 <select-table v-model="value2" :table-width="600" :props="props" @change="change">
137 <el-table-column prop="id" label="ID" width="180"></el-table-column>
138 <el-table-column prop="user" label="姓名"></el-table-column>
139 </select-table>
140 </el-form-item>
141 </el-col>
142
143 </el-row> 133 </el-row>
144 134 <div class="slxx_title title-block">
135 土地用途
136 <div class="triangle"></div>
137 </div>
138 <tdytTable
139 :tableData="ruleForm.tdytqxList"
140 @upDateTdytxxList="upDateTdytxxList" />
145 <div class="slxx_title title-block"> 141 <div class="slxx_title title-block">
146 权利人信息 142 权利人信息
147 <div class="triangle"></div> 143 <div class="triangle"></div>
...@@ -211,10 +207,10 @@ ...@@ -211,10 +207,10 @@
211 <script> 207 <script>
212 import { mapGetters } from "vuex" 208 import { mapGetters } from "vuex"
213 import { Init, saveData } from "@/api/workflow/tdsyqFlow.js" 209 import { Init, saveData } from "@/api/workflow/tdsyqFlow.js"
210 import tdytTable from "@/views/workflow/components/tdytTable";
214 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable" 211 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
215 import selectTable from '@/components/selectTable/index.vue'
216 export default { 212 export default {
217 components: { qlrCommonTable, selectTable }, 213 components: { qlrCommonTable, tdytTable },
218 mounted () { 214 mounted () {
219 this.ableOperation = this.$parent.currentSelectTab.ableOperation 215 this.ableOperation = this.$parent.currentSelectTab.ableOperation
220 this.propsParam = this.$attrs; 216 this.propsParam = this.$attrs;
...@@ -262,7 +258,12 @@ ...@@ -262,7 +258,12 @@
262 } 258 }
263 }, 259 },
264 methods: { 260 methods: {
265 change () { }, 261 // 更新土地用途信息
262 upDateTdytxxList (val) {
263 console.log("VAL", val);
264 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
265 this.key++;
266 },
266 // 更新权利人信息 267 // 更新权利人信息
267 upDateQlrxxList (val) { 268 upDateQlrxxList (val) {
268 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)) 269 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
......
...@@ -193,17 +193,17 @@ ...@@ -193,17 +193,17 @@
193 }, 193 },
194 ywhClick (item) { 194 ywhClick (item) {
195 //有任务权限 195 //有任务权限
196 if(item.sjlx=="3"){ 196 if (item.sjlx == "3") {
197 const { href } = this.$router.resolve( 197 const { href } = this.$router.resolve(
198 "/djbworkFrameview?bsmSlsq=" + 198 "/djbworkFrameview?bsmSlsq=" +
199 item.bsmSlsq + 199 item.bsmSlsq +
200 "&bestepid=" + 200 "&bestepid=" +
201 item.bestepid+ 201 item.bestepid+
202 "&isEdit=" + 202 "&bsmBusiness=" +
203 true 203 "&viewtype=1"
204 ); 204 );
205 window.open(href, `urlname${item.bsmSlsq}`); 205 window.open(href, `urlname${item.bsmSlsq}`);
206 }else{ 206 } else {
207 const { href } = this.$router.resolve( 207 const { href } = this.$router.resolve(
208 "/workFrameView?bsmSlsq=" + 208 "/workFrameView?bsmSlsq=" +
209 item.bsmSlsq + 209 item.bsmSlsq +
......
...@@ -69,10 +69,11 @@ ...@@ -69,10 +69,11 @@
69 <script> 69 <script>
70 //查封登记 70 //查封登记
71 import store from "@/store/index.js"; 71 import store from "@/store/index.js";
72 import { datas, sendThis } from "../javascript/cfdj.js";
73 import { defaultParameters } from "../javascript/publicDefaultPar.js";
74 import table from "@/utils/mixin/table"; 72 import table from "@/utils/mixin/table";
75 import jump from "../components/mixin/jump"; 73 import jump from "../components/mixin/jump";
74 import { ywPopupDialog } from "@/utils/popup.js";
75 import { datas, sendThis } from "../javascript/cfdj.js";
76 import { defaultParameters } from "../javascript/publicDefaultPar.js";
76 import { selectCfdj, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js"; 77 import { selectCfdj, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js";
77 export default { 78 export default {
78 props: { 79 props: {
...@@ -138,9 +139,9 @@ ...@@ -138,9 +139,9 @@
138 this.$popupCacel() 139 this.$popupCacel()
139 140
140 } else { 141 } else {
141 this.$message.error(res.message); 142 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
142 } 143 }
143 }); 144 })
144 } else { 145 } else {
145 choiceBdcdy({ 146 choiceBdcdy({
146 bsmSlsq: this.$route.query.bsmSlsq, 147 bsmSlsq: this.$route.query.bsmSlsq,
......
...@@ -56,10 +56,11 @@ ...@@ -56,10 +56,11 @@
56 </template> 56 </template>
57 <script> 57 <script>
58 import store from '@/store/index.js' 58 import store from '@/store/index.js'
59 import { datas, sendThis } from "../javascript/diyaq.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table"; 59 import table from "@/utils/mixin/table";
62 import jump from "../components/mixin/jump"; 60 import jump from "../components/mixin/jump";
61 import { ywPopupDialog } from "@/utils/popup.js";
62 import { datas, sendThis } from "../javascript/diyaq.js";
63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
63 import { selectDiyaq, startBusinessFlow } from "@/api/ywbl.js"; 64 import { selectDiyaq, startBusinessFlow } from "@/api/ywbl.js";
64 export default { 65 export default {
65 mixins: [table, jump], 66 mixins: [table, jump],
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
119 } 120 }
120 this.$popupCacel() 121 this.$popupCacel()
121 } else { 122 } else {
122 this.$message.error(res.message); 123 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
123 } 124 }
124 }) 125 })
125 }, 126 },
......
...@@ -123,9 +123,10 @@ ...@@ -123,9 +123,10 @@
123 <script> 123 <script>
124 import Vue from 'vue' 124 import Vue from 'vue'
125 import store from '@/store/index.js' 125 import store from '@/store/index.js'
126 import table from "@/utils/mixin/table";
126 //国有建设用地使用权/房屋使用权 127 //国有建设用地使用权/房屋使用权
128 import { ywPopupDialog } from "@/utils/popup.js";
127 import { datas, sendThis } from "../javascript/fwsyq.js"; 129 import { datas, sendThis } from "../javascript/fwsyq.js";
128 import table from "@/utils/mixin/table";
129 import jump from "@/views/ywbl/ywsq/components/mixin/jump"; 130 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
130 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js"; 131 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js";
131 export default { 132 export default {
...@@ -241,7 +242,7 @@ ...@@ -241,7 +242,7 @@
241 } 242 }
242 this.$popupCacel() 243 this.$popupCacel()
243 } else { 244 } else {
244 this.$message.error(res.message); 245 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
245 } 246 }
246 }) 247 })
247 } else { 248 } else {
...@@ -258,7 +259,7 @@ ...@@ -258,7 +259,7 @@
258 store.dispatch('user/refreshPage', true); 259 store.dispatch('user/refreshPage', true);
259 this.$popupCacel() 260 this.$popupCacel()
260 } else { 261 } else {
261 this.$message.error(res.message); 262 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
262 } 263 }
263 }) 264 })
264 } 265 }
......
...@@ -42,10 +42,11 @@ ...@@ -42,10 +42,11 @@
42 <script> 42 <script>
43 //首次登记 43 //首次登记
44 import store from '@/store/index.js' 44 import store from '@/store/index.js'
45 import { datas, sendThis } from "../javascript/nydsyq100.js";
46 import { defaultParameters } from "../javascript/publicDefaultPar.js";
47 import table from "@/utils/mixin/table"; 45 import table from "@/utils/mixin/table";
48 import jump from "../components/mixin/jump"; 46 import jump from "../components/mixin/jump";
47 import { ywPopupDialog } from "@/utils/popup.js";
48 import { datas, sendThis } from "../javascript/nydsyq100.js";
49 import { defaultParameters } from "../javascript/publicDefaultPar.js";
49 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js"; 50 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
50 export default { 51 export default {
51 mixins: [table, jump], 52 mixins: [table, jump],
...@@ -108,7 +109,7 @@ ...@@ -108,7 +109,7 @@
108 } 109 }
109 this.$popupCacel() 110 this.$popupCacel()
110 } else { 111 } else {
111 this.$message.error(res.message); 112 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
112 } 113 }
113 }) 114 })
114 }, 115 },
......
...@@ -42,10 +42,11 @@ ...@@ -42,10 +42,11 @@
42 <script> 42 <script>
43 //首次登记 43 //首次登记
44 import store from '@/store/index.js' 44 import store from '@/store/index.js'
45 import { datas, sendThis } from "../javascript/selectJsydsyq.js";
46 import { defaultParameters } from "../javascript/publicDefaultPar.js";
47 import table from "@/utils/mixin/table"; 45 import table from "@/utils/mixin/table";
48 import jump from "../components/mixin/jump"; 46 import jump from "../components/mixin/jump";
47 import { ywPopupDialog } from "@/utils/popup.js";
48 import { datas, sendThis } from "../javascript/selectJsydsyq.js";
49 import { defaultParameters } from "../javascript/publicDefaultPar.js";
49 import { startBusinessFlow, selectNydsyqQlxx } from "@/api/ywbl.js"; 50 import { startBusinessFlow, selectNydsyqQlxx } from "@/api/ywbl.js";
50 export default { 51 export default {
51 mixins: [table, jump], 52 mixins: [table, jump],
...@@ -105,7 +106,7 @@ ...@@ -105,7 +106,7 @@
105 } 106 }
106 this.$popupCacel() 107 this.$popupCacel()
107 } else { 108 } else {
108 this.$message.error(res.message); 109 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
109 } 110 }
110 }) 111 })
111 }, 112 },
......
...@@ -55,11 +55,12 @@ ...@@ -55,11 +55,12 @@
55 </div> 55 </div>
56 </template> 56 </template>
57 <script> 57 <script>
58 import jump from "./mixin/jump";
58 import store from '@/store/index.js' 59 import store from '@/store/index.js'
60 import table from "@/utils/mixin/table";
61 import { ywPopupDialog } from "@/utils/popup.js";
59 import { datas, sendThis } from "../javascript/selecBdcql.js"; 62 import { datas, sendThis } from "../javascript/selecBdcql.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table";
62 import jump from "./mixin/jump";
63 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js"; 64 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
64 import { getQllxByBsmSqyw } from "@/api/system.js"; 65 import { getQllxByBsmSqyw } from "@/api/system.js";
65 export default { 66 export default {
...@@ -133,7 +134,7 @@ ...@@ -133,7 +134,7 @@
133 } 134 }
134 this.$popupCacel() 135 this.$popupCacel()
135 } else { 136 } else {
136 this.$message.error(res.message) 137 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
137 } 138 }
138 }) 139 })
139 }, 140 },
......
...@@ -52,9 +52,10 @@ ...@@ -52,9 +52,10 @@
52 </template> 52 </template>
53 <script> 53 <script>
54 import { mapGetters } from "vuex"; 54 import { mapGetters } from "vuex";
55 import { startRepairFlow } from "@/api/ywbl.js";
56 import store from '@/store/index.js' 55 import store from '@/store/index.js'
57 import table from "@/utils/mixin/table"; 56 import table from "@/utils/mixin/table";
57 import { ywPopupDialog } from "@/utils/popup.js";
58 import { startRepairFlow } from "@/api/ywbl.js";
58 import { datas, sendThis } from "../javascript/selectDjbbl.js"; 59 import { datas, sendThis } from "../javascript/selectDjbbl.js";
59 import { selectRepairQlxx } from "@/api/selectQlxx.js"; 60 import { selectRepairQlxx } from "@/api/selectQlxx.js";
60 import jump from "../components/mixin/djbbljump"; 61 import jump from "../components/mixin/djbbljump";
...@@ -161,7 +162,7 @@ ...@@ -161,7 +162,7 @@
161 } 162 }
162 this.$popupCacel() 163 this.$popupCacel()
163 } else { 164 } else {
164 this.$message.error(res.message); 165 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
165 } 166 }
166 }) 167 })
167 }, 168 },
......
...@@ -47,11 +47,12 @@ ...@@ -47,11 +47,12 @@
47 </div> 47 </div>
48 </template> 48 </template>
49 <script> 49 <script>
50 import jump from "./mixin/jump";
50 import store from '@/store/index.js' 51 import store from '@/store/index.js'
52 import table from "@/utils/mixin/table";
53 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectFwsyq.js"; 54 import { datas, sendThis } from "../javascript/selectFwsyq.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 55 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump";
55 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js"; 56 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
56 export default { 57 export default {
57 mixins: [table, jump], 58 mixins: [table, jump],
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 } 111 }
111 this.$popupCacel() 112 this.$popupCacel()
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -47,11 +47,12 @@ ...@@ -47,11 +47,12 @@
47 </div> 47 </div>
48 </template> 48 </template>
49 <script> 49 <script>
50 import jump from "./mixin/jump";
50 import store from '@/store/index.js' 51 import store from '@/store/index.js'
52 import table from "@/utils/mixin/table";
53 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectH.js"; 54 import { datas, sendThis } from "../javascript/selectH.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 55 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump";
55 import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js"; 56 import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
56 export default { 57 export default {
57 mixins: [table, jump], 58 mixins: [table, jump],
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 } 111 }
111 this.$popupCacel() 112 this.$popupCacel()
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -55,11 +55,12 @@ ...@@ -55,11 +55,12 @@
55 </template> 55 </template>
56 <script> 56 <script>
57 //首次登记 57 //首次登记
58 import jump from "./mixin/jump";
58 import store from '@/store/index.js' 59 import store from '@/store/index.js'
60 import table from "@/utils/mixin/table";
61 import { ywPopupDialog } from "@/utils/popup.js";
59 import { datas, sendThis } from "../javascript/selectJsydsyq.js"; 62 import { datas, sendThis } from "../javascript/selectJsydsyq.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table";
62 import jump from "./mixin/jump";
63 import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js"; 64 import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js";
64 export default { 65 export default {
65 mixins: [table, jump], 66 mixins: [table, jump],
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
118 } 119 }
119 this.$popupCacel() 120 this.$popupCacel()
120 } else { 121 } else {
121 this.$message.error(res.message); 122 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
122 } 123 }
123 }) 124 })
124 }, 125 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-16 09:37:51 4 * @LastEditTime: 2023-07-07 09:27:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -138,11 +138,12 @@ ...@@ -138,11 +138,12 @@
138 </template> 138 </template>
139 <script> 139 <script>
140 //首次登记 140 //首次登记
141 import jump from "./mixin/jump";
141 import store from '@/store/index.js' 142 import store from '@/store/index.js'
143 import table from "@/utils/mixin/table";
144 import { ywPopupDialog } from "@/utils/popup.js";
142 import { datas, datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js"; 145 import { datas, datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js";
143 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 146 import { defaultParameters } from "../javascript/publicDefaultPar.js";
144 import table from "@/utils/mixin/table";
145 import jump from "./mixin/jump";
146 import { startBusinessFlow, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js"; 147 import { startBusinessFlow, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js";
147 export default { 148 export default {
148 mixins: [table, jump], 149 mixins: [table, jump],
...@@ -246,7 +247,7 @@ ...@@ -246,7 +247,7 @@
246 } 247 }
247 this.$popupCacel() 248 this.$popupCacel()
248 } else { 249 } else {
249 this.$message.error(res.message) 250 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
250 } 251 }
251 }) 252 })
252 }, 253 },
......
...@@ -47,12 +47,13 @@ ...@@ -47,12 +47,13 @@
47 </template> 47 </template>
48 <script> 48 <script>
49 //首次登记 49 //首次登记
50 import jump from "./mixin/jump";
50 import store from '@/store/index.js' 51 import store from '@/store/index.js'
51 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 52 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump"; 53 import { ywPopupDialog } from "@/utils/popup.js";
55 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js"; 54 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
55 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
56 import { defaultParameters } from "../javascript/publicDefaultPar.js";
56 export default { 57 export default {
57 mixins: [table, jump], 58 mixins: [table, jump],
58 props: { 59 props: {
...@@ -115,9 +116,8 @@ ...@@ -115,9 +116,8 @@
115 } 116 }
116 this.$popupCacel() 117 this.$popupCacel()
117 } else { 118 } else {
118 this.$message.error(res.message) 119 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
119 } 120 }
120
121 }) 121 })
122 }, 122 },
123 handleSelectionChange (val) { 123 handleSelectionChange (val) {
......
...@@ -55,11 +55,12 @@ ...@@ -55,11 +55,12 @@
55 </template> 55 </template>
56 <script> 56 <script>
57 //首次登记 57 //首次登记
58 import jump from "./mixin/jump";
58 import store from '@/store/index.js' 59 import store from '@/store/index.js'
60 import table from "@/utils/mixin/table";
61 import { ywPopupDialog } from "@/utils/popup.js";
59 import { datas, sendThis } from "../javascript/selectTdsyq.js"; 62 import { datas, sendThis } from "../javascript/selectTdsyq.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table";
62 import jump from "./mixin/jump";
63 import { startBusinessFlow, selectTdsyqQlxx } from "@/api/ywbl.js"; 64 import { startBusinessFlow, selectTdsyqQlxx } from "@/api/ywbl.js";
64 export default { 65 export default {
65 mixins: [table, jump], 66 mixins: [table, jump],
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
118 } 119 }
119 this.$popupCacel() 120 this.$popupCacel()
120 } else { 121 } else {
121 this.$message.error(res.message); 122 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
122 } 123 }
123 }) 124 })
124 }, 125 },
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 </template> 48 </template>
49 <script> 49 <script>
50 import store from '@/store/index.js' 50 import store from '@/store/index.js'
51 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectYgdj200.js"; 52 import { datas, sendThis } from "../javascript/selectYgdj200.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 53 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 54 import table from "@/utils/mixin/table";
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 this.$popupCacel() 111 this.$popupCacel()
111 } 112 }
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 </template> 48 </template>
49 <script> 49 <script>
50 import store from '@/store/index.js' 50 import store from '@/store/index.js'
51 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectYgdy.js"; 52 import { datas, sendThis } from "../javascript/selectYgdy.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 53 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 54 import table from "@/utils/mixin/table";
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 } 111 }
111 this.$popupCacel() 112 this.$popupCacel()
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 </template> 48 </template>
49 <script> 49 <script>
50 import store from '@/store/index.js' 50 import store from '@/store/index.js'
51 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectAllHInfo.js"; 52 import { datas, sendThis } from "../javascript/selectAllHInfo.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 53 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 54 import table from "@/utils/mixin/table";
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
111 } 112 }
112 this.$popupCacel() 113 this.$popupCacel()
113 } else { 114 } else {
114 this.$message.error(res.message); 115 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
115 } 116 }
116 }) 117 })
117 }, 118 },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px"> 5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
6 <el-row> 6 <el-row>
7 <el-col :span="5"> 7 <el-col :span="4">
8 <el-form-item label="权利类型"> 8 <el-form-item label="权利类型">
9 <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型"> 9 <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
10 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 10 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
...@@ -12,24 +12,63 @@ ...@@ -12,24 +12,63 @@
12 </el-select> 12 </el-select>
13 </el-form-item> 13 </el-form-item>
14 </el-col> 14 </el-col>
15 <el-col :span="5"> 15 <el-col :span="4">
16 <el-form-item label="登记类型">
17 <el-select v-model="queryForm.djlx" filterable class="width100" clearable placeholder="请选择登记类型">
18 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
19 </el-option>
20 </el-select>
21 </el-form-item>
22 </el-col>
23 <el-col :span="4">
24 <el-form-item label="权属状态">
25 <el-select v-model="queryForm.qszt" filterable class="width100" clearable placeholder="请选择登记类型">
26 <el-option
27 v-for="item in qsztlist"
28 :key="item.dcode"
29 :label="item.dname"
30 :value="item.dcode"></el-option>
31 </el-select>
32 </el-form-item>
33 </el-col>
34 <el-col :span="6">
16 <el-form-item label="不动产单元号" label-width="105px"> 35 <el-form-item label="不动产单元号" label-width="105px">
17 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100"> 36 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
18 </el-input> 37 </el-input>
19 </el-form-item> 38 </el-form-item>
20 </el-col> 39 </el-col>
21 <el-col :span="5"> 40 <el-col :span="6">
22 <el-form-item label="不动产权证号" label-width="105px"> 41 <el-form-item label="不动产权证号" label-width="105px">
23 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100"> 42 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
24 </el-input> 43 </el-input>
25 </el-form-item> 44 </el-form-item>
26 </el-col> 45 </el-col>
46 </el-row>
47 <el-row>
27 <el-col :span="5"> 48 <el-col :span="5">
28 <el-form-item label="业务号"> 49 <el-form-item label="业务号:">
29 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100"> 50 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
30 </el-input> 51 </el-input>
31 </el-form-item> 52 </el-form-item>
32 </el-col> 53 </el-col>
54 <el-col :span="5">
55 <el-form-item label="坐落:" label-width="105px">
56 <el-input v-model="queryForm.zl" clearable class="width100">
57 </el-input>
58 </el-form-item>
59 </el-col>
60 <el-col :span="5">
61 <el-form-item label="权利人:" label-width="105px">
62 <el-input v-model="queryForm.qlrmc" clearable class="width100">
63 </el-input>
64 </el-form-item>
65 </el-col>
66 <el-col :span="5">
67 <el-form-item label="义务人:">
68 <el-input v-model="queryForm.ywrmc" clearable class="width100">
69 </el-input>
70 </el-form-item>
71 </el-col>
33 72
34 <el-col :span="4" class="btnColRight"> 73 <el-col :span="4" class="btnColRight">
35 <el-form-item> 74 <el-form-item>
...@@ -64,7 +103,19 @@ export default { ...@@ -64,7 +103,19 @@ export default {
64 }, 103 },
65 data () { 104 data () {
66 return { 105 return {
106 // 权属状态
107 qsztlist: [
108 {
109 dcode: "1",
110 dname: "现势",
111 },
112 {
113 dcode: "2",
114 dname: "历史",
115 },
116 ],
67 queryForm: { 117 queryForm: {
118 qszt: "1",
68 qllx: "", 119 qllx: "",
69 bdcdyh: "", 120 bdcdyh: "",
70 bdcqzh: "", 121 bdcqzh: "",
......