apply-clients 3.1.47 → 3.1.50

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.
Files changed (8) hide show
  1. package/package.json +1 -1
  2. package/src/components/product/ApplyCharge/ApplyChargeList.vue +315 -304
  3. package/src/components/product/Function/InstallInfoSelect.vue +11 -0
  4. package/src/components/product/Process/ExplorationSelect.vue +11 -0
  5. package/src/components/product/Process/Service/ServiceControl.vue +47 -0
  6. package/src/components/product/Report/ApplyGongliaoList.vue +1 -1
  7. package/src/components/product/Supervisory/SupervisoryList.vue +11 -0
  8. package/src/components/product/Supervisory/SupervisoryList2.vue +71 -56
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.1.47",
3
+ "version": "3.1.50",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/product/ApplyCharge/ApplyChargeList.vue CHANGED
@@ -1,304 +1,315 @@
1
- <template>
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>
47
- </div>
48
- </div>
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>
126
- </div>
127
- </div>
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
- <th>报建日期</th>
143
- </tr>
144
- </template>
145
- <template partial='body'>
146
- <tr>
147
- <td style="text-align: center;">
148
- <nobr>{{$index+1}}</nobr>
149
- </td>
150
- <td style="text-align: center;">
151
- <nobr><font>{{row.f_apply_num}}</font></nobr>
152
- </td>
153
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
154
- <nobr>{{row.f_sub_state}}</nobr>
155
- </td>
156
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
157
- <nobr>{{row.money}}</nobr>
158
- </td>
159
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
160
- <nobr>{{row.f_user_name}}/{{row.f_contact}}</nobr>
161
- </td>
162
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
163
- <nobr>{{row.f_contract_number}}</nobr>
164
- </td>
165
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
166
- <nobr>{{row.f_phone}}</nobr>
167
- </td>
168
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
169
- <nobr>{{row.f_address}}</nobr>
170
- </td>
171
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
172
- <nobr>{{row.defname}}</nobr>
173
- </td>
174
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
175
- <nobr>{{row.f_apply_type}}</nobr>
176
- </td>
177
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
178
- <nobr>{{row.f_apply_date}}</nobr>
179
- </td>
180
- </tr>
181
- </template>
182
- </data-grid>
183
- </criteria-paged>
184
- </div>
185
- </template>
186
- <script>
187
- import {PagedList} from 'vue-client'
188
- import getNowDate from '../../getNowDate.js'
189
- import {HttpResetClass} from 'vue-client'
190
-
191
- export default {
192
- title: '勘探详情',
193
- data() {
194
- return {
195
- applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
196
- model: new PagedList('rs/sql/supervisory3', 20, {
197
- data: {
198
- id: `${this.$login.f.name}`,
199
- org: `${this.$login.f.orgs}`
200
- }
201
- }),
202
- defnames:[], // 所有流程节点
203
- condition: '', // 查询条件
204
- criteriaShow: false,
205
- area:[],
206
- getfield: {
207
- 'f_apply_num': ' 报 建 编 号 ',
208
- 'defname': ' 当 前 环 节 ',
209
- 'f_sub_state': ' 流 程 状 态 ',
210
- 'f_user_name': ' 客 户 名 称 ',
211
- 'f_contact': ' 联 系 人 ',
212
- 'f_contract_number': ' 合 同 编 号 ',
213
- 'f_phone': ' 电 话 ',
214
- 'f_address': ' 地 址 ',
215
- 'f_apply_type': ' 报 建 类 型 ',
216
- 'f_apply_date': ' 报 建 日 期 ',
217
- 'money': ' 缴纳总金额 ',
218
- 'f_households_sum': ' 报建户数 '
219
- }
220
- }
221
- },
222
- async ready() {
223
- // 调用查询
224
- this.$refs.cp.$refs.cri.search()
225
- // 获取所有办理环节
226
- this.getDefnames()
227
- this.getAreaAll()
228
- },
229
- events: {
230
- },
231
- methods: {
232
- clear () {
233
- Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
234
- this.$refs.cp.$refs.cri.model[key] = ''
235
- })
236
- },
237
- hidden() {
238
- this.$dispatch('hidden', this.criteriaShow)
239
- this.criteriaShow = !this.criteriaShow
240
- },
241
- // 获取所有办理环节
242
- getDefnames() {
243
- let http = new HttpResetClass()
244
- http.load('POST', 'rs/logic/getAllDefname', {}, {
245
- resolveMsg: null,
246
- rejectMsg: null
247
- }).then((res) => {
248
- this.defnames = [{label: '全部', value: ''}, ...res.data]
249
- })
250
- },
251
- async getAreaAll () {
252
- let http = new HttpResetClass()
253
- let condition = "f_filialeid = " + this.$login.f.orgid
254
- let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
255
-
256
- this.area = res.data.queryArea.map(item => {
257
- return {
258
- 'label': item.f_residential_area,
259
- 'value': item.f_residential_area,
260
- }
261
- })
262
- },
263
- check(val) {
264
- this.$dispatch('apply', val)
265
- },
266
- close() {
267
- this.$dispatch('close')
268
- }
269
- },
270
- computed: {
271
- projectType() {
272
- return this.$appdata.getParam("工程类型")
273
- },
274
- getCondition () {
275
- console.log("condition",this.$refs.cp.$refs.cri.condition)
276
- return {
277
- condition: this.$refs.cp.$refs.cri.condition,
278
- data: {
279
- org: `${this.$login.f.orgs}`,
280
- orgid: this.$login.f.orgid
281
- }
282
- }
283
- }
284
- }
285
- }
286
- </script>
287
- <style scoped>
288
-
289
- .operate{
290
- text-align: right;
291
- display: flex;
292
- align-items: center; /*子元素中线居中*/
293
- justify-content: flex-end; /*子元素靠右*/
294
- margin-top: 7px;
295
- }
296
- .head-but{
297
- margin-left: 5px;
298
- height: 34px;
299
- background-color: #6aa6e2;
300
- border-radius: 4px;
301
- font-family: PingFang;
302
- color: #ffffff;
303
- }
304
- </style>
1
+ <template>
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>
47
+ </div>
48
+ </div>
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>
126
+ <div class="form-group col-sm-3">
127
+ <label for="endDate" class="font_normal_body">收费日期：</label>
128
+ <datepicker id="f_charge_date" placeholder="收费日期"
129
+ style="width: 60%!important;"
130
+ v-model="model.f_charge_date"
131
+ :value.sync="model.f_charge_date"
132
+ :format="'yyyy-MM-dd'"
133
+ :show-reset-button="true"
134
+ condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
135
+ </datepicker>
136
+ </div>
137
+ </div>
138
+ </div>
139
+ </criteria>
140
+ <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
141
+ <template partial='head'>
142
+ <tr>
143
+ <th>序号</th>
144
+ <th>报建编号</th>
145
+ <th>当前状态</th>
146
+ <th>合计收费</th>
147
+ <th>客户名称/联系人</th>
148
+ <th>合同编号</th>
149
+ <th>电话</th>
150
+ <th>地址</th>
151
+ <th>流程状态</th>
152
+ <th>报建类型</th>
153
+ <th>报建日期</th>
154
+ </tr>
155
+ </template>
156
+ <template partial='body'>
157
+ <tr>
158
+ <td style="text-align: center;">
159
+ <nobr>{{$index+1}}</nobr>
160
+ </td>
161
+ <td style="text-align: center;">
162
+ <nobr><font>{{row.f_apply_num}}</font></nobr>
163
+ </td>
164
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
165
+ <nobr>{{row.f_sub_state}}</nobr>
166
+ </td>
167
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
168
+ <nobr>{{row.money}}</nobr>
169
+ </td>
170
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
171
+ <nobr>{{row.f_user_name}}/{{row.f_contact}}</nobr>
172
+ </td>
173
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
174
+ <nobr>{{row.f_contract_number}}</nobr>
175
+ </td>
176
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
177
+ <nobr>{{row.f_phone}}</nobr>
178
+ </td>
179
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
180
+ <nobr>{{row.f_address}}</nobr>
181
+ </td>
182
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
183
+ <nobr>{{row.defname}}</nobr>
184
+ </td>
185
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
186
+ <nobr>{{row.f_apply_type}}</nobr>
187
+ </td>
188
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
189
+ <nobr>{{row.f_apply_date}}</nobr>
190
+ </td>
191
+ </tr>
192
+ </template>
193
+ </data-grid>
194
+ </criteria-paged>
195
+ </div>
196
+ </template>
197
+ <script>
198
+ import {PagedList} from 'vue-client'
199
+ import getNowDate from '../../getNowDate.js'
200
+ import {HttpResetClass} from 'vue-client'
201
+
202
+ export default {
203
+ title: '勘探详情',
204
+ data() {
205
+ return {
206
+ applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
207
+ model: new PagedList('rs/sql/supervisory3', 20, {
208
+ data: {
209
+ id: `${this.$login.f.name}`,
210
+ org: `${this.$login.f.orgs}`
211
+ }
212
+ }),
213
+ defnames:[], // 所有流程节点
214
+ condition: '', // 查询条件
215
+ criteriaShow: false,
216
+ area:[],
217
+ getfield: {
218
+ 'f_apply_num': ' 报 建 编 号 ',
219
+ 'defname': ' 当 前 环 节 ',
220
+ 'f_sub_state': ' 流 程 状 态 ',
221
+ 'f_user_name': ' 客 户 名 称 ',
222
+ 'f_contact': ' 联 系 人 ',
223
+ 'f_contract_number': ' 合 同 编 号 ',
224
+ 'f_phone': ' 电 话 ',
225
+ 'f_address': ' 地 址 ',
226
+ 'f_apply_type': ' 报 建 类 型 ',
227
+ 'f_apply_date': ' 报 建 日 期 ',
228
+ 'money': ' 缴纳总金额 ',
229
+ 'f_households_sum': ' 报建户数 '
230
+ }
231
+ }
232
+ },
233
+ async ready() {
234
+ // 调用查询
235
+ this.$refs.cp.$refs.cri.search()
236
+ // 获取所有办理环节
237
+ this.getDefnames()
238
+ this.getAreaAll()
239
+ },
240
+ events: {
241
+ },
242
+ methods: {
243
+ clear () {
244
+ Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
245
+ this.$refs.cp.$refs.cri.model[key] = ''
246
+ })
247
+ },
248
+ hidden() {
249
+ this.$dispatch('hidden', this.criteriaShow)
250
+ this.criteriaShow = !this.criteriaShow
251
+ },
252
+ // 获取所有办理环节
253
+ getDefnames() {
254
+ let http = new HttpResetClass()
255
+ http.load('POST', 'rs/logic/getAllDefname', {}, {
256
+ resolveMsg: null,
257
+ rejectMsg: null
258
+ }).then((res) => {
259
+ this.defnames = [{label: '全部', value: ''}, ...res.data]
260
+ })
261
+ },
262
+ async getAreaAll () {
263
+ let http = new HttpResetClass()
264
+ let condition = "f_filialeid = " + this.$login.f.orgid
265
+ let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
266
+
267
+ this.area = res.data.queryArea.map(item => {
268
+ return {
269
+ 'label': item.f_residential_area,
270
+ 'value': item.f_residential_area,
271
+ }
272
+ })
273
+ },
274
+ check(val) {
275
+ this.$dispatch('apply', val)
276
+ },
277
+ close() {
278
+ this.$dispatch('close')
279
+ }
280
+ },
281
+ computed: {
282
+ projectType() {
283
+ return this.$appdata.getParam("工程类型")
284
+ },
285
+ getCondition () {
286
+ console.log("condition",this.$refs.cp.$refs.cri.condition)
287
+ return {
288
+ condition: this.$refs.cp.$refs.cri.condition,
289
+ data: {
290
+ org: `${this.$login.f.orgs}`,
291
+ orgid: this.$login.f.orgid
292
+ }
293
+ }
294
+ }
295
+ }
296
+ }
297
+ </script>
298
+ <style scoped>
299
+
300
+ .operate{
301
+ text-align: right;
302
+ display: flex;
303
+ align-items: center; /*子元素中线居中*/
304
+ justify-content: flex-end; /*子元素靠右*/
305
+ margin-top: 7px;
306
+ }
307
+ .head-but{
308
+ margin-left: 5px;
309
+ height: 34px;
310
+ background-color: #6aa6e2;
311
+ border-radius: 4px;
312
+ font-family: PingFang;
313
+ color: #ffffff;
314
+ }
315
+ </style>
package/src/components/product/Function/InstallInfoSelect.vue CHANGED
@@ -104,6 +104,17 @@
104
104
  condition="f_apply_date <= '{}'">
105
105
  </datepicker>
106
106
  </div>
107
+ <div class="form-group col-sm-4">
108
+ <label for="endDate" class="font_normal_body">收费日期：</label>
109
+ <datepicker id="f_charge_date" placeholder="收费日期"
110
+ style="width: 60%!important;"
111
+ v-model="model.f_charge_date"
112
+ :value.sync="model.f_charge_date"
113
+ :format="'yyyy-MM-dd'"
114
+ :show-reset-button="true"
115
+ condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
116
+ </datepicker>
117
+ </div>
107
118
  </div>
108
119
  </div>
109
120
  </criteria>
package/src/components/product/Process/ExplorationSelect.vue CHANGED
@@ -105,6 +105,17 @@
105
105
  condition="f_apply_date <= '{}'">
106
106
  </datepicker>
107
107
  </div>
108
+ <div class="form-group col-sm-3">
109
+ <label for="endDate" class="font_normal_body">收费日期：</label>
110
+ <datepicker id="f_charge_date" placeholder="收费日期"
111
+ style="width: 60%!important;"
112
+ v-model="model.f_charge_date"
113
+ :value.sync="model.f_charge_date"
114
+ :format="'yyyy-MM-dd'"
115
+ :show-reset-button="true"
116
+ condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
117
+ </datepicker>
118
+ </div>
108
119
  </div>
109
120
  </div>
110
121
  </criteria>
package/src/components/product/Process/Service/ServiceControl.vue CHANGED
@@ -524,6 +524,52 @@
524
524
  }
525
525
  }
526
526
  },
527
+ getTotalCost(){
528
+ if (this.selectdata.defname === '结算') {
529
+ for (let i = 0; i < this.show_data.fields.length; i++) {
530
+ if (this.show_data.fields[i].label === '低压工程款') {
531
+ this.show_data.f_project_money_down = Number(this.show_data.fields[i].value)
532
+ console.log("测试1", this.show_data.f_project_money_down)
533
+ } else if (this.show_data.fields[i].label === '中压工程款') {
534
+ this.show_data.f_project_money_up = Number(this.show_data.fields[i].value)
535
+ console.log("测试2", this.show_data.f_project_money_up)
536
+ } else if (this.show_data.fields[i].label === '低压材料款') {
537
+ this.show_data.f_material_money_down = Number(this.show_data.fields[i].value)
538
+ console.log("测试3", this.show_data.f_material_money_down)
539
+ } else if (this.show_data.fields[i].label === '中压材料款') {
540
+ this.show_data.f_material_money_up = Number(this.show_data.fields[i].value)
541
+ console.log("测试4", this.show_data.f_material_money_up)
542
+ } else if (this.show_data.fields[i].label === '支付结算') {
543
+ console.log("测试5", this.show_data.f_payment_settlement)
544
+ if ((this.show_data.f_project_money_down + this.show_data.f_project_money_up) > 0) {
545
+ this.show_data.fields[i].value = this.show_data.f_project_money_down + this.show_data.f_project_money_up
546
+ }
547
+ this.show_data.f_payment_settlement = Number(this.show_data.fields[i].value)
548
+ } else if (this.show_data.fields[i].label === '支付材料') {
549
+ console.log("测试6", (this.show_data.f_material_money_down + this.show_data.f_material_money_up))
550
+ if ((this.show_data.f_material_money_down + this.show_data.f_material_money_up) > 0) {
551
+ console.log("测试6", (this.show_data.f_material_money_down + this.show_data.f_material_money_up))
552
+ this.show_data.fields[i].value = this.show_data.f_material_money_down + this.show_data.f_material_money_up
553
+ }
554
+ this.show_data.f_payment_material = Number(this.show_data.fields[i].value)
555
+ } else if (this.show_data.fields[i].label === '总成本') {
556
+ if ((this.show_data.f_payment_material + this.show_data.f_payment_settlement) > 0) {
557
+ console.log("测试7")
558
+ this.show_data.fields[i].value = this.show_data.f_payment_material + this.show_data.f_payment_settlement
559
+ }
560
+ this.show_data.f_total_cost = this.show_data.fields[i].value
561
+ } else if (this.show_data.fields[i].label === '毛利') {
562
+ if (this.show_data.f_total_cost > 0) {
563
+ console.log("测试8")
564
+ let number = parseFloat((this.selectdata.f_contract_money - this.show_data.f_total_cost) / this.selectdata.f_contract_money).toFixed(5)
565
+ let realVal = number.substring(0, number.length - 1)
566
+ this.show_data.fields[i].value =(realVal * 100).toFixed(2)+"%"
567
+ }
568
+ }
569
+ }
570
+ console.log("测试", this.show_data)
571
+ }
572
+ },
527
573
  an_kang_yi_hua () {
528
574
  //===================安康逸华前端特殊逻辑===========================
529
575
  let swap1 = null // 小区名称转换
@@ -896,6 +942,7 @@
896
942
  this.an_kang_yi_hua()
897
943
  this.getGasMeter1()
898
944
  this.getGasPrice()
945
+ this.getTotalCost()
899
946
 
900
947
 
901
948
  // 合成地址
package/src/components/product/Report/ApplyGongliaoList.vue CHANGED
@@ -124,7 +124,7 @@
124
124
  <nobr><font>{{row.f_ticket_number}}</font></nobr>
125
125
  </td>
126
126
  <td style="text-align: center;">
127
- <nobr><font>{{row.f_operation_date}}</font></nobr>
127
+ <nobr><font>{{row.f_charge_date}}</font></nobr>
128
128
  </td>
129
129
  <td style="text-align: center;">
130
130
  <nobr><font>{{row.f_operator}}</font></nobr>
package/src/components/product/Supervisory/SupervisoryList.vue CHANGED
@@ -123,6 +123,17 @@
123
123
  condition="f_apply_date <= '{}'">
124
124
  </datepicker>
125
125
  </div>
126
+ <div class="form-group col-sm-3">
127
+ <label for="endDate" class="font_normal_body">收费日期：</label>
128
+ <datepicker id="f_charge_date" placeholder="收费日期"
129
+ style="width: 60%!important;"
130
+ v-model="model.f_charge_date"
131
+ :value.sync="model.f_charge_date"
132
+ :format="'yyyy-MM-dd'"
133
+ :show-reset-button="true"
134
+ condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
135
+ </datepicker>
136
+ </div>
126
137
  </div>
127
138
  </div>
128
139
  </criteria>
package/src/components/product/Supervisory/SupervisoryList2.vue CHANGED
@@ -122,6 +122,17 @@
122
122
  condition="f_apply_date <= '{}'">
123
123
  </datepicker>
124
124
  </div>
125
+ <div class="form-group col-sm-3">
126
+ <label for="endDate" class="font_normal_body">收费日期：</label>
127
+ <datepicker id="f_charge_date" placeholder="收费日期"
128
+ style="width: 60%!important;"
129
+ v-model="model.f_charge_date"
130
+ :value.sync="model.f_charge_date"
131
+ :format="'yyyy-MM-dd'"
132
+ :show-reset-button="true"
133
+ condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
134
+ </datepicker>
135
+ </div>
125
136
  </div>
126
137
  </div>
127
138
  </criteria>
@@ -188,9 +199,12 @@
188
199
  data() {
189
200
  return {
190
201
  applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
191
- model: {
192
- data:null
193
- },
202
+ model: new PagedList('rs/sql/supervisory2', 20, {
203
+ data: {
204
+ id: `${this.$login.f.id}`,
205
+ org: `${this.$login.f.orgs}`
206
+ }
207
+ }),
194
208
  defnames:[], // 所有流程节点
195
209
  condition: '', // 查询条件
196
210
  criteriaShow: false,
@@ -226,58 +240,59 @@
226
240
  },
227
241
  //获取当前登录人已处理过的流程ID
228
242
  async searchCondition() {
229
- let http = new HttpResetClass()
230
- let data = {
231
- org: `${this.$login.f.orgs}`
232
- }
233
- let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
234
- resolveMsg: null,
235
- rejectMsg: '查询角色失败'
236
- })
237
- let x = []
238
- for (let i = 0; i < res.data.length; i++) {
239
- if (this.$login.f.f_role_name.includes(res.data[i].actor)) {
240
- x.push(res.data[i].processid)
241
- }
242
- }
243
- this.processids = JSON.stringify(x)
244
-
245
- console.log("x的数据", this.processids)
243
+ // let http = new HttpResetClass()
244
+ // let data = {
245
+ // org: `${this.$login.f.orgs}`
246
+ // }
247
+ // let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
248
+ // resolveMsg: null,
249
+ // rejectMsg: '查询角色失败'
250
+ // })
251
+ // let x = []
252
+ // for (let i = 0; i < res.data.length; i++) {
253
+ // if (this.$login.f.f_role_name.includes(res.data[i].actor)) {
254
+ // x.push(res.data[i].processid)
255
+ // }
256
+ // }
257
+ // this.processids = JSON.stringify(x)
258
+ //
259
+ // console.log("x的数据", this.processids)
246
260
  },
247
261
  async search() {
248
- let http = new HttpResetClass()
249
- let data = {
250
- org: `${this.$login.f.orgs}`
251
- }
252
- let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
253
- resolveMsg: null,
254
- rejectMsg: '查询角色失败'
255
- })
256
- let x = []
257
- for (let i = 0; i < res.data.length; i++){
258
- if (this.$login.f.f_role_name.includes(res.data[i].actor)){
259
- x.push(res.data[i].processid)
260
- }
261
- }
262
- this.processids = JSON.stringify(x)
263
- console.log("x的数据",this.processids)
264
- data = {
265
- condition: '1=1',
266
- x:this.processids,
267
- org: `${this.$login.f.orgs}`
268
- }
269
- if (this.$refs.cp.$refs.cri.condition){
270
- data.condition = data.condition + 'and' +this.$refs.cp.$refs.cri.condition
271
- }
272
- this.condition = data.condition
273
- res = await http.load('POST', 'rs/sql/supervisory2', {data: data}, {
274
- resolveMsg: null,
275
- rejectMsg: '查询失败'
276
- })
277
- console.log("当前数据",res.data)
278
- this.model.data = res.data
262
+ console.log("测试1",this.$login.f.id)
263
+ // let http = new HttpResetClass()
264
+ // let data = {
265
+ // org: `${this.$login.f.orgs}`
266
+ // }
267
+ // let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
268
+ // resolveMsg: null,
269
+ // rejectMsg: '查询角色失败'
270
+ // })
271
+ // let x = []
272
+ // for (let i = 0; i <= res.data.length; i++){
273
+ // if (this.$login.f.f_role_name.includes(res.data[i].actor)){
274
+ // x.push(res.data[i].processid)
275
+ // }
276
+ // }
277
+ // this.processids = JSON.stringify(x)
278
+ // console.log("x的数据",this.processids)
279
+ // data = {
280
+ // condition: '1=1',
281
+ // x:this.processids,
282
+ // org: `${this.$login.f.orgs}`
283
+ // }
284
+ // if (this.$refs.cp.$refs.cri.condition){
285
+ // data.condition = data.condition + 'and' +this.$refs.cp.$refs.cri.condition
286
+ // }
287
+ // this.condition = data.condition
288
+ // res = await http.load('POST', 'rs/sql/supervisory2', {data: data}, {
289
+ // resolveMsg: null,
290
+ // rejectMsg: '查询失败'
291
+ // })
292
+ // console.log("当前数据",res.data)
293
+ // this.model.data = res.data
279
294
  // 调用查询
280
- // this.$refs.cp.$refs.cri.search()
295
+ this.$refs.cp.$refs.cri.search()
281
296
  },
282
297
  hidden() {
283
298
  this.$dispatch('hidden', this.criteriaShow)
@@ -320,12 +335,12 @@
320
335
  getCondition () {
321
336
  console.log("condition",this.$refs.cp.$refs.cri.condition)
322
337
  return {
323
- condition: this.condition,
324
- org: `${this.$login.f.orgs}`,
325
- x: this.processids,
338
+ condition: this.$refs.cp.$refs.cri.condition,
339
+ // org: `${this.$login.f.orgs}`,
340
+ // x: this.processids,
326
341
  data: {
327
342
  org: `${this.$login.f.orgs}`,
328
- orgid: this.$login.f.orgid
343
+ id: `${this.$login.f.id}`
329
344
  }
330
345
  }
331
346
  }