apply-clients 3.0.10-193 → 3.0.10-196

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/dist.zip ADDED
Binary file
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.0.10-193",
3
+ "version": "3.0.10-196",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -1,200 +1,200 @@
1
- <template>
2
- <div class="repair-bg auto" id="repair-first" style="padding-bottom:5px;overflow:auto">
3
- <!--<div class="app-botton" @click="back()">-->
4
- <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
5
- <!--</div>-->
6
- <!-- <back-page :need-back='true' @flag="back()"></back-page>-->
7
- <div class="bq-parent">
8
- <blockquote style="color: #499edf;border-left-color: #499edf;font-size: 16px">
9
- <p>
10
- 待办报建<span v-if="rows">({{rows.length}}单)</span>
11
- <span v-if="!rows">(暂无待处理报建单)</span>
12
- <img @click="flushsearch" src="../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
13
- </p>
14
- </blockquote>
15
- </div>
16
- <div class="panel panel-default repair-info-content auto">
17
- <div class="panel-body">
18
- <div class="row">
19
- <div class="col-sm-7">
20
- <label>用户姓名</label>
21
- <input type="text" v-model="username" placeholder='用户姓名' />
22
- <label>用户电话</label>
23
- <input type="text" v-model="userphone" placeholder='用户电话' />
24
- <!-- <button type="button" name="button" class="btn btn-primary" @click="search" style="float: left" >查询</button>-->
25
- </div>
26
- <div class="col-sm-7">
27
-
28
- <!-- <button type="button" name="button" class="btn btn-primary" @click="search" style="float: left" >查询</button>-->
29
- </div>
30
- <!-- <div class="col-sm-3" style="float: left;margin-left: 3%;margin-bottom: 3%">-->
31
- <!-- <button type="button" name="button" class="btn btn-primary" @click='ifsearch(" and f_orderstatus!=null ")' >查询临时保存</button>-->
32
- <!-- </div>-->
33
- </div>
34
- <div class="panel panel-default repair-info-content auto" >
35
- <div class="bg-info row panel-body" v-for="row in rows" style="border: #fff solid 0.5px;margin-bottom: 2px;border-radius:2%" >
36
- <div class="panel-body bg-info" style="padding: 10px" @click="selected(row)">
37
-
38
- <div class="col-sm-5 col-xs-5 col-md-5 padd-div-shu">
39
- {{row.f_user_name}}
40
- </div>
41
- <div class="col-sm-5 col-xs-5 col-md-5 padd-div-shu">
42
- {{row.f_phone}}
43
- <!-- <img src="../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(row.f_phone)'>-->
44
- </div>
45
-
46
- </div>
47
- </div>
48
-
49
- </div>
50
- </div>
51
- </div>
52
- </div>
53
-
54
- </template>
55
- <script>
56
- import Vue from 'vue'
57
- export default{
58
- title: '待办报建列表',
59
- data () {
60
- return {
61
- // rows: Object
62
- username:'',
63
- userphone:'',
64
- rows: [],
65
- editshow:false,
66
- row:{
67
- type:Object,
68
- default:{
69
-
70
- }
71
- }
72
- }
73
- },
74
- props: {
75
- sourcet:{
76
- type:String,
77
- default:'横屏'
78
- }
79
- },
80
- methods: {
81
- selected (row) {
82
- var pardate = {
83
- _this:this,
84
- tittle:'待办详情',
85
- safe:true
86
- }
87
- this.$dispatch('gotoson',pardate)
88
- row.canedit = true
89
- if(this.sourcet == '横屏'){
90
- this.$goto('placecontrolerapp', {row: row},'self',this.search)
91
- }else{
92
- this.$goto('placecontrolerapp', {row: row},'self',this.search)
93
- }
94
- },
95
- back () {
96
- let _this = this
97
- _this.$back()
98
- },
99
- flushsearch(){
100
-
101
- HostApp.__this__ = this
102
- HostApp.logicWithHint({
103
- // logic别名,key必须为logic
104
- 'logic': 'ApplyTimeOut',
105
- // 回调执行方法名,key必须为callback
106
- 'callback': 'javascript:HostApp.__this__.search()',
107
- // logic执行需要的业务参数
108
- 'data': {"workflow_names":"'报建缴费','现场勘察','通气'"},
109
- // 固定key,代表是否将logic执行结果作为参数传入回调方法,1代表true,0代表false,
110
- // 执行回调方法传入key为backresult
111
- // 如需额外拼接参数,写在logic返回值的params,例如xxlogic返回:{"params": "success"}
112
- 'backresult': 1
113
- })
114
- },
115
- search () {
116
- //pc模拟开发用
117
- // console.log('------app开始查询本地代办工单------')
118
- // var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null) and f_order_type is not null '
119
- // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getapplymobile`, {data: {'condition': condition}}).then((res) => {
120
- // console.log(res)
121
- // console.log(res.data)
122
- // console.log(`res.data.data.rows=> ${res.data.data}`)
123
- // if(res.data){
124
- // this.rows = res.data.data.rows
125
- // }else{
126
- // this.rows = []
127
- // }
128
- // })
129
-
130
-
131
- // app正式运行程序
132
- console.log('------app开始查询本地代办工单------')
133
- var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null)'
134
- if (this.username){
135
- condition+=` and f_user_name like '%${this.username}%'`
136
- }
137
- if (this.userphone){
138
- condition+=` and f_phone like '%${this.userphone}%'`
139
- }
140
- console.log(`login_user_id=>>>${Vue.user.id}`)
141
- var param = {"condition": condition,"id": Vue.user.id}
142
- console.log(`param=>>>${JSON.stringify(param)}`)
143
- let res = this.$androidUtil.bzLogic('getapplymobile',param)
144
- console.log(`前台本地报建代办工单查询结果data=>>>${res.data}`)
145
- if(res.data){
146
- this.rows = res.data.rows
147
- }else{
148
- this.rows = []
149
- }
150
- // console.log(`this.rows=>>>${this.rows}`)
151
- },
152
- makeAPhoneCall(phoneNumber) {
153
- this.$androidUtil.makeAPhoneCall(phoneNumber)
154
- },
155
- upload () {
156
- this.$goto('up-load')
157
- }
158
- },
159
- ready () {
160
- this.flushsearch()
161
- var _this = this;
162
- this.timeoutHandle = window.setInterval(function() {
163
- _this.search()
164
- }, 6000000)//60000
165
- },
166
- created(){
167
- var result = HostApp.readLocalFile('workflow_apply.json')
168
- if(result.code == 500){
169
- this.$showMessage('获取流程配置文件失败,请联系系统管理员')
170
- return
171
- }
172
- var data = JSON.parse(result.data)
173
- console.log('前台存入缓存中的data=>' + JSON.stringify(data))
174
- Vue.workflow_vue = Vue.prototype.$workflow_vue = data
175
- }
176
-
177
- }
178
- </script>
179
-
180
- <style>
181
- .app-botton {
182
- position:fixed;
183
- background: #87b2dd;
184
- color: #FFF;
185
- padding: 8px;
186
- text-align: center;
187
- font-size: 1.2em;
188
- z-index: 10;
189
- opacity:0.5;
190
- bottom: 50px;
191
- margin-top: -10px;
192
- height: 40px;
193
- }
194
- .class-a{
195
- border:1px solid red;
196
- }
197
- .padd-div-shu{
198
- padding-bottom: 5px;
199
- }
200
- </style>
1
+ <template>
2
+ <div class="repair-bg auto" id="repair-first" style="padding-bottom:5px;overflow:auto">
3
+ <!--<div class="app-botton" @click="back()">-->
4
+ <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
5
+ <!--</div>-->
6
+ <!-- <back-page :need-back='true' @flag="back()"></back-page>-->
7
+ <div class="bq-parent">
8
+ <blockquote style="color: #499edf;border-left-color: #499edf;font-size: 16px">
9
+ <p>
10
+ 待办报建<span v-if="rows">({{rows.length}}单)</span>
11
+ <span v-if="!rows">(暂无待处理报建单)</span>
12
+ <img @click="flushsearch" src="../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
13
+ </p>
14
+ </blockquote>
15
+ </div>
16
+ <div class="panel panel-default repair-info-content auto">
17
+ <div class="panel-body">
18
+ <div class="row">
19
+ <div class="col-sm-7">
20
+ <label>用户姓名</label>
21
+ <input type="text" v-model="username" placeholder='用户姓名' />
22
+ <label>用户电话</label>
23
+ <input type="text" v-model="userphone" placeholder='用户电话' />
24
+ <!-- <button type="button" name="button" class="btn btn-primary" @click="search" style="float: left" >查询</button>-->
25
+ </div>
26
+ <div class="col-sm-7">
27
+
28
+ <!-- <button type="button" name="button" class="btn btn-primary" @click="search" style="float: left" >查询</button>-->
29
+ </div>
30
+ <!-- <div class="col-sm-3" style="float: left;margin-left: 3%;margin-bottom: 3%">-->
31
+ <!-- <button type="button" name="button" class="btn btn-primary" @click='ifsearch(" and f_orderstatus!=null ")' >查询临时保存</button>-->
32
+ <!-- </div>-->
33
+ </div>
34
+ <div class="panel panel-default repair-info-content auto" >
35
+ <div class="bg-info row panel-body" v-for="row in rows" style="border: #fff solid 0.5px;margin-bottom: 2px;border-radius:2%" >
36
+ <div class="panel-body bg-info" style="padding: 10px" @click="selected(row)">
37
+
38
+ <div class="col-sm-5 col-xs-5 col-md-5 padd-div-shu">
39
+ {{row.f_user_name}}
40
+ </div>
41
+ <div class="col-sm-5 col-xs-5 col-md-5 padd-div-shu">
42
+ {{row.f_phone}}
43
+ <!-- <img src="../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(row.f_phone)'>-->
44
+ </div>
45
+
46
+ </div>
47
+ </div>
48
+
49
+ </div>
50
+ </div>
51
+ </div>
52
+ </div>
53
+
54
+ </template>
55
+ <script>
56
+ import Vue from 'vue'
57
+ export default{
58
+ title: '待办报建列表',
59
+ data () {
60
+ return {
61
+ // rows: Object
62
+ username:'',
63
+ userphone:'',
64
+ rows: [],
65
+ editshow:false,
66
+ row:{
67
+ type:Object,
68
+ default:{
69
+
70
+ }
71
+ }
72
+ }
73
+ },
74
+ props: {
75
+ sourcet:{
76
+ type:String,
77
+ default:'横屏'
78
+ }
79
+ },
80
+ methods: {
81
+ selected (row) {
82
+ var pardate = {
83
+ _this:this,
84
+ tittle:'待办详情',
85
+ safe:true
86
+ }
87
+ this.$dispatch('gotoson',pardate)
88
+ row.canedit = true
89
+ if(this.sourcet == '横屏'){
90
+ this.$goto('placecontrolerapp', {row: row},'self',this.search)
91
+ }else{
92
+ this.$goto('placecontrolerapp', {row: row},'self',this.search)
93
+ }
94
+ },
95
+ back () {
96
+ let _this = this
97
+ _this.$back()
98
+ },
99
+ flushsearch(){
100
+
101
+ HostApp.__this__ = this
102
+ HostApp.logicWithHint({
103
+ // logic别名,key必须为logic
104
+ 'logic': 'ApplyTimeOut',
105
+ // 回调执行方法名,key必须为callback
106
+ 'callback': 'javascript:HostApp.__this__.search()',
107
+ // logic执行需要的业务参数
108
+ 'data': {"workflow_names":"'报建缴费','现场勘察','通气'"},
109
+ // 固定key,代表是否将logic执行结果作为参数传入回调方法,1代表true,0代表false,
110
+ // 执行回调方法传入key为backresult
111
+ // 如需额外拼接参数,写在logic返回值的params,例如xxlogic返回:{"params": "success"}
112
+ 'backresult': 1
113
+ })
114
+ },
115
+ search () {
116
+ //pc模拟开发用
117
+ // console.log('------app开始查询本地代办工单------')
118
+ // var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null) and f_order_type is not null '
119
+ // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getapplymobile`, {data: {'condition': condition}}).then((res) => {
120
+ // console.log(res)
121
+ // console.log(res.data)
122
+ // console.log(`res.data.data.rows=> ${res.data.data}`)
123
+ // if(res.data){
124
+ // this.rows = res.data.data.rows
125
+ // }else{
126
+ // this.rows = []
127
+ // }
128
+ // })
129
+
130
+
131
+ // app正式运行程序
132
+ console.log('------app开始查询本地代办工单------')
133
+ var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null)'
134
+ if (this.username){
135
+ condition+=` and f_user_name like '%${this.username}%'`
136
+ }
137
+ if (this.userphone){
138
+ condition+=` and f_phone like '%${this.userphone}%'`
139
+ }
140
+ console.log(`login_user_id=>>>${Vue.user.id}`)
141
+ var param = {"condition": condition,"id": Vue.user.id}
142
+ console.log(`param=>>>${JSON.stringify(param)}`)
143
+ let res = this.$androidUtil.bzLogic('getapplymobile',param)
144
+ console.log(`前台本地报建代办工单查询结果data=>>>${res.data}`)
145
+ if(res.data){
146
+ this.rows = res.data.rows
147
+ }else{
148
+ this.rows = []
149
+ }
150
+ // console.log(`this.rows=>>>${this.rows}`)
151
+ },
152
+ makeAPhoneCall(phoneNumber) {
153
+ this.$androidUtil.makeAPhoneCall(phoneNumber)
154
+ },
155
+ upload () {
156
+ this.$goto('up-load')
157
+ }
158
+ },
159
+ ready () {
160
+ this.flushsearch()
161
+ var _this = this;
162
+ this.timeoutHandle = window.setInterval(function() {
163
+ _this.search()
164
+ }, 6000000)//60000
165
+ },
166
+ created(){
167
+ var result = HostApp.readLocalFile('workflow_apply.json')
168
+ if(result.code == 500){
169
+ this.$showMessage('获取流程配置文件失败,请联系系统管理员')
170
+ return
171
+ }
172
+ var data = JSON.parse(result.data)
173
+ console.log('前台存入缓存中的data=>' + JSON.stringify(data))
174
+ Vue.workflow_vue = Vue.prototype.$workflow_vue = data
175
+ }
176
+
177
+ }
178
+ </script>
179
+
180
+ <style>
181
+ .app-botton {
182
+ position:fixed;
183
+ background: #87b2dd;
184
+ color: #FFF;
185
+ padding: 8px;
186
+ text-align: center;
187
+ font-size: 1.2em;
188
+ z-index: 10;
189
+ opacity:0.5;
190
+ bottom: 50px;
191
+ margin-top: -10px;
192
+ height: 40px;
193
+ }
194
+ .class-a{
195
+ border:1px solid red;
196
+ }
197
+ .padd-div-shu{
198
+ padding-bottom: 5px;
199
+ }
200
+ </style>
@@ -76,13 +76,7 @@
76
76
  let http = new HttpResetClass()
77
77
  var url = this.$androidUtil.getProxyUrl() + '/rs/search'
78
78
  console.log('即将请求后台获取下发人员,url=>' + url)
79
- // R(安装员报装)
80
-
81
- let actorexpression=this.selectdata.actorexpression
82
- //let actorexpression="R(安装员报装)"
83
- let actor=actorexpression.substring(actorexpression.indexOf('(')+1,actorexpression.indexOf(')'))
84
- console.log("看看角色"+JSON.stringify(actor))
85
- let res = await http.load('POST', url, {source:`tool.getChildrenOfResName($${actor}$)`,userid:Vue.user.id}, {resolveMsg: null, rejectMsg: '获取当前部门人员失败'})
79
+ let res = await http.load('POST', url, this.selectdata.actorexpression, {resolveMsg: null, rejectMsg: '获取当前部门人员失败'})
86
80
  console.log("请求后台获取下发人员结果转换=>" + JSON.stringify(res))
87
81
  let jsonString = JSON.stringify(res.data)
88
82
  let jsonArray = []
@@ -1361,6 +1355,12 @@
1361
1355
  let btn_operate = function * (self, url, http, model, delteLocal) {
1362
1356
  // 下发,提交,保存,退回都在后台处理
1363
1357
  console.log('即将请求后台url=>' + url)
1358
+ for (const selfKey in model) {
1359
+ if(model[selfKey]=="null"){
1360
+ delete model[selfKey]
1361
+ }
1362
+
1363
+ }
1364
1364
  model.employeetemplate=''
1365
1365
  http.load('POST',url,{data:{employeetemplate:'',tables:self.data.tables,start_activity:self.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
1366
1366
  .then((res) => {
@@ -487,19 +487,22 @@ export default {
487
487
  })
488
488
  }
489
489
  }
490
- if (this.data.title=='报建缴费'){
491
- if (index==14){
490
+ if (this.data.title=='报建缴费' || this.data.title=='现场勘察'){
491
+ if (index==14 && this.data.title=='报建缴费'){
492
492
  console.log("14141414")
493
- let unaccounts_money=parseInt(this.data.fields[13].value)-parseInt(this.data.fields[14].value)
494
- let bignumber=this.smalltoBIG(parseInt(this.data.fields[14].value))
493
+ let unaccounts_money=this.data.fields[13].value?parseInt(this.data.fields[13].value):0-this.data.fields[14].value?parseInt(this.data.fields[14].value):0
494
+ let bignumber=this.smalltoBIG(this.data.fields[14].value?parseInt(this.data.fields[14].value):0)
495
495
  this.$set('data.fields[15].value',unaccounts_money)
496
496
  this.$set('data.fields[17].value',bignumber)
497
497
 
498
498
  }
499
499
  if (index==11||index==12){
500
- this.countmoney[index-11]=parseInt(this.data.fields[index].value)
500
+ this.countmoney[index-11]=this.data.fields[index].value?parseInt(this.data.fields[index].value):0
501
501
  console.log(this.data.fields[index].value)
502
502
  console.log("做出了改变")
503
+ }else{
504
+ this.countmoney[0]=this.data.fields[11].value?parseInt(this.data.fields[11].value):0
505
+ this.countmoney[1]=this.data.fields[12].value?parseInt(this.data.fields[12].value):0
503
506
  }
504
507
  console.log(JSON.stringify(this.countmoney))
505
508
  let money=0