65bbe295 by tianhaohao@pashanhoo.com

修改进度查询功能

1 parent 5ae5459e
...@@ -158,14 +158,6 @@ export default { ...@@ -158,14 +158,6 @@ export default {
158 this.$endLoading(); 158 this.$endLoading();
159 if (res.code === 200) { 159 if (res.code === 200) {
160 let { total, records } = res.result; 160 let { total, records } = res.result;
161 // records.forEach((item) => {
162 // item.qlrmc = item.qlrmc.join(",");
163 // item.ywh = item.ywh.join(",");
164 // item.zl = item.zl.join(",");
165 // item.fromstepdate = item.fromstepdate[0];
166 // item.qlrmcStr = item.qlrmc ? String(item.qlrmc) : "";
167 // item.ywrmcStr = item.ywrmc ? String(item.ywrmc) : "";
168 // });
169 this.tableData.total = total ? total : 0; 161 this.tableData.total = total ? total : 0;
170 this.tableData.data = records ? records : []; 162 this.tableData.data = records ? records : [];
171 } 163 }
......
...@@ -42,6 +42,32 @@ ...@@ -42,6 +42,32 @@
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 </el-row> 44 </el-row>
45 <el-row>
46 <el-col :span="5">
47 <el-form-item label="不动产单元号">
48 <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width100">
49 </el-input>
50 </el-form-item>
51 </el-col>
52 <el-col :span="5">
53 <el-form-item label="申请人">
54 <el-input placeholder="如需要模糊查询,前后输入%" v-model="queryForm.sqrmc" clearable class="width100">
55 </el-input>
56 </el-form-item>
57 </el-col>
58 <el-col :span="5">
59 <el-form-item label="申请人证件号">
60 <el-input placeholder="如需要模糊查询,前后输入%" v-model="queryForm.sqrzjhm" clearable class="width100">
61 </el-input>
62 </el-form-item>
63 </el-col>
64 <el-col :span="5">
65 <el-form-item label="坐落">
66 <el-input placeholder="如需要模糊查询,前后输入%" v-model="queryForm.zl" clearable class="width100">
67 </el-input>
68 </el-form-item>
69 </el-col>
70 </el-row>
45 </el-form> 71 </el-form>
46 </div> 72 </div>
47 <!-- 表格 --> 73 <!-- 表格 -->
...@@ -95,24 +121,26 @@ export default { ...@@ -95,24 +121,26 @@ export default {
95 this.$endLoading() 121 this.$endLoading()
96 if (res.code === 200) { 122 if (res.code === 200) {
97 let { total, records } = res.result 123 let { total, records } = res.result
98 let str = '' 124 // let str = ''
99 records.forEach(item => { 125 // records.forEach(item => {
100 if (item.userNameList.length != 0) { 126 // if (item.userNameList.length != 0) {
101 str = String(item.userNameList) 127 // str = String(item.userNameList)
102 item.blStatus = item.zbhj + '(' + str.replace(/,/g, "+") + ')' 128 // item.blStatus = item.zbhj + '(' + str.replace(/,/g, "+") + ')'
103 } 129 // }
104 if (item.qlrmc.length != 0) { 130 // if (item.qlrmc.length != 0) {
105 item.qlrmcStr = String(item.qlrmc) 131 // item.qlrmcStr = String(item.qlrmc)
106 } 132 // }
107 if (item.ywrmc.length != 0) { 133 // if (item.ywrmc.length != 0) {
108 item.ywrmcStr = String(item.ywrmc) 134 // item.ywrmcStr = String(item.ywrmc)
109 } 135 // }
110 if (item.zlList.length != 0) { 136 // if (item.zlList.length != 0) {
111 item.zlStr = String(item.zlList) 137 // item.zlStr = String(item.zlList)
112 } 138 // }
113 }) 139 // })
114 this.pageData.total = total; 140 // this.pageData.total = total;
115 this.tableData.data = records 141 // this.tableData.data = records
142 this.tableData.total = total ? total : 0;
143 this.tableData.data = records ? records : [];
116 } 144 }
117 }) 145 })
118 }, 146 },
......
...@@ -8,7 +8,7 @@ class data extends filter { ...@@ -8,7 +8,7 @@ class data extends filter {
8 constructor() { 8 constructor() {
9 super() 9 super()
10 } 10 }
11 columns () { 11 columns() {
12 return [ 12 return [
13 { 13 {
14 label: '序号', 14 label: '序号',
...@@ -29,24 +29,22 @@ class data extends filter { ...@@ -29,24 +29,22 @@ class data extends filter {
29 if (scope.row.yygqzt == '1') { 29 if (scope.row.yygqzt == '1') {
30 return <div class='suspend'>异议挂起</div> 30 return <div class='suspend'>异议挂起</div>
31 } 31 }
32 switch (scope.row.lczt) { 32 if (scope.row.jssj != null) {
33 case '1': 33 return <div class='prohibit'>已结束</div>
34 return <div class='allow'>进行中</div> 34 } else {
35 case '2': 35 return <div class='allow'>进行中</div>
36 return <div class='prohibit'>已结束</div>
37 case '3':
38 return <div class='allow'>进行中</div>
39 } 36 }
40 } 37 }
41 }, 38 },
42 { 39 {
43 label: "办理状态", 40 label: "办理状态",
44 render: (h, scope) => { 41 render: (h, scope) => {
45 return ( 42 if ((scope.row.zbhj != '' && scope.row.zbhj != null) || (scope.row.userName != '' && scope.row.userName != null))
46 <div> 43 return (
47 <span>{scope.row.blStatus}</span> 44 <div>
48 </div> 45 <span>{scope.row.zbhj}{scope.row.userName}</span>
49 ) 46 </div>
47 )
50 } 48 }
51 }, 49 },
52 { 50 {
...@@ -65,31 +63,31 @@ class data extends filter { ...@@ -65,31 +63,31 @@ class data extends filter {
65 minWidth: '120', 63 minWidth: '120',
66 }, 64 },
67 { 65 {
66 prop: "bdcdyh",
67 label: "不动产单元号",
68 width: '170',
69 },
70 {
71 prop: "qlrmc",
68 label: "权利人", 72 label: "权利人",
69 render: (h, scope) => { 73 width: '120',
70 return (
71 <div>
72 <span>{scope.row.qlrmcStr}</span>
73 </div>
74 )
75 }
76 }, 74 },
77 { 75 {
76 prop: "ywrmc",
78 label: "义务人", 77 label: "义务人",
79 render: (h, scope) => { 78 width: '120',
80 return (
81 <div>
82 <span>{scope.row.ywrmcStr}</span>
83 </div>
84 )
85 }
86 }, 79 },
87 { 80 {
88 prop: "zlStr", 81 prop: "zl",
89 label: "坐落", 82 label: "坐落",
90 minWidth: '150', 83 minWidth: '150',
91 showOverflowTooltip: true 84 showOverflowTooltip: true
92 }, 85 },
86
87 {
88 prop: "slry",
89 label: "受理人员",
90 },
93 { 91 {
94 prop: "slsj", 92 prop: "slsj",
95 label: "受理时间", 93 label: "受理时间",
...@@ -97,9 +95,11 @@ class data extends filter { ...@@ -97,9 +95,11 @@ class data extends filter {
97 sortable: 'custom' 95 sortable: 'custom'
98 }, 96 },
99 { 97 {
100 prop: "slry", 98 prop: "jssj",
101 label: "受理人员", 99 label: "结束时间",
102 } 100 width: '140',
101 sortable: 'custom'
102 },
103 ] 103 ]
104 } 104 }
105 } 105 }
......