Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
73b49668 by 田浩浩
Options

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

2 parents edfa3a98 42699523
Inline Side-by-side
Showing 10 changed files with 126 additions and 38 deletions
...@@ -5,4 +5,4 @@ NODE_ENV=development ...@@ -5,4 +5,4 @@ NODE_ENV=development
5 VUE_APP_BASE_API = '/bdcdj' 5 VUE_APP_BASE_API = '/bdcdj'
6 6
7 # 开发环境 7 # 开发环境
8 VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018' 8 VUE_APP_API_BASE_URL = 'http://192.168.2.44:8018'
......
...@@ -197,7 +197,22 @@ export default { ...@@ -197,7 +197,22 @@ export default {
197 } 197 }
198 }, 198 },
199 handleMinus (index, row) { 199 handleMinus (index, row) {
200 this.tableData.splice(index, 1) 200 this.$confirm('此操作将永久删除, 是否继续?', '提示', {
201 confirmButtonText: '确定',
202 cancelButtonText: '取消',
203 type: 'warning'
204 }).then(() => {
205 this.tableData.splice(index, 1)
206 this.$message({
207 type: 'success',
208 message: '删除成功!'
209 });
210 }).catch(() => {
211 this.$message({
212 type: 'info',
213 message: '已取消删除'
214 });
215 });
201 }, 216 },
202 // 上移下移 217 // 上移下移
203 moveUpward (index, row) { 218 moveUpward (index, row) {
...@@ -210,4 +225,5 @@ export default { ...@@ -210,4 +225,5 @@ export default {
210 } 225 }
211 </script> 226 </script>
212 <style scoped lang='scss'> 227 <style scoped lang='scss'>
228
213 </style> 229 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -208,7 +208,7 @@ export default { ...@@ -208,7 +208,7 @@ export default {
208 }) 208 })
209 }, 209 },
210 itemShowFalse () { 210 itemShowFalse () {
211 this.tableData.forEach((item, index) => { 211 this.tableData.length > 0 && this.tableData.forEach((item, index) => {
212 item.nodecodeShow = true 212 item.nodecodeShow = true
213 item.nodenameShow = false 213 item.nodenameShow = false
214 item.djyyShow = false 214 item.djyyShow = false
...@@ -219,29 +219,54 @@ export default { ...@@ -219,29 +219,54 @@ export default {
219 let container = this.$el.querySelector('.el-table__body-wrapper'); 219 let container = this.$el.querySelector('.el-table__body-wrapper');
220 container.scrollTop = container.scrollHeight; 220 container.scrollTop = container.scrollHeight;
221 }) 221 })
222 let code = this.tableData.slice(-1)[0].nodecode 222 if (this.djqx.length > 0) {
223 let codeQ = code.slice(0, 6) 223 let code = this.tableData.slice(-1)[0].nodecode
224 let len = '' 224 let codeQ = code.slice(0, 6)
225 if (this.tableData.length + 1 < 9) { 225 let len = ''
226 len = 0 + String(this.tableData.length + 1) 226 if (this.tableData.length + 1 < 9) {
227 len = 0 + String(this.tableData.length + 1)
228 } else {
229 len = this.tableData.length + 1
230 }
231 this.tableData.push(
232 {
233 nodecode: codeQ + len,
234 nodename: '',
235 enabled: '1',
236 djyy: '',
237 sfqydjyymb: '0'
238 }
239 )
227 } else { 240 } else {
228 len = this.tableData.length + 1 241 this.tableData.push(
242 {
243 nodename: '',
244 enabled: '1',
245 djyy: '',
246 sfqydjyymb: '0'
247 }
248 )
229 } 249 }
230
231 this.tableData.push(
232 {
233 nodecode: codeQ + len,
234 nodename: '',
235 enabled: '1',
236 djyy: '',
237 sfqydjyymb: '0'
238 }
239 )
240 this.addIndexes() 250 this.addIndexes()
241 this.key++ 251 this.key++
242 }, 252 },
243 handleMinus (index, row) { 253 handleMinus (index, row) {
244 this.tableData.splice(index, 1) 254 this.$confirm('此操作将永久删除, 是否继续?', '提示', {
255 confirmButtonText: '确定',
256 cancelButtonText: '取消',
257 type: 'warning'
258 }).then(() => {
259 this.tableData.splice(index, 1)
260 this.$message({
261 type: 'success',
262 message: '删除成功!'
263 });
264 }).catch(() => {
265 this.$message({
266 type: 'info',
267 message: '已取消删除'
268 });
269 });
245 }, 270 },
246 nodecodeBlur (index, row) { 271 nodecodeBlur (index, row) {
247 let list = _.cloneDeep(this.tableData).filter(item => item.bsmSqyw != row.bsmSqyw) 272 let list = _.cloneDeep(this.tableData).filter(item => item.bsmSqyw != row.bsmSqyw)
...@@ -257,12 +282,10 @@ export default { ...@@ -257,12 +282,10 @@ export default {
257 moveUpward (index, row) { 282 moveUpward (index, row) {
258 upward(index, this.tableData) 283 upward(index, this.tableData)
259 this.key++ 284 this.key++
260 console.log(this.tableData);
261 }, 285 },
262 moveDown (index, row) { 286 moveDown (index, row) {
263 down(index, this.tableData) 287 down(index, this.tableData)
264 this.key++ 288 this.key++
265 console.log(this.tableData);
266 } 289 }
267 } 290 }
268 } 291 }
......
...@@ -107,6 +107,15 @@ export default { ...@@ -107,6 +107,15 @@ export default {
107 searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => { 107 searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
108 if (res.code === 200) { 108 if (res.code === 200) {
109 let { total, records } = res.result 109 let { total, records } = res.result
110 let str = ''
111 records.forEach(item=>{
112 if(item.qlrmc.length!=0){
113 item.qlrmcStr = String(item.qlrmc)
114 }
115 if(item.ywrmc.length!=0){
116 item.ywrmcStr = String(item.ywrmc)
117 }
118 })
110 this.tableData.total = total; 119 this.tableData.total = total;
111 this.tableData.data = records 120 this.tableData.data = records
112 } 121 }
......
...@@ -44,7 +44,7 @@ class data extends filter { ...@@ -44,7 +44,7 @@ class data extends filter {
44 align: 'center', 44 align: 'center',
45 width:'100', 45 width:'100',
46 render: (h, scope) => { 46 render: (h, scope) => {
47 return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button> 47 return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
48 } 48 }
49 }, 49 },
50 { 50 {
...@@ -53,14 +53,24 @@ class data extends filter { ...@@ -53,14 +53,24 @@ class data extends filter {
53 width:'220' 53 width:'220'
54 }, 54 },
55 { 55 {
56 prop: "qlrmc",
57 label: "权利人", 56 label: "权利人",
58 width:'180' 57 render: (h, scope) => {
58 return (
59 <div>
60 <span>{scope.row.qlrmcStr}</span>
61 </div>
62 )
63 }
59 }, 64 },
60 { 65 {
61 prop: "ywrmc",
62 label: "义务人", 66 label: "义务人",
63 width:'180' 67 render: (h, scope) => {
68 return (
69 <div>
70 <span>{scope.row.ywrmcStr}</span>
71 </div>
72 )
73 }
64 }, 74 },
65 { 75 {
66 prop: "zl", 76 prop: "zl",
...@@ -79,10 +89,16 @@ class data extends filter { ...@@ -79,10 +89,16 @@ class data extends filter {
79 width:'80' 89 width:'80'
80 }, 90 },
81 { 91 {
82 prop: "zrsj",
83 label: "转入时间", 92 label: "转入时间",
84 sortable: 'custom', 93 sortable: 'custom',
85 width:'150' 94 width:'160',
95 render: (h, scope) => {
96 return (
97 <div>
98 <span>{scope.row.zrsj[0]}</span>
99 </div>
100 )
101 }
86 }, 102 },
87 { 103 {
88 label: '操作', 104 label: '操作',
......
...@@ -62,9 +62,15 @@ class data extends filter { ...@@ -62,9 +62,15 @@ class data extends filter {
62 label: "受理人员", 62 label: "受理人员",
63 }, 63 },
64 { 64 {
65 prop: "zcsj",
66 label: "转出时间", 65 label: "转出时间",
67 sortable: 'custom' 66 sortable: 'custom',
67 render: (h, scope) => {
68 return (
69 <div>
70 <span>{scope.row.zcsj[0]}</span>
71 </div>
72 )
73 }
68 }, 74 },
69 { 75 {
70 label: '操作', 76 label: '操作',
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
93 //首次登记 93 //首次登记
94 import { datas, sendThis } from "../javascript/jsydsyq200.js"; 94 import { datas, sendThis } from "../javascript/jsydsyq200.js";
95 import table from "@/utils/mixin/table"; 95 import table from "@/utils/mixin/table";
96 import { selectScBdcdy, startBusinessFlow } from "@/api/ywbl.js"; 96 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
97 export default { 97 export default {
98 props: { 98 props: {
99 bsmSqyw: { type: String, default: "" }, 99 bsmSqyw: { type: String, default: "" },
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
107 bdcdyh: "", 107 bdcdyh: "",
108 ywh: "", 108 ywh: "",
109 bdcqzh: "", 109 bdcqzh: "",
110 sqywbm: "A03100", 110 sqywbm: "A03200",
111 }, 111 },
112 qllxs: [], 112 qllxs: [],
113 tableData: { 113 tableData: {
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
133 }, 133 },
134 fetchData() { 134 fetchData() {
135 if (this.bsmSqyw) { 135 if (this.bsmSqyw) {
136 selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => { 136 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
137 if (res.code === 200) { 137 if (res.code === 200) {
138 let { total, records } = res.result; 138 let { total, records } = res.result;
139 this.tableData.total = total; 139 this.tableData.total = total;
......
...@@ -51,11 +51,11 @@ class data extends filter { ...@@ -51,11 +51,11 @@ class data extends filter {
51 label: "证件号", 51 label: "证件号",
52 }, 52 },
53 { 53 {
54 prop: "qlxzmc", 54 prop: "qlxz",
55 label: "权利性质", 55 label: "权利性质",
56 }, 56 },
57 { 57 {
58 prop: "zdmj", 58 prop: "mj",
59 label: "使用权面积", 59 label: "使用权面积",
60 }, 60 },
61 { 61 {
......
...@@ -100,6 +100,12 @@ export default { ...@@ -100,6 +100,12 @@ export default {
100 str = String(item.userNameList) 100 str = String(item.userNameList)
101 item.blStatus = item.zbhj + '('+ str.replace(/,/g,"+") + ')' 101 item.blStatus = item.zbhj + '('+ str.replace(/,/g,"+") + ')'
102 } 102 }
103 if(item.qlrmc.length!=0){
104 item.qlrmcStr = String(item.qlrmc)
105 }
106 if(item.ywrmc.length!=0){
107 item.ywrmcStr = String(item.ywrmc)
108 }
103 }) 109 })
104 this.pageData.total = total; 110 this.pageData.total = total;
105 this.tableData.data = records 111 this.tableData.data = records
......
...@@ -57,12 +57,24 @@ class data extends filter { ...@@ -57,12 +57,24 @@ class data extends filter {
57 label: "申请业务名称", 57 label: "申请业务名称",
58 }, 58 },
59 { 59 {
60 prop: "qlrmc",
61 label: "权利人", 60 label: "权利人",
61 render: (h, scope) => {
62 return (
63 <div>
64 <span>{scope.row.qlrmcStr}</span>
65 </div>
66 )
67 }
62 }, 68 },
63 { 69 {
64 prop: "ywrmc",
65 label: "义务人", 70 label: "义务人",
71 render: (h, scope) => {
72 return (
73 <div>
74 <span>{scope.row.ywrmcStr}</span>
75 </div>
76 )
77 }
66 }, 78 },
67 { 79 {
68 prop: "zl", 80 prop: "zl",
......