apply-clients 3.4.89-5 → 3.4.89-6

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/product/Stop/StopApplyList.vue +16 -15
  3. package/src/filiale/qianneng/pc/Applydetail.vue +20 -7
  4. package/src/filiale/qianneng/pc/ExplorationSelect.vue +13 -13
  5. package/src/filiale/qianneng/pc/ServiceControl.vue +1 -0
  6. package/src/filiale/qianneng/pc/SupervisoryList.vue +26 -26
  7. package/src/filiale/qianneng/pc/SupervisoryServiceControl.vue +15 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.89-5",
3
+ "version": "3.4.89-6",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/product/Stop/StopApplyList.vue CHANGED
@@ -4,15 +4,7 @@
4
4
  <criteria partial='criteria' @condition-changed='search' v-ref:cri>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
6
  <div class="row">
7
- <div class="form-group col-sm-3">
8
- <label class="font_normal_body">组织机构：</label>
9
- <res-select
10
- restype='organization'
11
- :initresid='$parent.$parent.curorgid'
12
- @res-select="$parent.$parent.getorg"
13
- is-mul="false"
14
- ></res-select>
15
- </div>
7
+
16
8
  <div class="form-group col-sm-3">
17
9
  <label class="font_normal_body">工程编号：</label>
18
10
  <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
@@ -24,6 +16,12 @@
24
16
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
25
17
  v-on:keyup.enter="$parent.$parent.search()" condition="a.f_user_name like '%{}%'" placeholder='客户名称'>
26
18
  </div>
19
+ <div class="form-group col-sm-3">
20
+ <label class="font_normal_body">用户地址：</label>
21
+ <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
22
+ v-on:keyup.enter="search"
23
+ condition="f_address like '%{}%'">
24
+ </div>
27
25
  <div class="form-group col-sm-2 button-range">
28
26
  <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
29
27
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -36,6 +34,15 @@
36
34
  </div>
37
35
  </div>
38
36
  <div class="row" v-show="$parent.$parent.criteriaShow">
37
+ <div class="form-group col-sm-3">
38
+ <label class="font_normal_body">组织机构：</label>
39
+ <res-select
40
+ restype='organization'
41
+ :initresid='$parent.$parent.curorgid'
42
+ @res-select="$parent.$parent.getorg"
43
+ is-mul="false"
44
+ ></res-select>
45
+ </div>
39
46
  <div class="form-group col-sm-3">
40
47
  <label class="font_normal_body">用户编号：</label>
41
48
  <input type="text" style="width:60%" class="input_search" placeholder='用户编号' v-model="model.f_userinfo_code"
@@ -91,12 +98,6 @@
91
98
  :value-single="true"
92
99
  close-on-select ></v-select>
93
100
  </div>
94
- <div class="form-group col-sm-3">
95
- <label class="font_normal_body">用户地址：</label>
96
- <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
97
- v-on:keyup.enter="search"
98
- condition="f_address like '%{}%'">
99
- </div>
100
101
  <div class="form-group col-sm-3">
101
102
  <label for="startDate" class="font_normal_body">开始时间：</label>
102
103
  <datepicker id="startDate" placeholder="开始日期"
package/src/filiale/qianneng/pc/Applydetail.vue CHANGED
@@ -6,13 +6,16 @@
6
6
  <div class="form-horizontal select-overspread container-fluid auto" partial>
7
7
  <div class="row">
8
8
  <div class="form-group col-sm-3">
9
- <label class="font_normal_body">组织机构：</label>
10
- <res-select
11
- restype='organization'
12
- :initresid='$parent.$parent.curorgid'
13
- @res-select="$parent.$parent.getorg"
14
- is-mul="false"
15
- ></res-select>
9
+ <label class="font_normal_body">报建类型：</label>
10
+ <v-select
11
+ v-model="model.f_apply_type"
12
+ placeholder='报建类型'
13
+ condition="f_apply_type = '{}'"
14
+ :value.sync="model.f_apply_type"
15
+ :options='$parent.$parent.applytype'
16
+ class="select select_list"
17
+ :value-single="true"
18
+ close-on-select ></v-select>
16
19
  </div>
17
20
  <div class="form-group col-sm-3">
18
21
  <label class="font_normal_body">办理环节：</label>
@@ -50,6 +53,15 @@
50
53
  </div>
51
54
  </div>
52
55
  <div class="row" v-show="$parent.$parent.criteriaShow">
56
+ <div class="form-group col-sm-3">
57
+ <label class="font_normal_body">组织机构：</label>
58
+ <res-select
59
+ restype='organization'
60
+ :initresid='$parent.$parent.curorgid'
61
+ @res-select="$parent.$parent.getorg"
62
+ is-mul="false"
63
+ ></res-select>
64
+ </div>
53
65
  <div class="form-group col-sm-3">
54
66
  <label for="startDate" class="font_normal_body">开始时间：</label>
55
67
  <datepicker id="startDate" placeholder="开始日期"
@@ -176,6 +188,7 @@ export default {
176
188
  {label: '终止', value: '终止'},
177
189
  {label: '结束', value: '结束'}
178
190
  ],
191
+ applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
179
192
  getfield: {
180
193
  'f_apply_num': '工程编号',
181
194
  'f_user_name': '客户名称',
package/src/filiale/qianneng/pc/ExplorationSelect.vue CHANGED
@@ -63,6 +63,19 @@
63
63
  v-on:keyup.enter="$parent.$parent.search()"
64
64
  condition="u.f_apply_num like '%{}%'">
65
65
  </div>
66
+ <div class="form-group col-sm-3">
67
+ <label class="font_normal_body">报建类型：</label>
68
+ <v-select
69
+ v-model="model.f_apply_type"
70
+ placeholder='报建类型'
71
+ condition="f_apply_type = '{}'"
72
+ :value.sync="model.f_apply_type"
73
+ :options='$parent.$parent.applytype'
74
+ class="select select_list"
75
+ :value-single="true"
76
+ @change="$parent.$parent.applyTypeChange()"
77
+ close-on-select ></v-select>
78
+ </div>
66
79
  <div class="form-group col-sm-3">
67
80
  <label class="font_normal_body">合同编号：</label>
68
81
  <input type="text" style="width:60%" class="input_search" placeholder='合同编号' v-model="model.f_contract_money"
@@ -81,19 +94,6 @@
81
94
  v-on:keyup.enter="$parent.$parent.search()"
82
95
  condition="f_contract_number = '{}'">
83
96
  </div>
84
- <div class="form-group col-sm-3">
85
- <label class="font_normal_body">报建类型：</label>
86
- <v-select
87
- v-model="model.f_apply_type"
88
- placeholder='报建类型'
89
- condition="f_apply_type = '{}'"
90
- :value.sync="model.f_apply_type"
91
- :options='$parent.$parent.applytype'
92
- class="select select_list"
93
- :value-single="true"
94
- @change="$parent.$parent.applyTypeChange()"
95
- close-on-select ></v-select>
96
- </div>
97
97
  <div class="form-group col-sm-3">
98
98
  <label class="font_normal_body">办理环节：</label>
99
99
  <v-select
package/src/filiale/qianneng/pc/ServiceControl.vue CHANGED
@@ -1267,6 +1267,7 @@
1267
1267
  this.show_data.fields[index].value = '0'+ this.show_data.fields[index].value
1268
1268
  }
1269
1269
  }
1270
+ console.log('地址参数',this.config)
1270
1271
  let f_pcd = this.getLableValue('区/县') || ''
1271
1272
  let f_street = this.getLableValue('街道/乡镇') || ''
1272
1273
  let f_residential_area = this.getLableValue('小区') || ''
package/src/filiale/qianneng/pc/SupervisoryList.vue CHANGED
@@ -10,13 +10,23 @@
10
10
  v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
11
11
  </div>
12
12
  <div class="form-group col-sm-3">
13
- <label class="font_normal_body">组织机构：</label>
14
- <res-select
15
- restype='organization'
16
- :initresid='$parent.$parent.curorgid'·
17
- @res-select="$parent.$parent.getorg"
18
- is-mul="false"
19
- ></res-select>
13
+ <label class="font_normal_body">用户地址：</label>
14
+ <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
15
+ v-on:keyup.enter="$parent.$parent.search()"
16
+ condition="f_address 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_apply_type"
22
+ placeholder='报建类型'
23
+ condition="f_apply_type = '{}'"
24
+ :value.sync="model.f_apply_type"
25
+ :options='$parent.$parent.applytype'
26
+ class="select select_list"
27
+ :value-single="true"
28
+ @change="$parent.$parent.applyTypeChange()"
29
+ close-on-select ></v-select>
20
30
  </div>
21
31
  <div class="form-group col-sm-2 button-range">
22
32
  <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -37,6 +47,15 @@
37
47
  </div>
38
48
  </div>
39
49
  <div class="row" v-show="$parent.$parent.criteriaShow">
50
+ <div class="form-group col-sm-3">
51
+ <label class="font_normal_body">组织机构：</label>
52
+ <res-select
53
+ restype='organization'
54
+ :initresid='$parent.$parent.curorgid'·
55
+ @res-select="$parent.$parent.getorg"
56
+ is-mul="false"
57
+ ></res-select>
58
+ </div>
40
59
  <div class="form-group col-sm-3">
41
60
  <label class="font_normal_body">用户编号：</label>
42
61
  <input type="text" style="width:60%" class="input_search" placeholder='用户编号' v-model="model.f_userinfo_code"
@@ -67,19 +86,6 @@
67
86
  v-on:keyup.enter="search"
68
87
  condition="f_contract_number = '{}'">
69
88
  </div>
70
- <div class="form-group col-sm-3">
71
- <label class="font_normal_body">报建类型：</label>
72
- <v-select
73
- v-model="model.f_apply_type"
74
- placeholder='报建类型'
75
- condition="f_apply_type = '{}'"
76
- :value.sync="model.f_apply_type"
77
- :options='$parent.$parent.applytype'
78
- class="select select_list"
79
- :value-single="true"
80
- @change="$parent.$parent.applyTypeChange()"
81
- close-on-select ></v-select>
82
- </div>
83
89
  <div class="form-group col-sm-3">
84
90
  <label class="font_normal_body">办理环节：</label>
85
91
  <v-select
@@ -116,12 +122,6 @@
116
122
  :value-single="true"
117
123
  close-on-select ></v-select>
118
124
  </div>
119
- <div class="form-group col-sm-3">
120
- <label class="font_normal_body">用户地址：</label>
121
- <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
122
- v-on:keyup.enter="search"
123
- condition="f_address like '%{}%'">
124
- </div>
125
125
  <div class="form-group col-sm-3">
126
126
  <label for="startDate" class="font_normal_body">开始时间：</label>
127
127
  <datepicker id="startDate" placeholder="开始日期"
package/src/filiale/qianneng/pc/SupervisoryServiceControl.vue CHANGED
@@ -713,6 +713,10 @@
713
713
  if (item.label === '地址') {
714
714
  item.readonly = true
715
715
  }
716
+ if (item.label === '地址杂项'){
717
+ item.hidden = false
718
+ item.required = false
719
+ }
716
720
  }
717
721
  if (f_address_type === '民用乡镇') {
718
722
  if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '小区' || item.label === '门牌号') {
@@ -730,6 +734,10 @@
730
734
  if (item.label === '地址') {
731
735
  item.readonly = true
732
736
  }
737
+ if (item.label === '地址杂项'){
738
+ item.hidden = false
739
+ item.required = false
740
+ }
733
741
  }
734
742
  if (f_address_type === '特殊地址') {
735
743
  if (item.label === '区/县' || item.label === '街道/乡镇') {
@@ -738,9 +746,14 @@
738
746
  }
739
747
  if (item.label === '小区') {
740
748
  item.hidden = false
741
- item.required = false
749
+ if (this.show_data.f_apply_type === '工商户报建'){
750
+ item.required = false
751
+ } else {
752
+ item.required = false
753
+ }
754
+
742
755
  }
743
- if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
756
+ if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号' || item.label === '地址杂项') {
744
757
  item.hidden = true
745
758
  item.required = false
746
759
  }