apply-clients 3.1.41 → 3.1.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.1.41",
3
+ "version": "3.1.42",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/apply.js CHANGED
@@ -27,6 +27,10 @@ export default function () {
27
27
  // 流程监控列表页
28
28
  Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
29
29
  Vue.component('supervisory-list2', (resolve) => { require(['./components/product/Supervisory/SupervisoryList2'], resolve) })
30
+ Vue.component('devices-list', (resolve) => { require(['./components/product/Report/ApplyDevicesList'], resolve) })
31
+ Vue.component('gongliao-list', (resolve) => { require(['./components/product/Report/ApplyGongliaoList.vue'], resolve) })
32
+ Vue.component('report-search', (resolve) => { require(['./components/product/Report/ApplyReportSearch.vue'], resolve) })
33
+ Vue.component('report-control', (resolve) => { require(['./components/product/Report/ReportControl.vue'], resolve) })
30
34
  // 业务tab(control层)页
31
35
  Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
32
36
  // 流程列表页
@@ -1,218 +1,228 @@
1
1
  <template>
2
- <criteria-paged :model="model" v-ref:cp>
3
- <criteria partial='criteria' @condition-changed='search' v-ref:cri>
4
- <div class="form-horizontal select-overspread container-fluid auto" partial>
5
- <div class="row">
6
- <div class="form-group col-sm-3">
7
- <label class="font_normal_body">票号:</label>
8
- <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
9
- v-on:keyup.enter="$parent.$parent.search()"
10
- condition="cr.f_ticket_number like '%{}%'">
11
- </div>
12
- <div class="form-group col-sm-3">
13
- <label for="startDate" class="font_normal_body">开始时间:</label>
14
- <datepicker id="startDate" placeholder="开始日期"
15
- style="width: 60%!important;"
16
- v-model="model.startDate"
17
- :value.sync="model.startDate"
18
- :format="'yyyy-MM-dd 00:00:00'"
19
- :show-reset-button="true"
20
- condition="cr.f_charge_date >= '{}'">
21
- </datepicker>
22
- </div>
23
- <div class="form-group col-sm-3">
24
- <label for="endDate" class="font_normal_body">结束时间:</label>
25
- <datepicker id="endDate" placeholder="结束日期"
26
- style="width: 60%!important;"
27
- v-model="model.endDate"
28
- :value.sync="model.endDate"
29
- :format="'yyyy-MM-dd 23:59:59'"
30
- :show-reset-button="true"
31
- condition="cr.f_charge_date <= '{}'">
32
- </datepicker>
33
- </div>
34
- <div class="form-group col-sm-3 button-range">
35
- <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
36
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
37
- <export-excel :data="$parent.$parent.getCondition"
38
- :field="$parent.$parent.getfield"
39
- sqlurl="rs/logic/applyExportfile"
40
- sql-name="getApplyCharge"
41
- template-name='收费记录信息导出'
42
- :choose-col="true"></export-excel>
43
- <div
44
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
45
- @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
46
- class="button_spacing"
47
- style="float: right">
2
+ <div class="col-sm-12">
3
+ <criteria-paged :model="model" v-ref:cp>
4
+ <criteria partial='criteria' @condition-changed='search' v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
+ <div class="row">
7
+ <div class="form-group col-sm-3">
8
+ <label class="font_normal_body">客户名称:</label>
9
+ <input type="text" class="input_search" v-model="model.f_user_name"
10
+ v-on:keyup.enter="search" condition=" (f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
11
+ </div>
12
+ <div class="form-group col-sm-3">
13
+ <label class="font_normal_body">报建编号:</label>
14
+ <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
15
+ v-on:keyup.enter="search"
16
+ condition="u.f_apply_num like '%{}%'">
17
+ </div>
18
+ <div class="form-group col-sm-3">
19
+ <label class="font_normal_body">工程类型:</label>
20
+ <v-select
21
+ v-model="model.f_project_type"
22
+ placeholder='请选择'
23
+ condition="u.f_project_type like '%{}%'"
24
+ :value.sync="model.f_project_type"
25
+ :options='$parent.$parent.projectType'
26
+ class="select select_list"
27
+ :value-single="true"
28
+ close-on-select ></v-select>
29
+ </div>
30
+
31
+ <div class="form-group col-sm-3 button-range">
32
+ <button type="button" class="btn btn-info head-but" @click="search(),$parent.$parent.close()" v-el:cx>查询</button>
33
+ <button type="button" class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
34
+ <export-excel :data="$parent.$parent.getCondition"
35
+ :field="$parent.$parent.getfield"
36
+ sqlurl="rs/logic/applyExportfile"
37
+ sql-name="supervisory3"
38
+ template-name='报建记录信息导出'
39
+ :choose-col="true"></export-excel>
40
+ <!-- <button class="button_search button_spacing width-60" @click="search(),$parent.$parent.close()" v-el:cx>查询</button>-->
41
+ <div
42
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
43
+ @click="$parent.$parent.hidden()"
44
+ class="button_spacing"
45
+ style="float: right">
46
+ </div>
48
47
  </div>
49
48
  </div>
50
- </div>
51
- <div class="row" v-show="$parent.$parent.criteriaShow">
52
- <div class="form-group col-sm-3">
53
- <label class="font_normal_body">报建编号:</label>
54
- <input type="text" style="width: 60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
55
- v-on:keyup.enter="$parent.$parent.search()"
56
- condition="a.f_apply_num like '%{}%'">
57
- </div>
58
- <div class="form-group col-sm-3">
59
- <label class="font_normal_body">合同编号:</label>
60
- <input type="text" style="width: 60%" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
61
- v-on:keyup.enter="$parent.$parent.search()"
62
- condition="a.f_contract_number like '%{}%'">
63
- </div>
64
- <div class="form-group col-sm-3">
65
- <label class="font_normal_body">报建类型:</label>
66
- <v-select
67
- v-model="model.f_apply_type"
68
- placeholder='请选择'
69
- condition="a.f_apply_type = '{}'"
70
- :value.sync="model.f_apply_type"
71
- :options='$parent.$parent.applytype'
72
- class="select select_list"
73
- :value-single="true"
74
- close-on-select ></v-select>
75
- </div>
76
- <div class="form-group col-sm-3">
77
- <label class="font_normal_body">收费人员:</label>
78
- <input type="text" class="input_search" style="width: 60%" placeholder='收费人员' v-model="model.f_operator"
79
- v-on:keyup.enter="$parent.$parent.search()"
80
- condition="cr.f_operator like '%{}%'">
81
- </div>
82
- <div class="form-group col-sm-3">
83
- <label class="font_normal_body">付款方式:</label>
84
- <v-select
85
- v-model="model.f_payment_method"
86
- placeholder='请选择'
87
- condition="cr.f_payment_method = '{}'"
88
- :value.sync="model.f_payment_method"
89
- :options='$parent.$parent.paymentMethod'
90
- class="select select_list"
91
- :value-single="true"
92
- close-on-select ></v-select>
93
- </div>
94
- <div class="form-group col-sm-3">
95
- <label class="font_normal_body">缴费状态:</label>
96
- <v-select
97
- v-model="model.f_charge_state"
98
- placeholder='请选择'
99
- condition="cr.f_charge_state = '{}'"
100
- :value.sync="model.f_charge_state"
101
- :options='$parent.$parent.chargingStatus'
102
- class="select select_list"
103
- :value-single="true"
104
- close-on-select ></v-select>
49
+ <div class="row" v-show="$parent.$parent.criteriaShow">
50
+ <div class="form-group col-sm-3">
51
+ <label class="font_normal_body">小&emsp;&emsp;区:</label>
52
+ <v-select
53
+ v-model="model.f_residential_area"
54
+ placeholder='请选择'
55
+ condition="u.f_residential_area = '{}'"
56
+ :value.sync="model.f_residential_area"
57
+ :options='$parent.$parent.area'
58
+ class="select select_list"
59
+ :value-single="true"
60
+ close-on-select ></v-select>
61
+ </div>
62
+ <div class="form-group col-sm-3">
63
+ <label class="font_normal_body">用户地址:</label>
64
+ <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
65
+ v-on:keyup.enter="search"
66
+ condition="f_address like '%{}%'">
67
+ </div>
68
+ <div class="form-group col-sm-3">
69
+ <label class="font_normal_body">票&emsp;&emsp;号:</label>
70
+ <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
71
+ v-on:keyup.enter="search"
72
+ condition="c.f_ticket_number like '%{}%'">
73
+ </div>
74
+ <div class="form-group col-sm-3">
75
+ <label class="font_normal_body">合同编号:</label>
76
+ <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
77
+ v-on:keyup.enter="search"
78
+ condition="f_contract_number like '%{}%'">
79
+ </div>
80
+ <div class="col-sm-3 form-group">
81
+ <label class="font_normal_body">报建类型:</label>
82
+ <v-select
83
+ v-model="model.f_apply_type"
84
+ placeholder='报建类型'
85
+ condition="f_apply_type like '%{}%'"
86
+ :value.sync="model.f_apply_type"
87
+ :options='$parent.$parent.applytype'
88
+ class="select select_list"
89
+ :value-single="true"
90
+ close-on-select ></v-select>
91
+ </div>
92
+ <div class="col-sm-3 form-group">
93
+ <label class="font_normal_body">办理环节:</label>
94
+ <v-select
95
+ v-model="model.defname"
96
+ placeholder='办理环节'
97
+ condition="defname = '{}'"
98
+ :value.sync="model.defname"
99
+ :options='$parent.$parent.defnames'
100
+ class="select select_list"
101
+ :value-single="true"
102
+ close-on-select ></v-select>
103
+ </div>
104
+ <div class="form-group col-sm-3">
105
+ <label for="startDate" class="font_normal_body">开始时间:</label>
106
+ <datepicker id="startDate" placeholder="开始日期"
107
+ style="width: 60%!important;"
108
+ v-model="model.startDate"
109
+ :value.sync="model.startDate"
110
+ :format="'yyyy-MM-dd 00:00:00'"
111
+ :show-reset-button="true"
112
+ condition="f_apply_date >= '{}'">
113
+ </datepicker>
114
+ </div>
115
+ <div class="form-group col-sm-3">
116
+ <label for="endDate" class="font_normal_body">结束时间:</label>
117
+ <datepicker id="endDate" placeholder="结束日期"
118
+ style="width: 60%!important;"
119
+ v-model="model.endDate"
120
+ :value.sync="model.endDate"
121
+ :format="'yyyy-MM-dd 23:59:59'"
122
+ :show-reset-button="true"
123
+ condition="f_apply_date <= '{}'">
124
+ </datepicker>
125
+ </div>
105
126
  </div>
106
127
  </div>
107
- </div>
108
- </criteria>
109
- <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
110
- <template partial='head'>
111
- <tr>
112
- <th>序号</th>
113
- <th>报建编号</th>
114
- <th>票号</th>
115
- <th>收费项目</th>
116
- <th>合同编号</th>
117
- <th>报建类型</th>
118
- <th>收费金额</th>
119
- <th>付款方式</th>
120
- <th>收费人员</th>
121
- <th>收费日期</th>
122
- <th>状态</th>
123
- <th>地址</th>
124
- </tr>
125
- </template>
126
- <template partial='body'>
127
- <tr >
128
- <td style="text-align: center;">
129
- <nobr><font>{{$index+1}}</font></nobr>
130
- </td>
131
- <td style="text-align: center;">
132
- <nobr><font>{{row.f_applynum}}</font></nobr>
133
- </td>
134
- <td style="text-align: center;">
135
- <nobr><font>{{row.f_ticket_number}}</font></nobr>
136
- </td>
137
- <td style="text-align: center;">
138
- <nobr><font>{{row.f_charge_type}}</font></nobr>
139
- </td>
140
- <td style="text-align: center;">
141
- <nobr><font>{{row.f_contract_number}}</font></nobr>
142
- </td>
143
- <td style="text-align: center;">
144
- <nobr><font>{{row.f_apply_type}}</font></nobr>
145
- </td>
146
- <td style="text-align: center;">
147
- <nobr><font>{{row.f_charge_money}}</font></nobr>
148
- </td>
149
- <td style="text-align: center;">
150
- <nobr><font>{{row.f_payment_method}}</font></nobr>
151
- </td>
152
- <td style="text-align: center;">
153
- <nobr><font>{{row.f_operator}}</font></nobr>
154
- </td>
155
- <td style="text-align: center;">
156
- <nobr><font>{{row.f_charge_date}}</font></nobr>
157
- </td>
158
- <td style="text-align: center;">
159
- <nobr><font>{{row.f_charge_state}}</font></nobr>
160
- </td>
161
- <td style="text-align: center;">
162
- <nobr><font>{{row.f_address}}</font></nobr>
163
- </td>
164
- </tr>
165
- </template>
166
- </data-grid>
167
- </criteria-paged>
128
+ </criteria>
129
+ <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
130
+ <template partial='head'>
131
+ <tr>
132
+ <th>序号</th>
133
+ <th>报建编号</th>
134
+ <th>当前状态</th>
135
+ <th>客户名称/联系人</th>
136
+ <th>合同编号</th>
137
+ <th>电话</th>
138
+ <th>地址</th>
139
+ <th>流程状态</th>
140
+ <th>报建类型</th>
141
+ <th>报建日期</th>
142
+ </tr>
143
+ </template>
144
+ <template partial='body'>
145
+ <tr>
146
+ <td style="text-align: center;">
147
+ <nobr>{{$index+1}}</nobr>
148
+ </td>
149
+ <td style="text-align: center;">
150
+ <nobr><font>{{row.f_apply_num}}</font></nobr>
151
+ </td>
152
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
153
+ <nobr>{{row.f_sub_state}}</nobr>
154
+ </td>
155
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
156
+ <nobr>{{row.f_user_name}}/{{row.f_contact}}</nobr>
157
+ </td>
158
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
159
+ <nobr>{{row.f_contract_number}}</nobr>
160
+ </td>
161
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
162
+ <nobr>{{row.f_phone}}</nobr>
163
+ </td>
164
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
165
+ <nobr>{{row.f_address}}</nobr>
166
+ </td>
167
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
168
+ <nobr>{{row.defname}}</nobr>
169
+ </td>
170
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
171
+ <nobr>{{row.f_apply_type}}</nobr>
172
+ </td>
173
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
174
+ <nobr>{{row.f_apply_date}}</nobr>
175
+ </td>
176
+ </tr>
177
+ </template>
178
+ </data-grid>
179
+ </criteria-paged>
180
+ </div>
168
181
  </template>
169
-
170
182
  <script>
171
183
  import {PagedList} from 'vue-client'
184
+ import getNowDate from '../../getNowDate.js'
172
185
  import {HttpResetClass} from 'vue-client'
186
+
173
187
  export default {
174
- title: '报建收费列表',
175
- data () {
188
+ title: '勘探详情',
189
+ data() {
176
190
  return {
177
- model: new PagedList('rs/sql/getApplyCharge', 30, {
191
+ applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
192
+ model: new PagedList('rs/sql/supervisory3', 20, {
178
193
  data: {
179
- org: this.$login.f.orgs
194
+ id: `${this.$login.f.name}`,
195
+ org: `${this.$login.f.orgs}`
180
196
  }
181
- }, {
182
- f_charge_money: 0
183
197
  }),
184
- applytype: [{label:"集中报建",value:'集中报建'},{label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}], // 所有报建类型
185
- paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
186
- chargingStatus: [
187
- {label: '全部', value: ''},
188
- {label: '有效', value: '有效'},
189
- {label: '作废', value: '作废'}
190
- ],
198
+ defnames:[], // 所有流程节点
199
+ condition: '', // 查询条件
191
200
  criteriaShow: false,
192
- chargeAll: {
193
- count: 0,
194
- sum: 0
195
- },
201
+ area:[],
196
202
  getfield: {
197
- 'f_applynum': '报建编号',
198
- 'f_charge_type': '收费设备',
199
- 'f_brand': '设备品牌',
200
- 'f_devices_num': '设备数量',
201
- 'f_contract_number': '合同编号',
202
- 'f_apply_type': '报建类型',
203
- 'f_ticket_number': '票号',
204
- 'f_charge_money': '收费金额',
205
- 'f_payment_method': '付款方式',
206
- 'f_operator': '收费人员',
207
- 'f_charge_date': '收费日期',
208
- 'f_charge_state': '状态',
209
- 'f_address': '地址'
203
+ 'f_apply_num': ' 报 建 编 号 ',
204
+ 'defname': ' 当 前 环 节 ',
205
+ 'f_sub_state': ' 流 程 状 态 ',
206
+ 'f_user_name': ' 客 户 名 称 ',
207
+ 'f_contact': ' 联 系 人 ',
208
+ 'f_contract_number': ' 合 同 编 号 ',
209
+ 'f_phone': ' 电 话 ',
210
+ 'f_address': ' 地 址 ',
211
+ 'f_apply_type': ' 报 建 类 型 ',
212
+ 'f_apply_date': ' 报 建 日 期 ',
213
+ 'money': ' 缴纳总金额 ',
214
+ 'f_households_sum': ' 报建户数 '
210
215
  }
211
216
  }
212
217
  },
213
- ready () {
218
+ async ready() {
214
219
  // 调用查询
215
- this.search()
220
+ this.$refs.cp.$refs.cri.search()
221
+ // 获取所有办理环节
222
+ this.getDefnames()
223
+ this.getAreaAll()
224
+ },
225
+ events: {
216
226
  },
217
227
  methods: {
218
228
  clear () {
@@ -220,47 +230,71 @@ export default {
220
230
  this.$refs.cp.$refs.cri.model[key] = ''
221
231
  })
222
232
  },
223
- searchCondition (args) {
224
- args.condition = args.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
225
- this.model.search(args.condition, args.model)
233
+ hidden() {
234
+ this.$dispatch('hidden', this.criteriaShow)
235
+ this.criteriaShow = !this.criteriaShow
226
236
  },
227
- // 查询
228
- search () {
229
- this.$refs.cp.$refs.cri.search()
230
- this.getChargeAll()
237
+ // 获取所有办理环节
238
+ getDefnames() {
239
+ let http = new HttpResetClass()
240
+ http.load('POST', 'rs/logic/getAllDefname', {}, {
241
+ resolveMsg: null,
242
+ rejectMsg: null
243
+ }).then((res) => {
244
+ this.defnames = [{label: '全部', value: ''}, ...res.data]
245
+ })
231
246
  },
232
- async getChargeAll () {
247
+ async getAreaAll () {
233
248
  let http = new HttpResetClass()
234
- let data = {
235
- condition: this.model.condition,
236
- data: {
237
- org: this.$login.f.orgs
238
- }
239
- }
240
- let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
249
+ let condition = "f_filialeid = " + this.$login.f.orgid
250
+ let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
241
251
 
242
- this.chargeAll = res.data[0]
252
+ this.area = res.data.queryArea.map(item => {
253
+ return {
254
+ 'label': item.f_residential_area,
255
+ 'value': item.f_residential_area,
256
+ }
257
+ })
243
258
  },
244
- getorg (val) {
245
- if (val.length <= 0) {
246
- return
247
- }
248
- this.curorgid = val
249
- this.search()
259
+ check(val) {
260
+ this.$dispatch('apply', val)
261
+ },
262
+ close() {
263
+ this.$dispatch('close')
250
264
  }
251
265
  },
252
266
  computed: {
267
+ projectType() {
268
+ return this.$appdata.getParam("工程类型")
269
+ },
253
270
  getCondition () {
271
+ console.log("condition",this.$refs.cp.$refs.cri.condition)
254
272
  return {
255
273
  condition: this.$refs.cp.$refs.cri.condition,
256
274
  data: {
257
- org: this.$login.f.orgs
275
+ org: `${this.$login.f.orgs}`,
276
+ orgid: this.$login.f.orgid
258
277
  }
259
278
  }
260
279
  }
261
280
  }
262
281
  }
263
282
  </script>
264
-
265
283
  <style scoped>
284
+
285
+ .operate{
286
+ text-align: right;
287
+ display: flex;
288
+ align-items: center; /*子元素中线居中*/
289
+ justify-content: flex-end; /*子元素靠右*/
290
+ margin-top: 7px;
291
+ }
292
+ .head-but{
293
+ margin-left: 5px;
294
+ height: 34px;
295
+ background-color: #6aa6e2;
296
+ border-radius: 4px;
297
+ font-family: PingFang;
298
+ color: #ffffff;
299
+ }
266
300
  </style>
@@ -2,12 +2,8 @@
2
2
  <div class="flex-row">
3
3
  <div class="basic-main">
4
4
  <div style="height: 95%">
5
- <apply-charge-list v-ref:query ></apply-charge-list>
5
+ <report-control v-ref:query ></report-control>
6
6
  </div>
7
- <p class="bg-info text-center" style="font-size: 20px;height: 5%">
8
- 合计记录共<span style="color: red">&ensp;{{$refs.query.chargeAll.count}}&ensp;</span>笔,
9
- 合计金额<span style="color: red">&ensp;{{$refs.query.chargeAll.sum}}&ensp;</span>元
10
- </p>
11
7
  </div>
12
8
  </div>
13
9
  </template>