apply-clients 4.1.11-weinan → 4.1.11-weinan-2

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": "4.1.11-weinan",
3
+ "version": "4.1.11-weinan-2",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -241,7 +241,7 @@ export default {
241
241
  let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
242
242
  data: {
243
243
  tablename: "t_weixinreturnxml",
244
- condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_orde_state = '已支付' `,
244
+ condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_order_state = '已支付' `,
245
245
  }
246
246
  }, {
247
247
  resolveMsg: null,
@@ -334,8 +334,9 @@ export default {
334
334
  let data = {
335
335
  money: this.accMul(this.getTotalAmount() ,1) + '',
336
336
  attach: {
337
- "f_apply_num": this.selectdata.f_apply_num,
338
- "f_user": Vue.user.id
337
+ apply: this.selectdata,
338
+ charge: this.charge,
339
+ user: Vue.user
339
340
  },
340
341
  orderType:'报装收费',
341
342
  userfilesid:'',
@@ -92,7 +92,7 @@ export default{
92
92
  _this.$back()
93
93
  },
94
94
  search () {
95
- var condition = "1=1"
95
+ var condition = "1=1 and defname = '现场勘察'"
96
96
  var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,orgid: Vue.user.orgid}}
97
97
  let http = new HttpResetClass()
98
98
  http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data:param}).then(res=>{
@@ -180,6 +180,27 @@
180
180
  deleteLocalApply(model){
181
181
  console.log(`前台上传完成,开始删除本地报建工单`)
182
182
  this.$androidUtil.bzLogic('deleteApply', {data:model})
183
+ },
184
+ stopapply(model1,model2){
185
+ this.$showMessage('确定不具备安装条件!',['confirm', 'cancel']).then((res)=>{
186
+ if (res=='confirm'){
187
+ let model = Object.assign({},model2,model1)
188
+ let data = {
189
+ loginUser: Vue.user,
190
+ selectdata: this.selectdata,
191
+ model: model
192
+ }
193
+ let http = new HttpResetClass()
194
+ http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
195
+ .then(res => {
196
+ if (res.data === 200) {
197
+ this.$dispatch('search')
198
+ } else {
199
+ this.$showMessage('终止报建失败')
200
+ }
201
+ })
202
+ }
203
+ })
183
204
  }
184
205
  },
185
206
  events: {
@@ -227,6 +248,20 @@
227
248
  model=Object.assign({},this.selectdata,model)
228
249
  console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
229
250
  let http = new HttpResetClass()
251
+ if(this.selectdata.defname =='现场勘察' && model.f_is_have == '否'){
252
+ let model1 ={
253
+ f_stop_remarks : '不具备安装条件'
254
+ }
255
+ this.stopapply(model1,model)
256
+ return
257
+ }
258
+ if(this.selectdata.defname =='现场勘察' && model.f_is_aerate == '否'){
259
+ let model ={
260
+ f_stop_remarks : '未通气'
261
+ }
262
+ this.stopapply(model1,model)
263
+ return
264
+ }
230
265
  var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
231
266
  // let res = await http.load('POST',url,{data:{tables:this.data.tables,start_activity:this.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
232
267
  // // 先判断是否包含code,如果服务端异常,可能不存在code
@@ -1,221 +1,221 @@
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-4">
8
- <label class="font_normal_body">项目名称:</label>
9
- <input type="text" class="input_search" v-model="model.f_entry_name"
10
- v-on:keyup.enter="search" condition=" f_entry_name 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="f_apply_num like '%{}%'">
17
- </div>
18
- <div class="form-group col-sm-3">
19
- <label class="font_normal_body">合同编号:</label>
20
- <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
21
- v-on:keyup.enter="search"
22
- condition="f_contract_number like '%{}%'">
23
- </div>
24
- <div class="form-group col-sm-2 button-range">
25
- <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
26
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
27
- <div
28
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
29
- @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
30
- class="button_spacing"
31
- style="float: right">
32
- </div>
33
- </div>
34
- </div>
35
- <div class="row" v-show="$parent.$parent.criteriaShow">
36
- <div class="form-group col-sm-3">
37
- <label class="font_normal_body">报建类型:</label>
38
- <v-select
39
- v-model="model.f_apply_type"
40
- placeholder='报建类型'
41
- condition="f_apply_type like '%{}%'"
42
- :value.sync="model.f_apply_type"
43
- :options='$parent.$parent.applytype'
44
- class="select select_list"
45
- :value-single="true"
46
- @change="$parent.$parent.applyTypeChange()"
47
- close-on-select ></v-select>
48
- </div>
49
- <div class="form-group col-sm-3">
50
- <label class="font_normal_body">办理环节:</label>
51
- <v-select
52
- v-model="model.defname"
53
- placeholder='办理环节'
54
- condition="defname = '{}'"
55
- :value.sync="model.defname"
56
- :options='$parent.$parent.defnames'
57
- class="select select_list"
58
- :value-single="true"
59
- close-on-select ></v-select>
60
- </div>
61
- <div class="form-group col-sm-3">
62
- <label class="font_normal_body">流程状态:</label>
63
- <v-select
64
- v-model="model.f_sub_state"
65
- placeholder='流程状态'
66
- condition="f_sub_state = '{}'"
67
- :value.sync="model.f_sub_state"
68
- :options='$parent.$parent.f_sub_state'
69
- class="select select_list"
70
- :value-single="true"
71
- close-on-select ></v-select>
72
- </div>
73
- <!-- <div class="form-group col-sm-3">-->
74
- <!-- <label class="font_normal_body">联系电话:</label>-->
75
- <!-- <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"-->
76
- <!-- v-on:keyup.enter="search"-->
77
- <!-- condition="f_phone like '%{}%'">-->
78
- <!-- </div>-->
79
- <!-- <div class="form-group col-sm-3">-->
80
- <!-- <label class="font_normal_body">用户地址:</label>-->
81
- <!-- <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"-->
82
- <!-- v-on:keyup.enter="search"-->
83
- <!-- condition="f_address like '%{}%'">-->
84
- <!-- </div>-->
85
- <div class="form-group col-sm-3">
86
- <label for="startDate" class="font_normal_body">开始时间:</label>
87
- <datepicker id="startDate" placeholder="开始日期"
88
- style="width: 60%!important;"
89
- v-model="model.startDate"
90
- :value.sync="model.startDate"
91
- :format="'yyyy-MM-dd HH:mm:ss'"
92
- :show-reset-button="true"
93
- condition="f_apply_date >= '{}'">
94
- </datepicker>
95
- </div>
96
- <div class="form-group col-sm-3">
97
- <label for="endDate" class="font_normal_body">结束时间:</label>
98
- <datepicker id="endDate" placeholder="结束日期"
99
- style="width: 60%!important;"
100
- v-model="model.endDate"
101
- :value.sync="model.endDate"
102
- :format="'yyyy-MM-dd HH:mm:ss'"
103
- :show-reset-button="true"
104
- condition="f_apply_date <= '{}'">
105
- </datepicker>
106
- </div>
107
- </div>
108
- </div>
109
- </criteria>
110
- <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
111
- <template partial='head'>
112
- <tr>
113
- <th style="white-space: nowrap;">序号</th>
114
- <th style="white-space: nowrap;">报建编号</th>
115
- <th style="white-space: nowrap;">项目名称</th>
116
- <th style="white-space: nowrap;">合同编号</th>
117
- <!-- <th style="white-space: nowrap;">电话</th>-->
118
- <!-- <th style="white-space: nowrap;">地址</th>-->
119
- <th style="white-space: nowrap;">报建类型</th>
120
- <th style="white-space: nowrap;">办理环节</th>
121
- <th style="white-space: nowrap;">流程状态</th>
122
- <th style="white-space: nowrap;">报建日期</th>
123
- </tr>
124
- </template>
125
- <template partial='body'>
126
- <tr>
127
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
128
- <nobr>{{$index+1}}</nobr>
129
- </td>
130
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
131
- <nobr>{{row.f_apply_num}}</nobr>
132
- </td>
133
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
134
- <nobr>{{row.f_entry_name}}</nobr>
135
- </td>
136
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
137
- <nobr>{{row.f_contract_number}}</nobr>
138
- </td>
139
- <!-- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
140
- <!-- <nobr>{{row.f_phone}}</nobr>-->
141
- <!-- </td>-->
142
- <!-- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
143
- <!-- <nobr>{{row.f_address}}</nobr>-->
144
- <!-- </td>-->
145
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
146
- <nobr>{{row.f_apply_type}}</nobr>
147
- </td>
148
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
149
- <nobr>{{row.defname}}</nobr>
150
- </td>
151
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
152
- <nobr>{{row.f_sub_state}}</nobr>
153
- </td>
154
- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
155
- <nobr>{{row.f_apply_date}}</nobr>
156
- </td>
157
- </tr>
158
- </template>
159
- </data-grid>
160
- </criteria-paged>
161
- </div>
162
- </template>
163
- <script>
164
- import {PagedList} from 'vue-client'
165
- import {HttpResetClass} from 'vue-client'
166
- import {isEmpty} from '../../Util'
167
- export default {
168
- title: '勘探详情',
169
- props: ['showData'],
170
- data () {
171
- return {
172
- applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
173
- model: new PagedList('rs/sql/supervisory', 20, {
174
- data: {
175
- id: `${this.$login.f.name}`,
176
- orgid: this.$login.f.orgid
177
- }
178
- }),
179
- f_sub_state: [{label: '全部', value: ''}, {label: '完工', value: '完工'}, {label: '正在进行', value: '正在进行'}],
180
- defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
181
- criteriaShow: false
182
- }
183
- },
184
- ready () {
185
- // 调用查询
186
- this.search()
187
- },
188
- events: {
189
- },
190
- methods: {
191
- // 查询
192
- search () {
193
- this.$dispatch('search')
194
- },
195
- clear () {
196
- Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
197
- this.$refs.cp.$refs.cri.model[key] = []
198
- })
199
- },
200
- applyTypeChange () {
201
- if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
202
- let http = new HttpResetClass()
203
- http.load('POST', 'rs/logic/getDefnameByType', {
204
- f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
205
- }, {resolveMsg: null, rejectMsg: null}).then((res) => {
206
- this.defnames = [{label: '全部', value: ''}, ...res.data]
207
- })
208
- } else {
209
- this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
210
- }
211
- },
212
- check (val) {
213
- this.$dispatch('apply', val)
214
- }
215
- },
216
- computed: {
217
- }
218
- }
219
- </script>
220
- <style scoped>
221
- </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-4">
8
+ <label class="font_normal_body">项目名称:</label>
9
+ <input type="text" class="input_search" v-model="model.f_entry_name"
10
+ v-on:keyup.enter="search" condition=" f_entry_name 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="f_apply_num like '%{}%'">
17
+ </div>
18
+ <div class="form-group col-sm-3">
19
+ <label class="font_normal_body">合同编号:</label>
20
+ <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
21
+ v-on:keyup.enter="search"
22
+ condition="f_contract_number like '%{}%'">
23
+ </div>
24
+ <div class="form-group col-sm-2 button-range">
25
+ <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
26
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
27
+ <div
28
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
29
+ @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
30
+ class="button_spacing"
31
+ style="float: right">
32
+ </div>
33
+ </div>
34
+ </div>
35
+ <div class="row" v-show="$parent.$parent.criteriaShow">
36
+ <div class="form-group col-sm-3">
37
+ <label class="font_normal_body">报建类型:</label>
38
+ <v-select
39
+ v-model="model.f_apply_type"
40
+ placeholder='报建类型'
41
+ condition="f_apply_type like '%{}%'"
42
+ :value.sync="model.f_apply_type"
43
+ :options='$parent.$parent.applytype'
44
+ class="select select_list"
45
+ :value-single="true"
46
+ @change="$parent.$parent.applyTypeChange()"
47
+ close-on-select ></v-select>
48
+ </div>
49
+ <div class="form-group col-sm-3">
50
+ <label class="font_normal_body">办理环节:</label>
51
+ <v-select
52
+ v-model="model.defname"
53
+ placeholder='办理环节'
54
+ condition="defname = '{}'"
55
+ :value.sync="model.defname"
56
+ :options='$parent.$parent.defnames'
57
+ class="select select_list"
58
+ :value-single="true"
59
+ close-on-select ></v-select>
60
+ </div>
61
+ <div class="form-group col-sm-3">
62
+ <label class="font_normal_body">流程状态:</label>
63
+ <v-select
64
+ v-model="model.f_sub_state"
65
+ placeholder='流程状态'
66
+ condition="f_sub_state = '{}'"
67
+ :value.sync="model.f_sub_state"
68
+ :options='$parent.$parent.f_sub_state'
69
+ class="select select_list"
70
+ :value-single="true"
71
+ close-on-select ></v-select>
72
+ </div>
73
+ <!-- <div class="form-group col-sm-3">-->
74
+ <!-- <label class="font_normal_body">联系电话:</label>-->
75
+ <!-- <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"-->
76
+ <!-- v-on:keyup.enter="search"-->
77
+ <!-- condition="f_phone like '%{}%'">-->
78
+ <!-- </div>-->
79
+ <!-- <div class="form-group col-sm-3">-->
80
+ <!-- <label class="font_normal_body">用户地址:</label>-->
81
+ <!-- <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"-->
82
+ <!-- v-on:keyup.enter="search"-->
83
+ <!-- condition="f_address like '%{}%'">-->
84
+ <!-- </div>-->
85
+ <div class="form-group col-sm-3">
86
+ <label for="startDate" class="font_normal_body">开始时间:</label>
87
+ <datepicker id="startDate" placeholder="开始日期"
88
+ style="width: 60%!important;"
89
+ v-model="model.startDate"
90
+ :value.sync="model.startDate"
91
+ :format="'yyyy-MM-dd HH:mm:ss'"
92
+ :show-reset-button="true"
93
+ condition="f_apply_date >= '{}'">
94
+ </datepicker>
95
+ </div>
96
+ <div class="form-group col-sm-3">
97
+ <label for="endDate" class="font_normal_body">结束时间:</label>
98
+ <datepicker id="endDate" placeholder="结束日期"
99
+ style="width: 60%!important;"
100
+ v-model="model.endDate"
101
+ :value.sync="model.endDate"
102
+ :format="'yyyy-MM-dd HH:mm:ss'"
103
+ :show-reset-button="true"
104
+ condition="f_apply_date <= '{}'">
105
+ </datepicker>
106
+ </div>
107
+ </div>
108
+ </div>
109
+ </criteria>
110
+ <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
111
+ <template partial='head'>
112
+ <tr>
113
+ <th style="white-space: nowrap;">序号</th>
114
+ <th style="white-space: nowrap;">报建编号</th>
115
+ <th style="white-space: nowrap;">项目名称</th>
116
+ <th style="white-space: nowrap;">合同编号</th>
117
+ <!-- <th style="white-space: nowrap;">电话</th>-->
118
+ <!-- <th style="white-space: nowrap;">地址</th>-->
119
+ <th style="white-space: nowrap;">报建类型</th>
120
+ <th style="white-space: nowrap;">办理环节</th>
121
+ <th style="white-space: nowrap;">流程状态</th>
122
+ <th style="white-space: nowrap;">报建日期</th>
123
+ </tr>
124
+ </template>
125
+ <template partial='body'>
126
+ <tr>
127
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
128
+ <nobr>{{$index+1}}</nobr>
129
+ </td>
130
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
131
+ <nobr>{{row.f_apply_num}}</nobr>
132
+ </td>
133
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
134
+ <nobr>{{row.f_entry_name}}</nobr>
135
+ </td>
136
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
137
+ <nobr>{{row.f_contract_number}}</nobr>
138
+ </td>
139
+ <!-- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
140
+ <!-- <nobr>{{row.f_phone}}</nobr>-->
141
+ <!-- </td>-->
142
+ <!-- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
143
+ <!-- <nobr>{{row.f_address}}</nobr>-->
144
+ <!-- </td>-->
145
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
146
+ <nobr>{{row.f_apply_type}}</nobr>
147
+ </td>
148
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
149
+ <nobr>{{row.defname}}</nobr>
150
+ </td>
151
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
152
+ <nobr>{{row.f_sub_state}}</nobr>
153
+ </td>
154
+ <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
155
+ <nobr>{{row.f_apply_date}}</nobr>
156
+ </td>
157
+ </tr>
158
+ </template>
159
+ </data-grid>
160
+ </criteria-paged>
161
+ </div>
162
+ </template>
163
+ <script>
164
+ import {PagedList} from 'vue-client'
165
+ import {HttpResetClass} from 'vue-client'
166
+ import {isEmpty} from '../../Util'
167
+ export default {
168
+ title: '勘探详情',
169
+ props: ['showData'],
170
+ data () {
171
+ return {
172
+ applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
173
+ model: new PagedList('rs/sql/supervisory', 20, {
174
+ data: {
175
+ id: `${this.$login.f.name}`,
176
+ orgid: this.$login.f.orgid
177
+ }
178
+ }),
179
+ f_sub_state: [{label: '全部', value: ''}, {label: '完工', value: '完工'}, {label: '正在进行', value: '正在进行'}, {label: '终止', value: '终止'}],
180
+ defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
181
+ criteriaShow: false
182
+ }
183
+ },
184
+ ready () {
185
+ // 调用查询
186
+ this.search()
187
+ },
188
+ events: {
189
+ },
190
+ methods: {
191
+ // 查询
192
+ search () {
193
+ this.$dispatch('search')
194
+ },
195
+ clear () {
196
+ Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
197
+ this.$refs.cp.$refs.cri.model[key] = []
198
+ })
199
+ },
200
+ applyTypeChange () {
201
+ if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
202
+ let http = new HttpResetClass()
203
+ http.load('POST', 'rs/logic/getDefnameByType', {
204
+ f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
205
+ }, {resolveMsg: null, rejectMsg: null}).then((res) => {
206
+ this.defnames = [{label: '全部', value: ''}, ...res.data]
207
+ })
208
+ } else {
209
+ this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
210
+ }
211
+ },
212
+ check (val) {
213
+ this.$dispatch('apply', val)
214
+ }
215
+ },
216
+ computed: {
217
+ }
218
+ }
219
+ </script>
220
+ <style scoped>
221
+ </style>