apply-clients 4.1.54-weinan → 4.1.56-weinan

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 (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/app_apply/AppProcessSupervisory.vue +214 -251
  3. package/src/components/app_apply/AppSupervisoryCart.vue +68 -119
  4. package/src/components/app_apply/AppdevicesDetails.vue +10 -12
  5. package/src/components/app_apply/ApplyToDoList.vue +200 -67
  6. package/src/components/app_apply/ServiceControl.vue +2 -2
  7. package/src/components/app_apply/materialshoufei.vue +243 -239
package/src/components/app_apply/AppSupervisoryCart.vue CHANGED
@@ -1,119 +1,68 @@
1
- <template>
2
- <div style="padding: 10px">
3
- <div partial class="auto app-text panel" style="margin-bottom: 20px">
4
- <div class="panel-body panel-self">
5
- <div class="col-xs-12">
6
- <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
7
- <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_num }}</p>
8
- </div>
9
- <div class="col-xs-12">
10
- <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
11
- <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
12
- </div>
13
- <div class="col-xs-12">
14
- <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
15
- <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_type }}</p>
16
- </div>
17
- <div class="col-xs-12">
18
- <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
19
- <p class="col-xs-9 text-left input-font">{{ selectdata.defname }}</p>
20
- </div>
21
- <div class="col-xs-12">
22
- <p class="col-xs-3 text-left font"><b>用户类型:</b></p>
23
- <p class="col-xs-9 text-left input-font">{{ selectdata.f_user_type }}</p>
24
- </div>
25
- <div class="col-xs-12">
26
- <p class="col-xs-3 text-left font"><b>流程状态：</b></p>
27
- <p class="col-xs-9 text-left input-font">{{ selectdata.f_sub_state }}</p>
28
- </div>
29
- <div class="col-xs-12">
30
- <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
31
- <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_date }}</p>
32
- </div>
33
- </div>
34
- </div>
35
- <div class="row" v-for="(i,row) in defnames">
36
- <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="shouju(row)">
37
- {{row.defname}}
38
- <span v-if="row.state === '结束'">({{ row.person }})</span>
39
- <span v-if="row.state !== '结束' && row.actorexpression !== null && row.actorexpression.indexOf('PI') === 0">
40
- ({{ row.peruser }})
41
- </span>
42
- <br>
43
- {{ row.finishtime ? row.finishtime : row.sendtime }}<br>
44
- </div>
45
- <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
46
- </div>
47
- </div>
48
- </template>
49
-
50
- <script>
51
- import {HttpResetClass} from 'vue-client'
52
- export default {
53
- title: '流程节点',
54
- props: ['selectdata'],
55
- data () {
56
- return {
57
- defnames: [],
58
- flag:false
59
- }
60
- },
61
- ready () {
62
- this.initial()
63
- },
64
- methods: {
65
- async shouju(row){
66
- console.log("进入方法:",this.selectdata)
67
- },
68
- async initial() {
69
- // 获取流程节点信息
70
- let http = new HttpResetClass()
71
- let data = {
72
- processid: this.selectdata.f_process_id
73
- }
74
- let res = await http.load(
75
- 'POST',
76
- `${this.$androidUtil.getProxyUrl()}/rs/sql/getAllNode`,
77
- // `rs/sql/getAllNode`,
78
- {data: data},
79
- {
80
- resolveMsg:null,
81
- rejectMsg:null
82
- })
83
- this.defnames = res.data
84
- },
85
- },
86
- watch: {
87
- }
88
- }
89
- </script>
90
-
91
- <style scoped>
92
- .app-text {
93
- font-size: 12px;
94
- }
95
- .panel-self{
96
- border-radius: 10px;
97
- border:1px solid #499EDF;
98
- background-color: #F8F8F8;
99
- }
100
- .row{
101
- padding: 0 40px;
102
- text-align: center;
103
- height: auto;
104
- }
105
- .item{
106
- border-radius: 2em;
107
- border: 1px solid silver;
108
- line-height: 25px;
109
- }
110
- .arrow{
111
- width: 100%;
112
- color: #5ac0d9;
113
- font-weight: bold;
114
- }
115
- .selectIndex{
116
- background-color: #5ac0d9;
117
- color: #ffffff;
118
- }
119
- </style>
1
+ <template>
2
+ <div style="padding: 10px">
3
+ <div partial class="auto app-text panel" style="margin-bottom: 20px">
4
+ <div class="panel-body panel-self">
5
+ <div class="col-xs-12">
6
+ <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
7
+ <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_num }}</p>
8
+ </div>
9
+ <div class="col-xs-12">
10
+ <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
11
+ <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
12
+ </div>
13
+ <div class="col-xs-12">
14
+ <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
15
+ <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_type }}</p>
16
+ </div>
17
+ <div class="col-xs-12">
18
+ <p class="col-xs-3 text-left font"><b>用户类型:</b></p>
19
+ <p class="col-xs-9 text-left input-font">{{ selectdata.f_user_type }}</p>
20
+ </div>
21
+ <div class="col-xs-12">
22
+ <p class="col-xs-3 text-left font"><b>入户安装提交时间：</b></p>
23
+ <p class="col-xs-9 text-left input-font">{{ selectdata.finishtime }}</p>
24
+ </div>
25
+ <div class="col-xs-12">
26
+ <p class="col-xs-3 text-left font"><b>总收费：</b></p>
27
+ <p class="col-xs-9 text-left input-font">{{ selectdata.summoney }}</p>
28
+ </div>
29
+ <div class="col-xs-12">
30
+ <p class="col-xs-3 text-left font"><b>收费人员：</b></p>
31
+ <p class="col-xs-9 text-left input-font">{{ selectdata.f_charge_collectors }}</p>
32
+ </div>
33
+ </div>
34
+ <div class="panel-footer">
35
+ <app-materialshoufei v-if="selectdata" :selectdata="selectdata" :mark = '1'></app-materialshoufei>
36
+ </div>
37
+ </div>
38
+ </div>
39
+ </template>
40
+
41
+ <script>
42
+ export default {
43
+ title: '流程节点',
44
+ props: ['selectdata'],
45
+ data () {
46
+ return {
47
+ }
48
+ },
49
+ ready () {
50
+ },
51
+ methods: {
52
+ },
53
+ watch: {
54
+ }
55
+ }
56
+ </script>
57
+
58
+ <style scoped>
59
+ .app-text {
60
+ font-size: 12px;
61
+ }
62
+ .panel-self{
63
+ border-radius: 10px;
64
+ border:1px solid #499EDF;
65
+ background-color: #F8F8F8;
66
+ }
67
+
68
+ </style>
package/src/components/app_apply/AppdevicesDetails.vue CHANGED
@@ -211,7 +211,7 @@
211
211
  type="number"
212
212
  placeholder="使用年限"
213
213
  v-model="item.f_service_life"
214
- @change="outdate(item)"
214
+ @change="outdate(item,i)"
215
215
  :value="item.f_service_life"
216
216
  :readonly="mark === 1"/>
217
217
  </div>
@@ -780,19 +780,17 @@ export default {
780
780
  this.query = {}
781
781
  this.condition = "1 = 1"
782
782
  },
783
- outdate(item){
783
+ outdate(item,index){
784
784
  console.log("数据",item)
785
- debugger
786
785
  if (item.f_make_date){
787
- debugger
788
- var t = new Date(item.f_make_date);//你已知的时间
789
- var Y = t.getFullYear()+parseInt(item.f_service_life)+ '-'
790
- var M = (t.getMonth()+1 < 10 ? '0'+(t.getMonth()+1):t.getMonth()+1) + '-'
791
- var D = (t.getDate()< 10 ? '0'+t.getDate():t.getDate())+ ' '
792
- var h = (t.getHours() < 10 ? '0'+t.getHours():t.getHours())+ ':'
793
- var m = (t.getMinutes() < 10 ? '0'+t.getMinutes():t.getMinutes())+ ':'
794
- var s = t.getSeconds() < 10 ? '0'+t.getSeconds():t.getSeconds()
795
- item.f_expire_date = Y+M+D+h+m+s
786
+ let t = new Date(item.f_make_date);//你已知的时间
787
+ let Y = t.getFullYear()+parseInt(item.f_service_life)+ '-'
788
+ let M = (t.getMonth()+1 < 10 ? '0'+(t.getMonth()+1):t.getMonth()+1) + '-'
789
+ let D = (t.getDate()< 10 ? '0'+t.getDate():t.getDate())+ ' '
790
+ let h = (t.getHours() < 10 ? '0'+t.getHours():t.getHours())+ ':'
791
+ let m = (t.getMinutes() < 10 ? '0'+t.getMinutes():t.getMinutes())+ ':'
792
+ let s = t.getSeconds() < 10 ? '0'+t.getSeconds():t.getSeconds()
793
+ this.$set('userinfo.devices['+index+'].f_expire_date',Y+M+D+h+m+s)
796
794
  }
797
795
 
798
796
  }
package/src/components/app_apply/ApplyToDoList.vue CHANGED
@@ -1,51 +1,132 @@
1
1
  <template>
2
2
  <div class="repair-bg auto" id="repair-first" style="padding-bottom:5px;overflow:auto">
3
3
  <!--<div class="app-botton" @click="back()">-->
4
- <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
4
+ <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
5
5
  <!--</div>-->
6
- <!-- <back-page :need-back='true' @flag="back()"></back-page>-->
6
+ <!-- <back-page :need-back='true' @flag="back()"></back-page>-->
7
7
  <div class="bq-parent">
8
- <blockquote style="color: #499edf;border-left-color: #499edf;font-size: 16px">
8
+ <blockquote style="color: #499edf;border-left-color: #499edf;font-size: 16px">
9
9
  <p>
10
- 待办报建<span v-if="rows">（{{rows.length}}单）</span>
10
+ 待办报建<span v-if="rows">（{{ rows.length }}单）</span>
11
11
  <span v-if="!rows">（暂无待处理报建单）</span>
12
- <img @click="search" src="../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
13
12
  </p>
13
+ <div partial class="auto" style="color: #2b2b2b;">
14
+ <div class="row form-group app-input" v-if="criteriaShow">
15
+ <label class="">报建编号：</label>
16
+ <div class="col-xs-8">
17
+ <input class="" v-model=model.f_apply_num>
18
+ </div>
19
+ </div>
20
+ <div class="row form-group app-input" v-if="criteriaShow">
21
+ <label class="">项目名称：</label>
22
+ <div class="col-xs-8">
23
+ <input class="" v-model=model.f_entry_name>
24
+ </div>
25
+ </div>
26
+ <div class="row form-group app-input" v-if="criteriaShow">
27
+ <label class="">报建类型：</label>
28
+ <div class="col-xs-8">
29
+ <v-select
30
+ :value.sync="model.f_apply_type"
31
+ v-model="model.f_apply_type"
32
+ :options='applytype'
33
+ placeholder='请选择'
34
+ close-on-select >
35
+ </v-select>
36
+ </div>
37
+ </div>
38
+ <div class="row form-group app-input" v-if="criteriaShow">
39
+ <label class="">办理环节：</label>
40
+ <div class="col-xs-8">
41
+ <v-select
42
+ :value.sync="model.defname"
43
+ v-model="model.defname"
44
+ :options='defnames'
45
+ placeholder='请选择'
46
+ close-on-select >
47
+ </v-select>
48
+ </div>
49
+ </div>
50
+ <div class="row form-group app-input" v-if="criteriaShow">
51
+ <label class="">用户类型：</label>
52
+ <div class="col-xs-8">
53
+ <v-select
54
+ :value.sync="model.f_user_type"
55
+ v-model="model.f_user_type"
56
+ :options='usertype'
57
+ placeholder='请选择'
58
+ close-on-select >
59
+ </v-select>
60
+ </div>
61
+ </div>
62
+ <div class="row form-group app-input" v-if="criteriaShow">
63
+ <label class="">开始时间：</label>
64
+ <div class="col-xs-8" >
65
+ <datepicker id="startDate" placeholder="开始日期"
66
+ v-model="model.startDate"
67
+ :value.sync="model.startDate"
68
+ :format="'yyyy-MM-dd 00:00:00'"
69
+ :show-reset-button="true"
70
+ >
71
+ </datepicker>
72
+ </div>
73
+ </div>
74
+ <div class="row form-group app-input" v-if="criteriaShow">
75
+ <label class="">结束时间：</label>
76
+ <div class="col-xs-8" >
77
+ <datepicker id="endDate" placeholder="结束日期"
78
+ v-model="model.endDate"
79
+ :value.sync="model.endDate"
80
+ :format="'yyyy-MM-dd 23:59:59'"
81
+ :show-reset-button="true"
82
+ >
83
+ </datepicker>
84
+ </div>
85
+ </div>
86
+ <div class="row form-group text-right" style="">
87
+ <button class="btn btn-primary" @click="search()">查询</button>
88
+ <button class="btn btn-info" @click="clear()">清空</button>
89
+ <button class="btn" :class="{'button_shrink_top':criteriaShow,'button_shrink_bottom':!criteriaShow}"
90
+ @click="criteriaShow = !criteriaShow"></button>
91
+ </div>
92
+ </div>
14
93
  </blockquote>
15
94
  </div>
16
95
  <div class="panel panel-default repair-info-content auto">
17
96
  <div class="panel-body">
18
- <div class="panel panel-default well" v-for="row in rows" >
97
+ <div class="panel panel-default well" v-for="row in rows">
19
98
  <div class="panel-body bg-info" style="padding: 10px">
20
99
  <div class="row form-group">
21
100
  <div class="col-sm-12 col-xs-12 col-md-12">
22
- <div class="row" >
101
+ <div class="row">
23
102
  <div :class="{'text-danger': row.f_remindersign}" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
24
- 报建编号: {{row.f_apply_num}}<!--<span v-if="row.f_remindersign">(催单)</span>-->
103
+ 报建编号: {{ row.f_apply_num }}<!--<span v-if="row.f_remindersign">(催单)</span>-->
25
104
  </div>
26
105
  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
27
- 项目名称: {{row.f_entry_name}}
106
+ 项目名称: {{ row.f_entry_name }}
28
107
  </div>
29
108
  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
30
- 用户类型: {{row.f_user_type}}
109
+ 用户类型: {{ row.f_user_type }}
31
110
  </div>
32
111
  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
33
- 流程状态: {{row.f_sub_state}}
112
+ 流程状态: {{ row.f_sub_state }}
34
113
  </div>
35
114
  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
36
- 报建类型: {{row.f_apply_type}}
115
+ 报建类型: {{ row.f_apply_type }}
37
116
  </div>
38
117
  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
39
- 办理环节: {{row.defname}}
118
+ 办理环节: {{ row.defname }}
40
119
  </div>
41
120
  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
42
- 报建日期: {{row.f_apply_date}}
121
+ 报建日期: {{ row.f_apply_date }}
43
122
  </div>
44
123
 
45
124
  </div>
46
125
  </div>
47
126
  <div class="col-sm-12 col-xs-12 col-md-12">
48
- <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="selected(row)">立即处理</button>
127
+ <button type="button" name="button" class="btn btn-primary"
128
+ style="background-color:#499edf;float: right" @click="selected(row)">立即处理
129
+ </button>
49
130
  </div>
50
131
  </div>
51
132
  </div>
@@ -55,48 +136,52 @@
55
136
  </div>
56
137
  </template>
57
138
  <script>
58
- import Vue from 'vue'
59
- import {HttpResetClass} from 'vue-client'
60
- export default{
139
+ import Vue from 'vue'
140
+ import {HttpResetClass} from 'vue-client'
141
+ import {isEmpty} from '../Util'
142
+ export default {
61
143
  title: '待办报建列表',
62
144
  data () {
63
145
  return {
64
146
  // rows: Object
65
147
  rows: [],
66
- editshow:false,
67
- row:{
68
- type:Object,
69
- default:{
70
-
71
- }
72
- }
148
+ editshow: false,
149
+ row: {
150
+ type: Object,
151
+ default: {}
152
+ },
153
+ criteriaShow: false,
154
+ model: {},
155
+ usertype: this.$appdata.getParam('用户类型'),
156
+ applytype: this.$appdata.getParam('报建类型'),
157
+ defnames: this.$appdata.getParam('办理环节')
73
158
  }
74
159
  },
75
160
  props: {
76
- sourcet:{
77
- type:String,
78
- default:'横屏'
161
+ sourcet: {
162
+ type: String,
163
+ default: '横屏'
79
164
  }
80
165
  },
81
166
  methods: {
82
167
  selected (row) {
83
168
  row.canedit = true
84
- if(this.sourcet == '横屏'){
85
- var pardate = {
86
- _this:this,
87
- tittle:'报建工作',
88
- safe:true
169
+ if (this.sourcet === '横屏') {
170
+ let pardate = {
171
+ _this: this,
172
+ tittle: '报建工作',
173
+ safe: true
89
174
  }
90
- this.$dispatch('gotoson',pardate)
91
- this.$goto('placecontrolerapp', {row: row},'self',this.search)
92
- }else{
93
- var pardate = {
94
- _this:this,
95
- tittle:'报建工作',
96
- safe:true
175
+ this.$dispatch('gotoson', pardate)
176
+ this.$goto('placecontrolerapp', {row: row}, 'self', this.search)
177
+ } else {
178
+ let pardate = {
179
+ _this: this,
180
+ tittle: '报建工作',
181
+ safe: true
97
182
  }
98
- this.$dispatch('gotoson',pardate)
99
- this.$goto('placecontrolerapp', {row: row},'self',this.search)
183
+ this.$dispatch('gotoson', pardate)
184
+ this.$goto('placecontrolerapp', {row: row}, 'self', this.search)
100
185
  }
101
186
  },
102
187
  back () {
@@ -105,9 +190,36 @@ export default{
105
190
  },
106
191
  search () {
107
192
  var condition = "1=1 and (f_apply_type! = '居民报建' and f_apply_type! = '工商户报建' or (f_apply_type = '居民报建' and defname = '入户安装') or (f_apply_type = '工商户报建' and (defname = '现场勘察' or defname = '施工')))"
108
- var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,orgid: Vue.user.orgid}}
193
+ // 报建编号
194
+ if (this.model.f_apply_num) {
195
+ condition = condition + ` and u.f_apply_num like '%${this.model.f_apply_num}%'`
196
+ }
197
+ // 项目名称
198
+ if (this.model.f_entry_name) {
199
+ condition = condition + ` and u.f_entry_name like '%${this.model.f_entry_name}%'`
200
+ }
201
+ // 报建类型
202
+ if (!isEmpty(this.model.f_apply_type)) {
203
+ condition = condition + ` and f_apply_type = '${this.model.f_apply_type}'`
204
+ }
205
+ // 办理环节
206
+ if (!isEmpty(this.model.defname)) {
207
+ condition = condition + ` and defname = '${this.model.defname}'`
208
+ }
209
+ // 用户类型
210
+ if (!isEmpty(this.model.f_user_type)) {
211
+ condition = condition + ` and f_user_type = '${this.model.f_user_type}'`
212
+ }
213
+ // 报建时间
214
+ if (!isEmpty(this.model.startDate)) {
215
+ condition = condition + ` and u.f_apply_date >= '${this.model.startDate}'`
216
+ }
217
+ if (!isEmpty(this.model.endDate)) {
218
+ condition = condition + ` and u.f_apply_date <= '${this.model.endDate}'`
219
+ }
220
+ var param = {condition: condition, condValue: [], data: {id: Vue.user.id, orgid: Vue.user.orgid}}
109
221
  let http = new HttpResetClass()
110
- http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data:param}).then(res=>{
222
+ http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, {data: param}).then(res => {
111
223
  console.log(`前台本地报建代办工单查询结果data=>>>${JSON.stringify(res.data)}`)
112
224
  if (res.data) {
113
225
  this.rows = res.data
@@ -116,41 +228,62 @@ export default{
116
228
  }
117
229
  })
118
230
  },
119
- makeAPhoneCall(phoneNumber) {
231
+ makeAPhoneCall (phoneNumber) {
120
232
  this.$androidUtil.makeAPhoneCall(phoneNumber)
121
233
  },
122
234
  upload () {
123
235
  this.$goto('up-load')
236
+ },
237
+ clear () {
238
+ this.model = {}
124
239
  }
125
240
  },
126
241
  ready () {
127
242
  this.search()
128
- var _this = this;
129
- this.timeoutHandle = window.setInterval(function() {
243
+ var _this = this
244
+ this.timeoutHandle = window.setInterval(function () {
130
245
  _this.search()
131
- }, 6000000)//60000
246
+ }, 6000000)// 60000
132
247
  }
133
248
  }
134
249
  </script>
135
250
 
136
251
  <style>
137
- .app-botton {
138
- position:fixed;
139
- background: #87b2dd;
140
- color: #FFF;
141
- padding: 8px;
142
- text-align: center;
143
- font-size: 1.2em;
144
- z-index: 10;
145
- opacity:0.5;
146
- bottom: 50px;
147
- margin-top: -10px;
148
- height: 40px;
149
- }
150
- .class-a{
151
- border:1px solid red;
152
- }
153
- .padd-div-shu{
154
- padding-bottom: 5px;
155
- }
252
+ .button_shrink_top {
253
+ width: 34px;
254
+ height: 34px;
255
+ border: solid 1px #6aa6e2;
256
+ background-size: 100%;
257
+ background-image: url("../../../static/newStyle/stretch_top.png")
258
+ }
259
+
260
+ .button_shrink_bottom {
261
+ width: 34px;
262
+ height: 34px;
263
+ border: solid 1px #6aa6e2;
264
+ background-size: 100%;
265
+ background-image: url("../../../static/newStyle/stretch_bottom.png")
266
+ }
267
+
268
+ .app-botton {
269
+ position: fixed;
270
+ background: #87b2dd;
271
+ color: #FFF;
272
+ padding: 8px;
273
+ text-align: center;
274
+ font-size: 1.2em;
275
+ z-index: 10;
276
+ opacity: 0.5;
277
+ bottom: 50px;
278
+ margin-top: -10px;
279
+ height: 40px;
280
+ }
281
+
282
+ .class-a {
283
+ border: 1px solid red;
284
+ }
285
+
286
+ .padd-div-shu {
287
+ padding-bottom: 5px;
288
+ }
156
289
  </style>
package/src/components/app_apply/ServiceControl.vue CHANGED
@@ -276,13 +276,13 @@
276
276
  },
277
277
  // 任意select选中时触发事件
278
278
  'select_cascade'(index){
279
- if (this.data.fields[index].label === '是否具备安装条件'&& this.show_data.fields[index].value === '否') {
279
+ if (this.data.f_apply_type === '居民报建'&&this.data.fields[index].label === '是否具备安装条件'&& this.show_data.fields[index].value === '否') {
280
280
  this.show_data.fields[index+9].required = false
281
281
  this.show_data.fields[index+10].required = false
282
282
  this.show_data.fields[index+11].required = false
283
283
  this.show_data.fields[index+12].required = false
284
284
  this.show_data.fields[index+13].required = false
285
- }else if (this.data.fields[index].label === '是否具备安装条件'&& this.show_data.fields[index].value === '是') {
285
+ }else if (this.data.fields[index].label === '居民报建'&&this.data.fields[index].label === '是否具备安装条件'&& this.show_data.fields[index].value === '是') {
286
286
  this.show_data.fields[index+9].required = true
287
287
  this.show_data.fields[index+10].required = true
288
288
  this.show_data.fields[index+11].required = true